me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2023-05-10 00:21:55 +02:00
parent fbea62f829
commit 357e0b2690
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/ci.scm
View File

@ -58,8 +58,8 @@
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
(define-public cuirass (define-public cuirass
(let ((commit "1341725f2cbb886e0960c6fad13444e3cfe36c13") (let ((commit "4a8a4bc1f83924c88740b08b14cbfbc089502997")
(revision "13")) (revision "15"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "1.1.0" revision commit)) (version (git-version "1.1.0" revision commit))
@ -72,7 +72,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0l928hd84ky9l4d1nfdkzc4jvghvxia4j6gflliydvfiyfiw87b3")))) "0s55yx86wqnb543vwbs2kj6bmnzqrvjgj3mafm7vzvfrxrqj3xgi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
@ -95,16 +95,6 @@
(call-with-output-file ".tarball-version" (call-with-output-file ".tarball-version"
(lambda (port) (lambda (port)
(display ,version 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 (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules. ;; Wrap the 'cuirass' command to refer to the right modules.
@ -119,7 +109,7 @@
(fibers (assoc-ref inputs "guile-fibers")) (fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib")) (zlib (assoc-ref inputs "guile-zlib"))
(matd (assoc-ref inputs "guile-mastodon")) (matd (assoc-ref inputs "guile-mastodon"))
(tls (assoc-ref inputs "gnutls")) (tls (assoc-ref inputs "guile-gnutls"))
(mail (assoc-ref inputs "mailutils")) (mail (assoc-ref inputs "mailutils"))
(guix (assoc-ref inputs "guix")) (guix (assoc-ref inputs "guix"))
(deps (list avahi gcrypt json zmq squee git bytes (deps (list avahi gcrypt json zmq squee git bytes
@ -152,7 +142,7 @@
(inputs (inputs
(list guile-3.0-latest (list guile-3.0-latest
guile-avahi guile-avahi
guile-fibers guile-fibers-1.1
guile-gcrypt guile-gcrypt
guile-json-4 guile-json-4
guile-simple-zmq guile-simple-zmq
@ -160,7 +150,7 @@
guile-git guile-git
guile-zlib guile-zlib
guile-mastodon guile-mastodon
gnutls guile-gnutls
mailutils mailutils
;; 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
;; the inputs to add it to GUILE_LOAD_PATH. ;; the inputs to add it to GUILE_LOAD_PATH.