diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2017-03-23 14:53:33 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2017-03-23 14:53:33 +0200 |
commit | 0371b345e8bffb0770b1a02ddd1c248f90566e04 (patch) | |
tree | ddfd9cc4e32193945f4891c3f77e2b8271c4a5ae /gnu/packages/package-management.scm | |
parent | 8be563a5a39205d55fd39399e29a9272305b34c6 (diff) | |
parent | c53af0016e283ef642ac43ccc2ee5d650f06a888 (diff) | |
download | guix-0371b345e8bffb0770b1a02ddd1c248f90566e04.tar guix-0371b345e8bffb0770b1a02ddd1c248f90566e04.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 f675e22ad9..cabfc862ac 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -214,9 +214,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 "1162418ee88f155f6b14fd8926479c2176e40e76")) + (let ((commit "73a46451af333c77d2e79aa8764f51be8c34d1ae")) (package (inherit guix-0.12.0) - (version (string-append "0.12.0-5." (string-take commit 4))) + (version (string-append "0.12.0-6." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -226,7 +226,7 @@ the Nix package manager.") (commit commit))) (sha256 (base32 - "16pxqbywhayazdgg9l19frigncmyq20j5fvaq4zgvm0iidndhfja")) + "1zfa6c1vf52rg7ba1nrz4hzgdwl16brc4iylcdnhl9mnkjg2fbr5")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.12.0) |