civodul pushed a commit to branch master
in repository maintenance.
commit 72bbee89c9e004c124f1103e12bea7dddd18de1f
Author: Ludovic Courtès <[email protected]>
Date: Wed Sep 5 12:17:24 2018 +0200
hydra: services: Fix "guix-modular-master" spec.
"build-aux/cuirass/guix-modular.scm" is designed to *not* rely on the
latest Guix modules. Adding those to its load path led it to require
guile-gcrypt, which would fail if the host system did not have it
installed.
* hydra/modules/sysadmin/services.scm (cuirass-specs): For
"guix-modular-master", keep #:load-path-inputs empty.
---
hydra/modules/sysadmin/services.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hydra/modules/sysadmin/services.scm
b/hydra/modules/sysadmin/services.scm
index 9380090..8b0c97e 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -79,7 +79,9 @@
(#:proc-args (subset . "all") (systems #$@systems))
(#:inputs . (#$(guix-input "guix" "master"))))
`((#:name . "guix-modular-master")
- (#:load-path-inputs . ("guix-modular"))
+ ;; Keep the load path empty: it uses the available Guix modules
+ ;; to build a trampoline.
+ (#:load-path-inputs . ())
(#:package-path-inputs . ())
(#:proc-input . "guix-modular")
(#:proc-file . "build-aux/cuirass/guix-modular.scm")
