diff options
author | Andreas Enge <andreas@enge.fr> | 2016-07-28 11:08:55 +0200 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2016-07-28 11:08:55 +0200 |
commit | e309c7561043361afe63cc9435e620323f870a61 (patch) | |
tree | cd6fe073ba840bb68f446933ece44b45d8eb5ec7 /gnu/packages/package-management.scm | |
parent | 1bb163b0dd07c8f2cfd7e91f1e428075cd3d5ed2 (diff) | |
parent | e335b82c4eba13fe873db2d680d399469931c10f (diff) | |
download | guix-e309c7561043361afe63cc9435e620323f870a61.tar guix-e309c7561043361afe63cc9435e620323f870a61.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r-- | gnu/packages/package-management.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cd58fde249..77c1da357c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -211,9 +211,9 @@ the Nix package manager.") ;; ;; Note: use a very short commit id; with a longer one, the limit on ;; hash-bang lines would be exceeded while running the tests. - (let ((commit "e9017c98d61f305b624bacaa30e8891ec0100980")) + (let ((commit "97c8aef15de89799ac01b62dd9b91245c23eefcb")) (package (inherit guix-0.10.0) - (version (string-append "0.10.0-0." (string-take commit 4))) + (version (string-append "0.10.0-1." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -223,7 +223,7 @@ the Nix package manager.") (commit commit))) (sha256 (base32 - "13mfk10cw6fk4diclzld56xwabshanxjcczdrjlj0wisaz32h3nl")) + "0sdxq87mbvig7785gzf52ywmvl3p1q1qgsczmkzrlw988xkma1dr")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.10.0) |