rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'version-0.9.0'

Browse Source
This commit is contained in:
Ludovic Courtès 2015-11-04 23:43:54 +01:00
commit 5107232f82
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/package-management.scm
View File

@ -60,17 +60,17 @@ (define (boot-guile-uri arch)
arch "-linux" arch "-linux"
"/20131110/guile-2.0.9.tar.xz"))) "/20131110/guile-2.0.9.tar.xz")))
(define-public guix-0.8.3 (define-public guix-0.9.0
(package (package
(name "guix") (name "guix")
(version "0.8.3") (version "0.9.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-" (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14n0nkj0ckhdwhghx1pml99hbjr1xdkn8x145j0xp1357vqlisnz")))) "0h573z2br0bf43sxyzia9xlm03n3y43zg1snds3c2piq2m6kabrn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
@ -195,9 +195,9 @@ (define guix-devel
;; ;;
;; Note: use a short commit id; when using the long one, the limit on socket ;; Note: use a short commit id; when using the long one, the limit on socket
;; file names is exceeded while running the tests. ;; file names is exceeded while running the tests.
(let ((commit "b485f75")) (let ((commit "43c082b"))
(package (inherit guix-0.8.3) (package (inherit guix-0.9.0)
(version (string-append "0.8.3." commit)) (version (string-append "0.9.0." commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -205,10 +205,10 @@ (define guix-devel
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph")) "12ffsyrabsisyf5va4p2csvig6r8g4b7w1dxgsy446l4pjdl7ndh"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.8.3) (substitute-keyword-arguments (package-arguments guix-0.9.0)
((#:configure-flags flags) ((#:configure-flags flags)
;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
;; reference to Graphviz, whose closure is pretty big (too big for ;; reference to Graphviz, whose closure is pretty big (too big for
@ -232,7 +232,7 @@ (define guix-devel
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("graphviz" ,graphviz) ("graphviz" ,graphviz)
("help2man" ,help2man) ("help2man" ,help2man)
,@(package-native-inputs guix-0.8.3)))))) ,@(package-native-inputs guix-0.9.0))))))
(define-public guix guix-devel) (define-public guix guix-devel)