diff options
author | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
commit | a351fc83694f436c3bff7cbdef09bd3cc91c74fc (patch) | |
tree | 646145378742a6943d7c4dda995fc0fb67f9db32 /gnu/packages/package-management.scm | |
parent | 80b63e670ef4fe1fd40a903bcd4ee47a11415bd9 (diff) | |
parent | d1a5b20081c30da7503201df260cf20b8d0ba633 (diff) | |
download | guix-a351fc83694f436c3bff7cbdef09bd3cc91c74fc.tar.gz |
Merge branch 'master' into staging
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 4907a5016e..ac7c26d40c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -226,9 +226,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 "1f410017ff91458feda8c5788223d17696b71e36")) + (let ((commit "463fb7d0c86fb9957c527272e6cec5ee23585366")) (package (inherit guix-0.11.0) - (version (string-append "0.11.0-4." (string-take commit 4))) + (version (string-append "0.11.0-5." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -238,7 +238,7 @@ the Nix package manager.") (commit commit))) (sha256 (base32 - "1mgzcbf1mry39wvvjflj76zggsshsip2pngxpaf2479yr3ri6v50")) + "0k74j6m5hy055knirnry75qrgph4zywypxjyaqv6saixb6yx7av3")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.11.0) |