rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: guile-reader: Switch to Guile 3.0. 

* gnu/packages/guile-xyz.scm (guile-reader)[inputs]: Switch to GUILE-3.0.
(guile2.2-reader): New variable.
* gnu/packages/guile-xyz.scm (haunt)[propagated-inputs]: Add GUILE-READER.
(guile2.2-haunt)[propagated-inputs]: Use GUILE2.2-READER.
* gnu/packages/skribilo.scm (skribilo)[propagated-inputs]: Use
GUILE2.2-READER and GUILE2.2-LIB.
This commit is contained in:
Ludovic Courtès 2020-07-27 11:13:58 +02:00
parent a7c69419c2
commit c20e697ea1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/guile-xyz.scm
View File

@ -1894,7 +1894,7 @@ understand, extend, and port to host languages other than Scheme.")
(build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,pkg-config)
("gperf" ,gperf)))
(inputs `(("guile" ,guile-2.2)))
(inputs `(("guile" ,guile-3.0)))
(synopsis "Framework for building readers for GNU Guile")
(description
"Guile-Reader is a simple framework for building readers for GNU Guile.
@ -1911,6 +1911,12 @@ many readers as needed).")
(home-page "https://www.nongnu.org/guile-reader/")
(license license:gpl3+)))
(define-public guile2.2-reader
(package
(inherit guile-reader)
(name "guile2.2-reader")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile-ncurses
(package
(name "guile-ncurses")
@ -2215,8 +2221,7 @@ inspired by the SCSH regular expression system.")
(inputs
`(("guile" ,guile-3.0)))
(propagated-inputs
;; XXX: Guile-Reader is currently unavailable for Guile 2.2 so strip it.
`(;;("guile-reader" ,guile-reader)
`(("guile-reader" ,guile-reader)
("guile-commonmark" ,guile-commonmark)))
(synopsis "Functional static site generator")
(description "Haunt is a static site generator written in Guile
@ -2231,7 +2236,7 @@ interface for reading articles in any format.")
(name "guile2.2-haunt")
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-reader" ,guile-reader)
`(("guile-reader" ,guile2.2-reader)
("guile-commonmark" ,guile2.2-commonmark)))))
(define-public guile2.0-haunt

6
gnu/packages/skribilo.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -71,8 +71,8 @@
;; 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)
("guile-lib" ,guile-lib)))
(propagated-inputs `(("guile-reader" ,guile2.2-reader)
("guile-lib" ,guile2.2-lib)))
(home-page "https://www.nongnu.org/skribilo/")
(synopsis "Document production tool written in Guile Scheme")