diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 19:13:15 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 19:25:48 +0200 |
| commit | 2eb0628a423a36bc21777d7439885baa9a9a8e6d (patch) | |
| tree | 8cbfd434295fad8087d6d457a5bb45a7847ecd79 /gnu/packages | |
| parent | c902458863d1d341ffd74970b75e69c2bb848183 (diff) | |
| download | patches-2eb0628a423a36bc21777d7439885baa9a9a8e6d.tar patches-2eb0628a423a36bc21777d7439885baa9a9a8e6d.tar.gz | |
gnu: guix, cuirass: Update to c902458 and 858b6b8 with Guile-JSON 3.x.
* gnu/packages/package-management.scm (guix): Update to c902458.
[inputs]: Switch to GUILE-JSON-3.
(guix-daemon)[inputs]: Switch to GUILE-JSON-3.
* gnu/packages/ci.scm (cuirass): Update to 858b6b8.
[inputs]: Switch to GUILE-JSON-3.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/ci.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4af2cdc6ea..d706e8d04b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e") - (revision "21")) + (let ((commit "858b6b8c8f2ae7b1ddaf4ae363147121be1f1fe8") + (revision "22")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1kdxs8dzdyldfs4wsz5hb64hprkbrnq5ljdll631f3bj8pbvvvc1")))) + "049hg0yaakmfp27950cn0yn43r0v7bqva75xi082n8cxzi6vadgc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -121,7 +121,7 @@ `(("guile" ,guile-2.2) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3b003fd30f..c982cbfe5d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,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") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) + "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -293,7 +293,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))) @@ -325,7 +325,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")))) |