aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-19 18:07:36 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-19 18:14:22 +0100
commit7c86c0310939619cb37d4706ca3446ed342a2444 (patch)
treecdafd50e2a19df2ed470a2617f58741acc28f146
parentbdf1022decbc2ea4e998c74af7ce75e17e5ec485 (diff)
downloadgnu-guix-7c86c0310939619cb37d4706ca3446ed342a2444.tar
gnu-guix-7c86c0310939619cb37d4706ca3446ed342a2444.tar.gz
gnu: guile-commonmark: Default to Guile 2.2.
* gnu/packages/guile.scm (guile-commonmark)[inputs]: Replace GUILE-2.0 with GUILE-2.2. (guile2.0-commonmark): New variable. (guile2.2-commonmark): Mark as deprecated. (haunt)[propagated-inputs]: Use GUILE-COMMONMARK.
-rw-r--r--gnu/packages/guile.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6373eec2a4..df1f17201e 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1062,7 +1062,7 @@ Guile's foreign function interface.")
`(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-reader" ,guile-reader)
- ("guile-commonmark" ,guile2.2-commonmark)))
+ ("guile-commonmark" ,guile-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
@@ -1432,7 +1432,7 @@ you send to a FIFO file.")
"/site/@GUILE_EFFECTIVE_VERSION@"))))))
(build-system gnu-build-system)
(inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
(synopsis "CommonMark parser for Guile")
(description
"guile-commonmark is a library for parsing CommonMark, a fully specified
@@ -1443,8 +1443,10 @@ is no support for parsing block and inline level HTML.")
(home-page "https://github.com/OrangeShark/guile-commonmark")
(license license:lgpl3+)))
+(define-public guile2.0-commonmark
+ (package-for-guile-2.0 guile-commonmark))
(define-public guile2.2-commonmark
- (package-for-guile-2.2 guile-commonmark))
+ (deprecated-package "guile2.2-commonmark" guile-commonmark))
(define-public guile-bytestructures
(package