diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
| commit | 50b99c90c87642f664f9c9523a6e40fc8542ddcf (patch) | |
| tree | 9fc8845e93ba913730e5fb92bbad158716d84e74 /gnu/packages/guile.scm | |
| parent | bda4b5e0453e4c8feda24306b4aa76ad5406eb7d (diff) | |
| parent | 21656ffa3b6d78a610f0befced20cc9b4b3baab6 (diff) | |
| download | guix-patches-50b99c90c87642f664f9c9523a6e40fc8542ddcf.tar guix-patches-50b99c90c87642f664f9c9523a6e40fc8542ddcf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 53d626b9d2..0ce5d71cfd 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -251,6 +251,22 @@ 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.7 + ;; This version contains a bug fix for a relatively rare crash that could + ;; affect shepherd as PID 1: <https://bugs.gnu.org/37757>. + (package + (inherit guile-2.2) + (version "2.2.7") + (source (origin + (inherit (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 ;; in the `base' module, and thus changing it entails a full rebuild. @@ -277,15 +293,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 "ftp://ftp.gnu.org/gnu/guile/guile-" + (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9")) - (patches (search-patches "guile-2.2-skip-oom-test.patch")))) + "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 <https://bugs.gnu.org/39208> by disabling |