gnu: guile: Add guile-next

* gnu/packages/guile.scm (guile-next): New variable.
* gnu/packages/guile.scm (guile-for-guile-emacs):
  Adjust to inherit from guile-next rather than guile-2.0

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Christopher Allan Webber 2015-09-16 15:49:06 -05:00 committed by Ludovic Courtès
parent 2d1db448bd
commit be3feafedf
1 changed files with 21 additions and 6 deletions

View File

@ -185,18 +185,19 @@ without requiring the source code to be rewritten.")
;; in the `base' module, and thus changing it entails a full rebuild. ;; in the `base' module, and thus changing it entails a full rebuild.
guile-2.0) guile-2.0)
(define-public guile-for-guile-emacs (define-public guile-next
(package (inherit guile-2.0) (package (inherit guile-2.0)
(name "guile-for-guile-emacs") (name "guile-next")
(version "20150510.d8d9a8d") (version "20150815.00884bb")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "git://git.hcoop.net/git/bpt/guile.git") (url "git://git.sv.gnu.org/guile.git")
(commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17"))) (commit "00884bb79fff41fdf5f22f24a74e366a94a14c9b")))
(sha256 (sha256
(base32 (base32
"00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0")))) "0qk8m9aq3i7pzw6npim58xmsvjqfz5kl1pkyb6b43awn2vydydi5"))))
(arguments (arguments
(substitute-keyword-arguments `(;; Tests aren't passing for now. (substitute-keyword-arguments `(;; Tests aren't passing for now.
;; Obviously we should re-enable this! ;; Obviously we should re-enable this!
@ -212,6 +213,7 @@ without requiring the source code to be rewritten.")
(substitute* "build-aux/git-version-gen" (substitute* "build-aux/git-version-gen"
(("#!/bin/sh") (string-append "#!" (which "sh")))) (("#!/bin/sh") (string-append "#!" (which "sh"))))
#t)))))) #t))))))
(synopsis "Snapshot of what will become version 2.2 of GNU Guile")
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -221,6 +223,19 @@ without requiring the source code to be rewritten.")
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
,@(package-native-inputs guile-2.0))))) ,@(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. ;;; Extensions.