04/06: gnu: haunt: Default to Guile 2.2.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit bd19f65a859a8401505fdba3d080c73f06998bac
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 19 18:00:43 2017 +0100

    gnu: haunt: Default to Guile 2.2.
    
    * gnu/packages/guile.scm (haunt)[inputs]: Replace GUILE-2.0 with
    GUILE-2.2.
    [propagated-inputs]: Replace GUILE-READER and GUILE-COMMONMARK with
    their 2.2 variant.
    (guile2.0-haunt): New variable.
    (guile2.2-haunt): Mark as deprecated.
---
 gnu/packages/guile.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8313f3f..87f5de1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1057,10 +1057,10 @@ Guile's foreign function interface.")
      `(("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
     (inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (propagated-inputs
-     `(("guile-reader" ,guile-reader)
-       ("guile-commonmark" ,guile-commonmark)))
+     `(("guile-reader" ,guile2.2-reader)
+       ("guile-commonmark" ,guile2.2-commonmark)))
     (synopsis "Functional static site generator")
     (description "Haunt is a static site generator written in Guile
 Scheme.  Haunt features a functional build system and an extensible
@@ -1068,9 +1068,11 @@ interface for reading articles in any format.")
     (home-page "http://haunt.dthompson.us";)
     (license license:gpl3+)))
 
+(define-public guile2.0-haunt
+  (package-for-guile-2.0
+   (package (inherit haunt) (name "guile2.0-haunt"))))
 (define-public guile2.2-haunt
-  (package-for-guile-2.2
-   (package (inherit haunt) (name "guile2.2-haunt"))))
+  (deprecated-package "guile2.2-haunt" haunt))
 
 (define-public guile-config
   (package