[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: gnu: haunt: Add "guile3.0-haunt" variant.
From: |
guix-commits |
Subject: |
04/11: gnu: haunt: Add "guile3.0-haunt" variant. |
Date: |
Thu, 23 Jan 2020 05:28:08 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 93d94134cc7268c6ad87581b8c3e2737e50d9a7d
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Jan 23 09:33:57 2020 +0100
gnu: haunt: Add "guile3.0-haunt" variant.
* gnu/packages/guile-xyz.scm (haunt)[source]: Add 'modules' and 'snippet'.
[arguments]: In 'wrap-haunt' phase, assume that INPUTS might lack
"guile-reader".
(guile3.0-haunt): New variable.
---
gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b07599c..09c12b9 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1955,7 +1955,15 @@ inspired by the SCSH regular expression system.")
version ".tar.gz"))
(sha256
(base32
- "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc"))))
+ "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure"
+ (("2\\.2 2\\.0")
+ "3.0 2.2 2.0"))
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 match) (ice-9 ftw)
@@ -1970,8 +1978,11 @@ inspired by the SCSH regular expression system.")
(bin (string-append out "/bin"))
(site (string-append
out "/share/guile/site"))
- (deps (list (assoc-ref inputs "guile-reader")
- (assoc-ref inputs
"guile-commonmark"))))
+ (guile-reader (assoc-ref inputs "guile-reader"))
+ (deps `(,@(if guile-reader
+ (list guile-reader)
+ '())
+ ,(assoc-ref inputs "guile-commonmark"))))
(match (scandir site)
(("." ".." version)
(let ((modules (string-append site "/" version))
@@ -2009,6 +2020,15 @@ interface for reading articles in any format.")
(home-page "http://haunt.dthompson.us")
(license license:gpl3+)))
+(define-public guile3.0-haunt
+ (package
+ (inherit haunt)
+ (name "guile3.0-haunt")
+ (inputs `(("guile" ,guile-3.0)))
+ (propagated-inputs
+ ;; XXX: Guile-Reader is currently unavailable for Guile 3.0 so strip it.
+ `(("guile-commonmark" ,guile3.0-commonmark)))))
+
(define-public guile2.0-haunt
(package
(inherit haunt)
- branch master updated (52d9cad -> 2c9fd76), guix-commits, 2020/01/23
- 02/11: tests: Fix typo in comment., guix-commits, 2020/01/23
- 01/11: installer: Make "TRANSLATORS" comment visible., guix-commits, 2020/01/23
- 05/11: gnu: mcron: Add "guile3.0-mcron" variant., guix-commits, 2020/01/23
- 03/11: gnu: guile-next: Disable JIT on armhf-linux., guix-commits, 2020/01/23
- 06/11: gnu: guile-lib: Add "guile3.0-lib" variant., guix-commits, 2020/01/23
- 04/11: gnu: haunt: Add "guile3.0-haunt" variant.,
guix-commits <=
- 08/11: gnu: guile-rsvg: Add "guile3.0-rsvg" variant., guix-commits, 2020/01/23
- 11/11: gnu: guile-present: Add "guile3.0-present"., guix-commits, 2020/01/23
- 10/11: gnu: guile-present: Pass the right module directories in scripts., guix-commits, 2020/01/23
- 07/11: gnu: guile-cairo: Add "guile3.0-cairo" variant., guix-commits, 2020/01/23
- 09/11: gnu: guile-present: Install .go files in /site-ccache., guix-commits, 2020/01/23