diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
| commit | bd90127ad43d08c39e5bd592d03f7c0a4c683afe (patch) | |
| tree | c840851273e349cb0aee31cb5958acdf093c819a /gnu/packages/guile.scm | |
| parent | 5f20553dee3fbc924b0cafb54ac215b0d3bf344c (diff) | |
| parent | 430505eba33b7bb59fa2d22e0f21ff317cbc320d (diff) | |
| download | guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.tar guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.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, 21 insertions, 6 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f06f66c7a5..d5a95a0444 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -185,18 +185,19 @@ without requiring the source code to be rewritten.") ;; in the `base' module, and thus changing it entails a full rebuild. guile-2.0) -(define-public guile-for-guile-emacs +(define-public guile-next (package (inherit guile-2.0) - (name "guile-for-guile-emacs") - (version "20150510.d8d9a8d") + (name "guile-next") + (version "20150815.00884bb") (source (origin (method git-fetch) (uri (git-reference - (url "git://git.hcoop.net/git/bpt/guile.git") - (commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17"))) + (url "git://git.sv.gnu.org/guile.git") + (commit "00884bb79fff41fdf5f22f24a74e366a94a14c9b"))) (sha256 (base32 - "00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0")))) + "0qk8m9aq3i7pzw6npim58xmsvjqfz5kl1pkyb6b43awn2vydydi5")))) + (arguments (substitute-keyword-arguments `(;; Tests aren't passing for now. ;; Obviously we should re-enable this! @@ -212,6 +213,7 @@ without requiring the source code to be rewritten.") (substitute* "build-aux/git-version-gen" (("#!/bin/sh") (string-append "#!" (which "sh")))) #t)))))) + (synopsis "Snapshot of what will become version 2.2 of GNU Guile") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -221,6 +223,19 @@ without requiring the source code to be rewritten.") ("gettext" ,gnu-gettext) ,@(package-native-inputs guile-2.0))))) +(define-public guile-for-guile-emacs + (package (inherit guile-next) + (name "guile-for-guile-emacs") + (version "20150510.d8d9a8d") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.hcoop.net/git/bpt/guile.git") + (commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17"))) + (sha256 + (base32 + "00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0")))))) + ;;; ;;; Extensions. |