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

gnu: cuirass: Use gexps.

Browse source 
* gnu/packages/ci.scm (cuirass)[arguments]: Rewrite as per ‘guix style
-S arguments’.
This commit is contained in:
Ludovic Courtès 2023-10-12 22:05:39 +02:00
parent 2588fb98f0
commit f0c929f1e6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 56 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/ci.scm
View file

@ -29,6 +29,7 @@ (define-module (gnu packages ci)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
@ -75,28 +76,28 @@ (define-public cuirass
"16d9ylzk8mwsgppfdxyl0k2mkwll7fq17d6v09406rqkgddxg3m2"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)
(list #:modules `((guix build utils)
(guix build gnu-build-system)
(ice-9 match)
(ice-9 rdelim)
(ice-9 popen)
(srfi srfi-1))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:configure-flags #~'("--localstatedir=/var") ;for /var/log/cuirass
;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them
;; on that architecture for now.
#:tests? ,(let ((s (or (%current-target-system)
#:tests? (let ((s (or (%current-target-system)
(%current-system))))
(not (string-prefix? "aarch64" s)))
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-before 'bootstrap 'fix-version-gen
(lambda _
(patch-shebang "build-aux/git-version-gen")
(call-with-output-file ".tarball-version"
(lambda (port)
(display ,version port)))))
(display #$(package-version this-package) port)))))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
@ -113,21 +114,25 @@ (define (sub-directory suffix)
(let* ((out (assoc-ref outputs "out"))
(effective
(read-line
(open-pipe* OPEN_READ (which "guile")
"-c" "(display (effective-version))")))
(open-pipe* OPEN_READ (which "guile") "-c"
"(display (effective-version))")))
(mods (filter-map (sub-directory
(string-append "/share/guile/site/"
(string-append
"/share/guile/site/"
effective))
inputs))
(objs (filter-map (sub-directory
(string-append "/lib/guile/"
effective
(string-append
"/lib/guile/" effective
"/site-ccache"))
inputs)))
(wrap-program (string-append out "/bin/cuirass")
`("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix ,mods)
`("GUILE_LOAD_COMPILED_PATH" ":" prefix ,objs))))))))
`("PATH" ":" prefix
(,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix
,mods)
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
,objs))))))))
(inputs
(list guile-3.0-latest
guile-avahi