[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: guile-git: Add "guile3.0-git" variant.
From: |
guix-commits |
Subject: |
02/06: gnu: guile-git: Add "guile3.0-git" variant. |
Date: |
Sat, 23 Nov 2019 16:48:28 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 01c11aeb9516819cec3053a5abbd839b9205b60c
Author: Ludovic Courtès <address@hidden>
Date: Sat Nov 23 16:10:47 2019 +0100
gnu: guile-git: Add "guile3.0-git" variant.
* gnu/packages/guile.scm (guile-git)[source](modules, snippet): New
fields.
* gnu/packages/guile.scm (guile3.0-git): New variable.
---
gnu/packages/guile.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index c7a79f2..2063086 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -604,7 +604,21 @@ type system, elevating types to first-class status.")
(sha256
(base32
"018hmfsh0rjwfvr4h7y10jc6k8a2k9xsirngghy3pjasin4nd2yz"))
- (file-name (git-file-name name version))))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure.ac"
+ (("^GUILE_PKG.*")
+ "GUILE_PKG([3.0 2.2 2.0])\n"))
+
+ ;; The 'guile.m4' that's shipped is too old and fails to
+ ;; recognize Guile 2.9/3.0. Delete it and pick the one
+ ;; provided by the Guile we're using.
+ (delete-file "m4/guile.m4")
+
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -622,6 +636,9 @@ type system, elevating types to first-class status.")
manipulate repositories of the Git version control system.")
(license license:gpl3+)))
+(define-public guile3.0-git
+ (package-for-guile-3.0 guile-git))
+
(define-public guile2.0-git
(let ((base (package-for-guile-2.0 guile-git)))
(package
- branch master updated (a3e5361 -> fed3632), guix-commits, 2019/11/23
- 01/06: gnu: guile2.0-git: Fix compilation of libgit2., guix-commits, 2019/11/23
- 05/06: tests: Use (ice-9 threads)., guix-commits, 2019/11/23
- 03/06: gnu: gnutls: Add "guile3.0-gnutls" variant., guix-commits, 2019/11/23
- 04/06: gnu: guile-sqlite3: Add "guile3.0-sqlite3" variant., guix-commits, 2019/11/23
- 02/06: gnu: guile-git: Add "guile3.0-git" variant.,
guix-commits <=
- 06/06: compile: Adjust for Guile 2.9.5., guix-commits, 2019/11/23