aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/guile-xyz.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-05-12 00:53:36 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-05-12 01:04:27 +0200
commit0a76d7a931e610b5163a870de508f576ee1fb6e2 (patch)
tree8e221c1b32d4b0f87ca340931387422341f6bac5 /gnu/packages/guile-xyz.scm
parentb01a73b02955f80c6e1d950a13f50ab0745d020b (diff)
downloadguix-0a76d7a931e610b5163a870de508f576ee1fb6e2.tar
guix-0a76d7a931e610b5163a870de508f576ee1fb6e2.tar.gz
gnu: guile-webutils: Build with Guile 3.0.
* gnu/packages/guile-xyz.scm (guile-webutils)[source]: Add snippet to patch configure.ac. [inputs]: Replace guile-2.2 with guile-3.0. (guile2.2-webutils): New variable.
Diffstat (limited to 'gnu/packages/guile-xyz.scm')
-rw-r--r--gnu/packages/guile-xyz.scm22
1 files changed, 20 insertions, 2 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b864cdb857..2ac86ba571 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3322,7 +3322,15 @@ gnome-keyring, and many more.")
(file-name (git-file-name name version))
(sha256
(base32
- "1s9n3hbxd7lfpdi0x8wr0cfvlsf6g62ird9gbspxdrp5p05rbi64"))))
+ "1s9n3hbxd7lfpdi0x8wr0cfvlsf6g62ird9gbspxdrp5p05rbi64"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure.ac"
+ (("2\\.2 2\\.0")
+ "3.0 2.2 2.0"))
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3330,7 +3338,7 @@ gnome-keyring, and many more.")
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
- `(("guile" ,guile-2.2)))
+ `(("guile" ,guile-3.0)))
(propagated-inputs
`(("guile-irregex" ,guile-irregex)
("guile-gcrypt" ,guile-gcrypt)))
@@ -3341,6 +3349,16 @@ gnome-keyring, and many more.")
as signed sessions, multipart message support, etc.")
(license license:gpl3+))))
+(define-public guile2.2-webutils
+ (package
+ (inherit guile-webutils)
+ (name "guile2.2-webutils")
+ (inputs
+ `(("guile" ,guile-2.2)))
+ (propagated-inputs
+ `(("guile-irregex" ,guile2.2-irregex)
+ ("guile-gcrypt" ,guile2.2-gcrypt)))))
+
(define-public guile-lens
(let ((commit "14b15d07255f9d3f55d40a3b750d13c9ee3a154f")
(revision "0"))