summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-10 00:21:55 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-10 00:23:53 +0200
commit357e0b2690e6ce647065ce721b58d860d71fdead (patch)
tree28fa71a98b434e16c043db647d0ecc4f9b762634
parentfbea62f829f92da63b65d96d09a2a48b77b2c3d1 (diff)
gnu: cuirass: Update to 4a8a4bc.
Fixes <https://issues.guix.gnu.org/63389>. * gnu/packages/ci.scm (cuirass): Update to 4a8a4bc. [arguments]: Remove 'set-PATH-for-tests' and 'disable-remote-tests' phases, which are unnecessary. In 'wrap-program' phase, check for "guile-gnutls". [inputs]: Replace GUILE-FIBERS with GUILE-FIBERS-1.1 and GNUTLS with GUILE-GNUTLS.
-rw-r--r--gnu/packages/ci.scm22
1 files changed, 6 insertions, 16 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 4380f327be..112987b6df 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -58,8 +58,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass
- (let ((commit "1341725f2cbb886e0960c6fad13444e3cfe36c13")
- (revision "13"))
+ (let ((commit "4a8a4bc1f83924c88740b08b14cbfbc089502997")
+ (revision "15"))
(package
(name "cuirass")
(version (git-version "1.1.0" revision commit))
@@ -72,7 +72,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0l928hd84ky9l4d1nfdkzc4jvghvxia4j6gflliydvfiyfiw87b3"))))
+ "0s55yx86wqnb543vwbs2kj6bmnzqrvjgj3mafm7vzvfrxrqj3xgi"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)
@@ -95,16 +95,6 @@
(call-with-output-file ".tarball-version"
(lambda (port)
(display ,version port)))))
- (add-before 'check 'set-PATH-for-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((pg (assoc-ref inputs "ephemeralpg"))
- (path (getenv "PATH")))
- (setenv "PATH" (string-append pg "/bin:" path)))))
- ;; Disable the remote tests that require a Guix daemon connection.
- (add-before 'check 'disable-remote-tests
- (lambda _
- (substitute* "Makefile.am"
- (("tests/remote.scm") ""))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
@@ -119,7 +109,7 @@
(fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib"))
(matd (assoc-ref inputs "guile-mastodon"))
- (tls (assoc-ref inputs "gnutls"))
+ (tls (assoc-ref inputs "guile-gnutls"))
(mail (assoc-ref inputs "mailutils"))
(guix (assoc-ref inputs "guix"))
(deps (list avahi gcrypt json zmq squee git bytes
@@ -152,7 +142,7 @@
(inputs
(list guile-3.0-latest
guile-avahi
- guile-fibers
+ guile-fibers-1.1
guile-gcrypt
guile-json-4
guile-simple-zmq
@@ -160,7 +150,7 @@
guile-git
guile-zlib
guile-mastodon
- gnutls
+ guile-gnutls
mailutils
;; FIXME: this is propagated by "guile-git", but it needs to be among
;; the inputs to add it to GUILE_LOAD_PATH.