ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix, cuirass: Update to c902458 and 858b6b8 with Guile-JSON 3.x.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2019-08-17 19:13:15 +02:00
parent c902458863
commit 2eb0628a42
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/ci.scm
View file

@ -47,8 +47,8 @@ (define-module (gnu packages ci)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
(define-public cuirass (define-public cuirass
(let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e") (let ((commit "858b6b8c8f2ae7b1ddaf4ae363147121be1f1fe8")
(revision "21")) (revision "22"))
(package (package
(name "cuirass") (name "cuirass")
(version (string-append "0.0.1-" revision "." (string-take commit 7))) (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -60,7 +60,7 @@ (define-public cuirass
(file-name (string-append name "-" version)) (file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"1kdxs8dzdyldfs4wsz5hb64hprkbrnq5ljdll631f3bj8pbvvvc1")))) "049hg0yaakmfp27950cn0yn43r0v7bqva75xi082n8cxzi6vadgc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -121,7 +121,7 @@ (define-public cuirass
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-1) ("guile-json" ,guile-json-3)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
;; FIXME: this is propagated by "guile-git", but it needs to be among ;; FIXME: this is propagated by "guile-git", but it needs to be among

10
gnu/packages/package-management.scm
View file

@ -111,8 +111,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.0.1") (let ((version "1.0.1")
(commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") (commit "c902458863d1d341ffd74970b75e69c2bb848183")
(revision 3)) (revision 4))
(package (package
(name "guix") (name "guix")
@ -128,7 +128,7 @@ (define-public guix
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -293,7 +293,7 @@ (define (intern tarball)
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-1) ("guile-json" ,guile-json-3)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
("guile-ssh" ,guile-ssh) ("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git))) ("guile-git" ,guile-git)))
@ -325,7 +325,7 @@ (define-public guix-daemon
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
("guile-json" ,guile-json-1) ("guile-json" ,guile-json-3)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
,@(fold alist-delete (package-inputs guix) ,@(fold alist-delete (package-inputs guix)
'("boot-guile" "boot-guile/i686" "util-linux")))) '("boot-guile" "boot-guile/i686" "util-linux"))))