gnu: guix-build-coordinator: Neaten up the package definitions.
Remove duplication and redundant append calls. * gnu/packages/package-management.scm (guix-build-coordinator)[inputs]: Always add sqitch. [propagated-inputs]: Always add guile-fibers-next. (guix-build-coordinator-agent-only)[arguments]: Remove unnecessary duplication of phases. [propagated-inputs]: Remove unnecessary append.
This commit is contained in:
Christopher Baines
parent
70986f052a
commit
38cfe61780
1 changed files with 26 additions and 83 deletions
|
|
@ -1474,27 +1474,21 @@ environments.")
|
||||||
guile-lib
|
guile-lib
|
||||||
(first (assoc-ref (package-native-inputs guix) "guile"))))
|
(first (assoc-ref (package-native-inputs guix) "guile"))))
|
||||||
(inputs
|
(inputs
|
||||||
(append
|
(list (first (assoc-ref (package-native-inputs guix) "guile"))
|
||||||
(list (first (assoc-ref (package-native-inputs guix) "guile"))
|
sqlite
|
||||||
sqlite
|
bash-minimal
|
||||||
bash-minimal)
|
sqitch))
|
||||||
(if (hurd-target?)
|
|
||||||
'()
|
|
||||||
(list sqitch))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(append
|
(list guile-prometheus
|
||||||
(list guile-prometheus
|
guile-gcrypt
|
||||||
guile-gcrypt
|
guile-json-4
|
||||||
guile-json-4
|
guile-lib
|
||||||
guile-lib
|
guile-lzlib
|
||||||
guile-lzlib
|
guile-zlib
|
||||||
guile-zlib
|
guile-sqlite3
|
||||||
guile-sqlite3
|
guix
|
||||||
guix
|
guile-gnutls
|
||||||
guile-gnutls)
|
guile-fibers-next))
|
||||||
(if (hurd-target?)
|
|
||||||
'()
|
|
||||||
(list guile-fibers-next))))
|
|
||||||
(home-page "https://git.cbaines.net/guix/build-coordinator/")
|
(home-page "https://git.cbaines.net/guix/build-coordinator/")
|
||||||
(synopsis "Tool to help build derivations")
|
(synopsis "Tool to help build derivations")
|
||||||
(description
|
(description
|
||||||
|
|
@ -1508,62 +1502,12 @@ outputs of those builds.")
|
||||||
(inherit guix-build-coordinator)
|
(inherit guix-build-coordinator)
|
||||||
(name "guix-build-coordinator-agent-only")
|
(name "guix-build-coordinator-agent-only")
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules (((guix build guile-build-system)
|
(list
|
||||||
|
#:modules `(((guix build guile-build-system)
|
||||||
#:select (target-guile-effective-version))
|
#:select (target-guile-effective-version))
|
||||||
,@%gnu-build-system-modules)
|
,@%gnu-build-system-modules)
|
||||||
#:imported-modules ((guix build guile-build-system)
|
#:imported-modules `((guix build guile-build-system)
|
||||||
,@%gnu-build-system-modules)
|
,@%gnu-build-system-modules)))
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-before 'build 'set-GUILE_AUTO_COMPILE
|
|
||||||
(lambda _
|
|
||||||
;; To avoid warnings relating to 'guild'.
|
|
||||||
(setenv "GUILE_AUTO_COMPILE" "0")
|
|
||||||
#t))
|
|
||||||
(add-after 'install 'wrap-executable
|
|
||||||
(lambda* (#:key inputs outputs target #:allow-other-keys)
|
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
|
||||||
(bin (string-append out "/bin"))
|
|
||||||
(guile (assoc-ref inputs "guile"))
|
|
||||||
(version (target-guile-effective-version))
|
|
||||||
(scm (string-append out "/share/guile/site/" version))
|
|
||||||
(go (string-append out "/lib/guile/" version "/site-ccache")))
|
|
||||||
(for-each
|
|
||||||
(lambda (file)
|
|
||||||
(simple-format (current-error-port) "wrapping: ~A\n" file)
|
|
||||||
(let ((guile-inputs (list
|
|
||||||
"guile-json"
|
|
||||||
"guile-gcrypt"
|
|
||||||
"guix"
|
|
||||||
"guile-prometheus"
|
|
||||||
"guile-lib"
|
|
||||||
"guile-lzlib"
|
|
||||||
"guile-zlib"
|
|
||||||
"guile-sqlite3"
|
|
||||||
"guile-gnutls")))
|
|
||||||
(wrap-program file
|
|
||||||
`("PATH" ":" prefix (,bin))
|
|
||||||
`("GUILE_LOAD_PATH" ":" prefix
|
|
||||||
(,scm ,(string-join
|
|
||||||
(map (lambda (input)
|
|
||||||
(simple-format
|
|
||||||
#f "~A/share/guile/site/~A"
|
|
||||||
(assoc-ref inputs input)
|
|
||||||
version))
|
|
||||||
guile-inputs)
|
|
||||||
":")))
|
|
||||||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
|
|
||||||
(,go ,(string-join
|
|
||||||
(map (lambda (input)
|
|
||||||
(simple-format
|
|
||||||
#f "~A/lib/guile/~A/site-ccache"
|
|
||||||
(assoc-ref inputs input)
|
|
||||||
version))
|
|
||||||
guile-inputs)
|
|
||||||
":"))))))
|
|
||||||
(find-files bin)))
|
|
||||||
#t))
|
|
||||||
(delete 'strip)))) ; As the .go files aren't compatible
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config
|
(list pkg-config
|
||||||
autoconf
|
autoconf
|
||||||
|
|
@ -1581,15 +1525,14 @@ outputs of those builds.")
|
||||||
(list (first (assoc-ref (package-native-inputs guix) "guile"))
|
(list (first (assoc-ref (package-native-inputs guix) "guile"))
|
||||||
bash-minimal))
|
bash-minimal))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(append
|
(list guile-prometheus
|
||||||
(list guile-prometheus
|
guile-gcrypt
|
||||||
guile-gcrypt
|
guile-json-4
|
||||||
guile-json-4
|
guile-lib
|
||||||
guile-lib
|
guile-lzlib
|
||||||
guile-lzlib
|
guile-zlib
|
||||||
guile-zlib
|
guix
|
||||||
guix
|
guile-gnutls))
|
||||||
guile-gnutls)))
|
|
||||||
(description
|
(description
|
||||||
"The Guix Build Coordinator helps with performing lots of builds across
|
"The Guix Build Coordinator helps with performing lots of builds across
|
||||||
potentially many machines, and with doing something with the results and
|
potentially many machines, and with doing something with the results and
|
||||||
|
|
|
||||||
Reference in a new issue