summaryrefslogtreecommitdiff
path: root/gnu/packages/guile.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-09-26 01:11:32 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-09-26 01:11:32 +0200
commit6a0427af6cc3d52c0efc09262e90c1858ae6f40e (patch)
treeafedf3a5728dfac46c20aed448326debccf96562 /gnu/packages/guile.scm
parent985d542e028517b2888fa61831233a2b60dc7d48 (diff)
parent3b97a1779f3b65d582b8edc8c154b6414314b946 (diff)
downloadpatches-6a0427af6cc3d52c0efc09262e90c1858ae6f40e.tar
patches-6a0427af6cc3d52c0efc09262e90c1858ae6f40e.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
-rw-r--r--gnu/packages/guile.scm40
1 files changed, 39 insertions, 1 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 0333c25255..39d1ebe681 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -286,7 +286,45 @@ without requiring the source code to be rewritten.")
; when heavily loaded)
(define-public guile-next
- (deprecated-package "guile-next" guile-2.2))
+ ;; This is the upcoming Guile 3.0, with JIT support.
+ (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827")
+ (revision "0"))
+ (package
+ (inherit guile-2.2)
+ (name "guile-next")
+ (version (git-version "2.99" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/guile.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx"))
+ (file-name (git-file-name name version))))
+ (native-inputs
+ `(("autoconf", autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("gettext" ,gnu-gettext)
+ ("texinfo" ,texinfo)
+ ("flex" ,flex)
+ ,@(package-native-inputs guile-2.2)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments guile-2.2)
+ ((#:phases phases '%standard-phases)
+ ;; XXX: The default 'bootstrap' phase tries to execute the
+ ;; ./bootstrap directory.
+ `(modify-phases ,phases
+ (replace 'bootstrap
+ (lambda _
+ (patch-shebang "build-aux/git-version-gen")
+ (invoke "autoreconf" "-vfi")))
+ (add-before 'check 'skip-version-test
+ (lambda _
+ ;; Remove this test that's bound to fail.
+ (delete-file "test-suite/tests/version.test")
+ #t)))))))))
(define (make-guile-readline guile)
(package