diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-12-12 04:10:59 +0200 |
| commit | c9e676d0b141f510c19e26edb1e6fad079b9b502 (patch) | |
| tree | 79abb4a4b92ecf4504a46e55ffa7971a06c8a5df /gnu/packages/guile.scm | |
| parent | d45720d8b456e82380601d77e25bd05c6e0dc36a (diff) | |
| parent | dcb7ce500bd025455982d74c3384c707f35bbb46 (diff) | |
| download | guix-c9e676d0b141f510c19e26edb1e6fad079b9b502.tar guix-c9e676d0b141f510c19e26edb1e6fad079b9b502.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f0317def1d..889635a345 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -250,6 +250,18 @@ 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 + ;; affect shepherd as PID 1: <https://bugs.gnu.org/37757>. + (package + (inherit guile-2.2) + (version (string-append (package-version guile-2.2) "-1")) + (source (origin + (inherit (package-source guile-2.2)) + (patches + (append (search-patches "guile-finalization-crash.patch") + (origin-patches (package-source guile-2.2)))))))) + (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. @@ -276,14 +288,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version "2.9.5") + (version "2.9.6") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1db91mhvphzmiyw6f41ks9haysphygngv400ivgqf23lg22wn5zr")))) + "09rihg5bhzhdk6hfkpav6ajny69dflabgvnm8r7lran723gy5vbf")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") |