diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-29 08:54:21 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-29 08:54:21 +0100 |
| commit | b02c197cdff45ccd5add1bfeae42d634f812c884 (patch) | |
| tree | ae93c8fca4de2969f1567a777a48747986cba396 | |
| parent | 39d0ce93be0f396a3f5092142309cb9e3aac647d (diff) | |
| parent | ae5e3d3a62bafefc7f592b6a7eb60a06598ae9f5 (diff) | |
| download | guix-b02c197cdff45ccd5add1bfeae42d634f812c884.tar guix-b02c197cdff45ccd5add1bfeae42d634f812c884.tar.gz | |
Merge branch '0.8.1-release'
| -rw-r--r-- | gnu/packages/package-management.scm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6f51a32eca..acb72f6bc6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -50,17 +50,17 @@ 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 @@ ,(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 @@ the Nix package manager.") (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 @@ the Nix package manager.") (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 @@ the Nix package manager.") ("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) |