me
/
guix
Archived
1
0
Fork 0
Code

gnu: cuirass: Update to 0.0.1-73.14e1335. 

* gnu/packages/ci.scm (cuirass): Update to 0.0.1-73.14e1335.
[arguments]: Enable tests and add new 'set-PATH-for-tests phase.
[native-inputs]: Add ephemeralpg.
master
Mathieu Othacehe 2021-03-10 08:41:10 +01:00
parent 0d5e2c587f
commit ff52d1156c
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gnu/packages/ci.scm
View File

@ -66,20 +66,21 @@
(file-name (string-append name "-" version "-checkout"))))))) (file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass (define-public cuirass
(let ((commit "543e26addc6e2304611e2feb8dd3a5a0646507b6") (let ((commit "14e1335732271fdce730cb7e5043429ea9155201")
(revision "72")) (revision "73"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git") (uri (git-reference
(commit commit))) (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
(file-name (git-file-name name version)) (commit commit)))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"01cxg0nwafzfg0phbv1b4cv24w7yaalkkdib3qfwf6jqagbfg85y")))) (base32
"1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -87,9 +88,14 @@
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:tests? #f ;requires a PostgreSQL database.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(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))
#t)))
(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.
@ -110,22 +116,25 @@
(deps (list avahi gcrypt json zmq squee git bytes (deps (list avahi gcrypt json zmq squee git bytes
fibers zlib matd tls mail guix)) fibers zlib matd tls mail guix))
(guile (assoc-ref %build-inputs "guile")) (guile (assoc-ref %build-inputs "guile"))
(effective (read-line (effective
(open-pipe* OPEN_READ (read-line
(string-append guile "/bin/guile") (open-pipe* OPEN_READ
"-c" "(display (effective-version))"))) (string-append guile "/bin/guile")
(mods (string-drop-right ;drop trailing colon "-c" "(display (effective-version))")))
(string-join deps (mods
(string-append "/share/guile/site/" (string-drop-right ;drop trailing colon
effective ":") (string-join deps
'suffix) (string-append "/share/guile/site/"
1)) effective ":")
(objs (string-drop-right 'suffix)
(string-join deps 1))
(string-append "/lib/guile/" effective (objs
"/site-ccache:") (string-drop-right
'suffix) (string-join deps
1))) (string-append "/lib/guile/" effective
"/site-ccache:")
'suffix)
1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as ;; Make sure 'cuirass' can find the 'evaluate' command, as
;; well as the relevant Guile modules. ;; well as the relevant Guile modules.
(for-each (for-each
@ -157,7 +166,8 @@
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)
("ephemeralpg" ,ephemeralpg)))
(native-search-paths (native-search-paths
;; For HTTPS access, Cuirass itself honors these variables, with the ;; For HTTPS access, Cuirass itself honors these variables, with the
;; same semantics as Git and OpenSSL (respectively). ;; same semantics as Git and OpenSSL (respectively).