summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-19 18:00:43 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-19 18:14:22 +0100
commitbd19f65a859a8401505fdba3d080c73f06998bac (patch)
treed87f0c7f9f3f66e2f9af543e17146f089e8f6354
parent8f4acad71b3afa56f2b54ada1cee2c25f7ded45f (diff)
downloadgnu-guix-bd19f65a859a8401505fdba3d080c73f06998bac.tar
gnu-guix-bd19f65a859a8401505fdba3d080c73f06998bac.tar.gz
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.
-rw-r--r--gnu/packages/guile.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8313f3f933..87f5de161a 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