From c20e697ea19c92df217081c418c72ac70f02af3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Jul 2020 11:13:58 +0200
Subject: [PATCH] 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.
---
gnu/packages/guile-xyz.scm | 13 +++++++++----
gnu/packages/skribilo.scm | 6 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e426079fd25..b5b62549812 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1894,7 +1894,7 @@ (define-public guile-reader
(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 @@ (define-public guile-reader
(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 @@ (define-public haunt
(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 @@ (define-public guile2.2-haunt
(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
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index a01633c4b82..6bfed916de4 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, 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 @@ (define-public skribilo
;; 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")
--
GitLab