summaryrefslogtreecommitdiff
path: root/gnu/packages/guile.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-10 20:45:24 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-10 20:45:24 +0100
commit2d421c4f19a0669879c9a8738361a151b1431d4f (patch)
treed814cdb0fa1bdf763973ea43d89e22eab1da42e0 /gnu/packages/guile.scm
parentb3b5714fa72bf661003f27fbccba5697f5810115 (diff)
parent90799c35bd9cadaf7c28be5ea6e41ec692d5b4a4 (diff)
downloadpatches-2d421c4f19a0669879c9a8738361a151b1431d4f.tar
patches-2d421c4f19a0669879c9a8738361a151b1431d4f.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/guile.scm')
-rw-r--r--gnu/packages/guile.scm8
1 files changed, 6 insertions, 2 deletions
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 <https://bugs.gnu.org/39208> by disabling