diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
| commit | 893c2df00daa4e6dd6a7ff3813d7df5329877f9e (patch) | |
| tree | acd0db459464acae47083b66d5ce12cc656e2f10 /gnu/packages/package-management.scm | |
| parent | 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 (diff) | |
| parent | 0ccc9a0f5bb89b239d56157ea66f8420fcec5ba6 (diff) | |
| download | guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 546806f284..fce0d0f84d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") - (revision 3)) + (commit "c902458863d1d341ffd74970b75e69c2bb848183") + (revision 4)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) + "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -292,7 +292,7 @@ (propagated-inputs `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -324,7 +324,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) |