me
/
guix
Archived
1
0
Fork 0

gnu: cuirass: Update to 1.0.0-1.0497e0d.

* gnu/packages/ci.scm (cuirass): Update to 1.0.0-1.0497e0d.
master
Mathieu Othacehe 2021-03-23 11:45:54 +01:00
parent 7fc1fac64a
commit d1e1682749
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 16 additions and 13 deletions

View File

@ -66,11 +66,11 @@
(file-name (string-append name "-" version "-checkout"))))))) (file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass (define-public cuirass
(let ((commit "88f3cf65e0b5974c6525d498ebffc607bc62baf0") (let ((commit "0497e0d6c4184223034855b61312d38ffae0b766")
(revision "77")) (revision "1"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "1.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -80,7 +80,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mwi6i400kjdkfccvbc49fka18dhkcl0rbiqylgpb7lh0pzss9j7")))) "1y6030kx6c8h927gr30b78b3flwlqx15iakrc2lgw5xw0367gqhg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -88,6 +88,7 @@
(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
#:parallel-tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'set-PATH-for-tests (add-before 'check 'set-PATH-for-tests
@ -96,6 +97,12 @@
(path (getenv "PATH"))) (path (getenv "PATH")))
(setenv "PATH" (string-append pg "/bin:" path)) (setenv "PATH" (string-append pg "/bin:" path))
#t))) #t)))
;; Disable the remote tests that require a Guix daemon connection.
(add-before 'check 'disable-remote-tests
(lambda _
(substitute* "Makefile.am"
(("tests/remote.scm") ""))
#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.
@ -135,15 +142,11 @@
"/site-ccache:") "/site-ccache:")
'suffix) 'suffix)
1))) 1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as ;; Make sure 'cuirass' can find the relevant Guile modules.
;; well as the relevant Guile modules. (wrap-program (string-append out "/bin/cuirass")
(for-each
(lambda (name)
(wrap-program (string-append out "/bin/" name)
`("PATH" ":" prefix (,(string-append out "/bin"))) `("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods)) `("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
'("cuirass" "remote-server" "remote-worker"))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-3.0/libgc-7) `(("guile" ,guile-3.0/libgc-7)