diff options
author | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:24 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:55 -0400 |
commit | c67d587f94173fd42d65097165afc5c512935646 (patch) | |
tree | ee2bac9d683d0dec98d611d5e590b06d9876cad3 /gnu/packages/package-management.scm | |
parent | 4f493cba06b97de756123b3855ea52dcf1ad3555 (diff) | |
parent | 4679dd6967c21e21c740cd88e17191b8e2aac5ee (diff) | |
download | guix-c67d587f94173fd42d65097165afc5c512935646.tar guix-c67d587f94173fd42d65097165afc5c512935646.tar.gz |
Merge branch 'master' into core-updates
This merge commit includes a fix for CVE-2017-6512 in Perl 5.26.0.
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 eb3a15e080..8cc18162aa 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -74,8 +74,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.13.0") - (commit "a6d728b7aaee09892b0b420d07ed2dbb7de5e63f") - (revision 1)) + (commit "de9d8f0e295928d92e0e5ea43a4e594fa78c76fb") + (revision 2)) (package (name "guix") @@ -91,7 +91,7 @@ (commit commit))) (sha256 (base32 - "1nrskyk8z6w5i9cdfh5zxfgsrqf744sb30ssqi2g5xhijwagr1yq")) + "0px7n4vajc9am3snhnnvddrmnwnb2ygwz0f8isk0qhk8b1ks4kdx")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments |