mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 06:06:53 -05:00
gnu: guix: Update to 0.8.1.
* gnu/packages/package-management.scm (guix-0.8): Rename to... (guix-0.8.1): ... this. Add 'propagated-inputs'. (guix-devel): Append ".0" to version number. Remove 'propagated-inputs'. (guix): Set to GUIX-0.8.1.
This commit is contained in:
parent
983c082a74
commit
f1082ec16c
1 changed files with 12 additions and 12 deletions
|
@ -50,17 +50,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
|
(define-public guix-0.8.1
|
||||||
(package
|
(package
|
||||||
(name "guix")
|
(name "guix")
|
||||||
(version "0.8")
|
(version "0.8.1")
|
||||||
(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
|
||||||
"1p7yqbnhjc1yjzinbjzphgj6wasc7p8ki9yj0vql5bsz01dp28zv"))))
|
"12h5ldj1yf0za6ladlr8h7nx2gqrv2dxcsiwyqayvrza93lijkf5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags (list
|
`(#:configure-flags (list
|
||||||
|
@ -125,6 +125,10 @@ (define (copy arch)
|
||||||
,(boot-guile "armhf"
|
,(boot-guile "armhf"
|
||||||
(base32
|
(base32
|
||||||
"1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))))))
|
"1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))))))
|
||||||
|
(propagated-inputs
|
||||||
|
`(("guile-json" ,guile-json)
|
||||||
|
("geiser" ,geiser))) ;for guix.el
|
||||||
|
|
||||||
(home-page "http://www.gnu.org/software/guix")
|
(home-page "http://www.gnu.org/software/guix")
|
||||||
(synopsis "Functional package manager for installed software packages and versions")
|
(synopsis "Functional package manager for installed software packages and versions")
|
||||||
(description
|
(description
|
||||||
|
@ -138,8 +142,8 @@ (define (copy arch)
|
||||||
(define guix-devel
|
(define guix-devel
|
||||||
;; Development version of Guix.
|
;; Development version of Guix.
|
||||||
(let ((commit "4ad8789"))
|
(let ((commit "4ad8789"))
|
||||||
(package (inherit guix-0.8)
|
(package (inherit guix-0.8.1)
|
||||||
(version (string-append "0.8." commit))
|
(version (string-append "0.8.0." commit))
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -149,7 +153,7 @@ (define guix-devel
|
||||||
(base32
|
(base32
|
||||||
"058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
|
"058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments guix-0.8)
|
(substitute-keyword-arguments (package-arguments guix-0.8.1)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(alist-cons-before
|
`(alist-cons-before
|
||||||
'configure 'bootstrap
|
'configure 'bootstrap
|
||||||
|
@ -167,13 +171,9 @@ (define guix-devel
|
||||||
("gettext" ,gnu-gettext)
|
("gettext" ,gnu-gettext)
|
||||||
("texinfo" ,texinfo)
|
("texinfo" ,texinfo)
|
||||||
("graphviz" ,graphviz)
|
("graphviz" ,graphviz)
|
||||||
,@(package-native-inputs guix-0.8)))
|
,@(package-native-inputs guix-0.8.1))))))
|
||||||
(propagated-inputs
|
|
||||||
`(("guile-json" ,guile-json)
|
|
||||||
("geiser" ,geiser) ;for guix.el
|
|
||||||
,@(package-propagated-inputs guix-0.8))))))
|
|
||||||
|
|
||||||
(define-public guix guix-devel)
|
(define-public guix guix-0.8.1)
|
||||||
|
|
||||||
(define-public nix
|
(define-public nix
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Reference in a new issue