From efafbc66674be199330434c848ab6b8552efd8c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 11:30:52 +0100 Subject: gnu: guile-next: Update to 2.9.5. * gnu/packages/guile.scm (guile-next): Update to 2.9.5. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4419c48d1a..57e9a0aca5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -276,14 +276,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version "2.9.4") + (version "2.9.5") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1milviqhipyfx400pqhngxpxyajalzwmp597dxn5514pkk0g7v0p")))) + "1db91mhvphzmiyw6f41ks9haysphygngv400ivgqf23lg22wn5zr")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 60353203ed9322326590cec30ff8ca870f694288 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 16:10:03 +0100 Subject: gnu: guile2.0-git: Fix compilation of libgit2. * gnu/packages/guile.scm (guile2.0-git): Inherit from what 'package-for-guile-2.0' returns. Add 'inputs' field. --- gnu/packages/guile.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 57e9a0aca5..c7a79f2b8a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -623,7 +623,15 @@ manipulate repositories of the Git version control system.") (license license:gpl3+))) (define-public guile2.0-git - (package-for-guile-2.0 guile-git)) + (let ((base (package-for-guile-2.0 guile-git))) + (package + (inherit base) + ;; Libgit2's Guile test driver requires (ice-9 textual-ports), which is + ;; not in Guile 2.0. Thus, keep LIBGIT2 as-is here (i.e., built against + ;; Guile 2.2). + (inputs `(("libgit2" ,libgit2) + ,@(srfi-1:alist-delete "libgit2" + (package-inputs base))))))) ;;; guile.scm ends here -- cgit v1.2.3 From 01c11aeb9516819cec3053a5abbd839b9205b60c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 16:10:47 +0100 Subject: 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(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c7a79f2b8a..2063086575 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 -- cgit v1.2.3 From d15e4b1dc25000ba0ec5ae28cd5ea73c7d0ad1c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 22:02:07 +0100 Subject: gnu: guile-sqlite3: Add "guile3.0-sqlite3" variant. * gnu/packages/guile.scm (guile-sqlite3)[source](modules, snippet): New fields. (guile3.0-sqlite3): New variable. --- gnu/packages/guile.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2063086575..6526ad2a56 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -541,7 +541,15 @@ Guile's foreign function interface.") (sha256 (base32 "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (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")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -558,6 +566,9 @@ Guile's foreign function interface.") (define-public guile2.0-sqlite3 (package-for-guile-2.0 guile-sqlite3)) +(define-public guile3.0-sqlite3 + (package-for-guile-3.0 guile-sqlite3)) + (define-public guile-bytestructures (package (name "guile-bytestructures") -- cgit v1.2.3