From 8ab060b68b3d01ae8546741b77f3df779a8dc61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Mar 2020 21:42:34 +0100 Subject: gnu: guile: Add 2.2.7. * gnu/packages/guile.scm (guile-2.2.7): New variable. (guile-2.2/bug-fix): Redefine as a deprecated alias for GUILE-2.2.7. * gnu/packages/admin.scm (shepherd)[native-inputs, inputs]: Use GUILE-2.2.7. * gnu/packages/patches/guile-finalization-crash.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/guile.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a5466f8672..9c83f3339b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -250,17 +250,21 @@ without requiring the source code to be rewritten.") (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-public guile-2.2/bug-fix - ;; This variant contains a bug fix for a relatively rare crash that could +(define-public guile-2.2.7 + ;; This version contains a bug fix for a relatively rare crash that could ;; affect shepherd as PID 1: . (package (inherit guile-2.2) - (version (string-append (package-version guile-2.2) "-1")) + (version "2.2.7") (source (origin (inherit (package-source guile-2.2)) - (patches - (append (search-patches "guile-finalization-crash.patch") - (origin-patches (package-source guile-2.2)))))))) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.xz")) + (sha256 + (base32 + "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd")))))) + +(define-deprecated guile-2.2/bug-fix guile-2.2.7) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used -- cgit v1.2.3 From 1a30351bf37930222f077cdbcbb6659372f1ea2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 8 Mar 2020 21:12:20 +0100 Subject: gnu: guile-next: Update to 3.0.1. * gnu/packages/guile.scm (guile-3.0): Update to 3.0.1. Use "mirror://" URL. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9c83f3339b..e34fe4717f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -292,14 +292,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") ;to be renamed to "guile" - (version "3.0.0") + (version "3.0.1") (source (origin (inherit (package-source guile-2.2)) - (uri (string-append "ftp://ftp.gnu.org/gnu/guile/guile-" + (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) + "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")))) (arguments (substitute-keyword-arguments (package-arguments guile-2.2) ;; XXX: On ARMv7, work around by disabling -- cgit v1.2.3 From d6d0e10b3ded8a9bc137eee908281c294c7128f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 8 Mar 2020 22:13:49 +0100 Subject: gnu: guile-next: Revert to 3.0.0. Guile 3.0.1 segfaults while building guix-system-tests.drv on and "guile3.0-guix" on x86_64-linux. * gnu/packages/guile.scm (guile-next): Revert to 3.0.0. (guile-3.0): --- 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 e34fe4717f..3116f3c30a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -292,14 +292,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") ;to be renamed to "guile" - (version "3.0.1") + (version "3.0.0") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")))) + "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) (arguments (substitute-keyword-arguments (package-arguments guile-2.2) ;; XXX: On ARMv7, work around by disabling -- cgit v1.2.3 From 98619142b8c54287136216d0008871f9170a1808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 9 Mar 2020 17:31:00 +0100 Subject: gnu: guile-next: Update to 3.0.1 with bug-fix for crash. * gnu/packages/guile.scm (guile-3.0): Update to 3.0.1 with "guile-3.0-crash.patch". * gnu/packages/patches/guile-3.0-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Use it. --- gnu/packages/guile.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 3116f3c30a..1d9d93d774 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -292,14 +292,18 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") ;to be renamed to "guile" - (version "3.0.0") + (version "3.0.1") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")))) + "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")) + (patches + (append (search-patches "guile-3.0-crash.patch") + (origin-patches (package-source guile-2.2)))))) + (arguments (substitute-keyword-arguments (package-arguments guile-2.2) ;; XXX: On ARMv7, work around by disabling -- cgit v1.2.3