ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '0.8.1-release'

Browse source
This commit is contained in:
Ludovic Courtès 2015-01-29 08:54:21 +01:00
commit b02c197cdf
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/package-management.scm
View file

@ -50,17 +50,17 @@ (define (boot-guile-uri arch)
arch "-linux"
"/20131110/guile-2.0.9.tar.xz")))
(define-public guix-0.8
(define-public guix-0.8.1
(package
(name "guix")
(version "0.8")
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
version ".tar.gz"))
(sha256
(base32
"1p7yqbnhjc1yjzinbjzphgj6wasc7p8ki9yj0vql5bsz01dp28zv"))))
"12h5ldj1yf0za6ladlr8h7nx2gqrv2dxcsiwyqayvrza93lijkf5"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list
@ -125,6 +125,10 @@ (define (copy arch)
,(boot-guile "armhf"
(base32
"1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))))))
(propagated-inputs
`(("guile-json" ,guile-json)
("geiser" ,geiser))) ;for guix.el
(home-page "http://www.gnu.org/software/guix")
(synopsis "Functional package manager for installed software packages and versions")
(description
@ -137,9 +141,9 @@ (define (copy arch)
(define guix-devel
;; Development version of Guix.
(let ((commit "4ad8789"))
(package (inherit guix-0.8)
(version (string-append "0.8." commit))
(let ((commit "f1082ec"))
(package (inherit guix-0.8.1)
(version (string-append "0.8.1." commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -147,9 +151,9 @@ (define guix-devel
(commit commit)))
(sha256
(base32
"058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
"0mmwmv3wbrgzs49gnxraj11fp1mxfry4r0n222l3p4yga27vzw6d"))))
(arguments
(substitute-keyword-arguments (package-arguments guix-0.8)
(substitute-keyword-arguments (package-arguments guix-0.8.1)
((#:phases phases)
`(alist-cons-before
'configure 'bootstrap
@ -167,11 +171,7 @@ (define guix-devel
("gettext" ,gnu-gettext)
("texinfo" ,texinfo)
("graphviz" ,graphviz)
,@(package-native-inputs guix-0.8)))
(propagated-inputs
`(("guile-json" ,guile-json)
("geiser" ,geiser) ;for guix.el
,@(package-propagated-inputs guix-0.8))))))
,@(package-native-inputs guix-0.8.1))))))
(define-public guix guix-devel)