nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-03-19 18:04:37 +01:00
parent bd19f65a85
commit bdf1022dec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/guile.scm
View File

@ -456,7 +456,7 @@ more.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,pkg-config) (native-inputs `(("pkgconfig" ,pkg-config)
("gperf" ,gperf))) ("gperf" ,gperf)))
(inputs `(("guile" ,guile-2.0))) (inputs `(("guile" ,guile-2.2)))
(synopsis "Framework for building readers for GNU Guile") (synopsis "Framework for building readers for GNU Guile")
(description (description
"Guile-Reader is a simple framework for building readers for GNU Guile. "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/") (home-page "http://www.nongnu.org/guile-reader/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile2.0-reader
(package-for-guile-2.0 guile-reader))
(define-public guile2.2-reader (define-public guile2.2-reader
(package-for-guile-2.2 guile-reader)) (deprecated-package "guile2.2-reader" guile-reader))
(define-public guile-ncurses (define-public guile-ncurses
(package (package
@ -1059,7 +1061,7 @@ Guile's foreign function interface.")
(inputs (inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-2.2)))
(propagated-inputs (propagated-inputs
`(("guile-reader" ,guile2.2-reader) `(("guile-reader" ,guile-reader)
("guile-commonmark" ,guile2.2-commonmark))) ("guile-commonmark" ,guile2.2-commonmark)))
(synopsis "Functional static site generator") (synopsis "Functional static site generator")
(description "Haunt is a static site generator written in Guile (description "Haunt is a static site generator written in Guile

4
gnu/packages/skribilo.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -73,7 +73,7 @@
;; The 'skribilo' command needs them, and for people using Skribilo as a ;; The 'skribilo' command needs them, and for people using Skribilo as a
;; library, these inputs are needed as well. ;; library, these inputs are needed as well.
(propagated-inputs `(("guile-reader" ,guile-reader) (propagated-inputs `(("guile-reader" ,guile2.0-reader)
("guile-lib" ,guile-lib))) ("guile-lib" ,guile-lib)))
(home-page "http://www.nongnu.org/skribilo/") (home-page "http://www.nongnu.org/skribilo/")