aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-19 18:04:37 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-19 18:14:22 +0100
commitbdf1022decbc2ea4e998c74af7ce75e17e5ec485 (patch)
tree999ac7c606c57264115495c516d1f5b9e29c1126
parentbd19f65a859a8401505fdba3d080c73f06998bac (diff)
downloadguix-bdf1022decbc2ea4e998c74af7ce75e17e5ec485.tar
guix-bdf1022decbc2ea4e998c74af7ce75e17e5ec485.tar.gz
gnu: guile-reader: Default to Guile 2.2.
* gnu/packages/guile.scm (guile-reader)[inputs]: Change GUILE-2.0 to GUILE-2.2. (guile2.0-reader): New variable. (guile2.2-reader): Mark as deprecated. (haunt)[propagated-inputs]: Use GUILE-READER instead of GUILE2.2-READER.
-rw-r--r--gnu/packages/guile.scm8
-rw-r--r--gnu/packages/skribilo.scm4
2 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 87f5de161a..6373eec2a4 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -456,7 +456,7 @@ more.")
(build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,pkg-config)
("gperf" ,gperf)))
- (inputs `(("guile" ,guile-2.0)))
+ (inputs `(("guile" ,guile-2.2)))
(synopsis "Framework for building readers for GNU Guile")
(description
"Guile-Reader is a simple framework for building readers for GNU Guile.
@@ -473,8 +473,10 @@ many readers as needed).")
(home-page "http://www.nongnu.org/guile-reader/")
(license license:gpl3+)))
+(define-public guile2.0-reader
+ (package-for-guile-2.0 guile-reader))
(define-public guile2.2-reader
- (package-for-guile-2.2 guile-reader))
+ (deprecated-package "guile2.2-reader" guile-reader))
(define-public guile-ncurses
(package
@@ -1059,7 +1061,7 @@ Guile's foreign function interface.")
(inputs
`(("guile" ,guile-2.2)))
(propagated-inputs
- `(("guile-reader" ,guile2.2-reader)
+ `(("guile-reader" ,guile-reader)
("guile-commonmark" ,guile2.2-commonmark)))
(synopsis "Functional static site generator")
(description "Haunt is a static site generator written in Guile
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 52ed1c34e3..78b4806c8c 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -73,7 +73,7 @@
;; The 'skribilo' command needs them, and for people using Skribilo as a
;; library, these inputs are needed as well.
- (propagated-inputs `(("guile-reader" ,guile-reader)
+ (propagated-inputs `(("guile-reader" ,guile2.0-reader)
("guile-lib" ,guile-lib)))
(home-page "http://www.nongnu.org/skribilo/")