From 0a76d7a931e610b5163a870de508f576ee1fb6e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 May 2020 00:53:36 +0200 Subject: 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. --- gnu/packages/guile-xyz.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu') 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")) -- cgit v1.2.3