civodul pushed a commit to branch master in repository maintenance. commit 02f99dbaf24badc156d5245a02104328f7db5c72 Author: Ludovic Courtès <l...@gnu.org> Date: Fri Jul 20 18:29:11 2018 +0200
hydra: services: Adjust Cuirass config to latest Cuirass. * hydra/modules/sysadmin/services.scm (guix-input): New procedure. (cuirass-specs): Adjust accordingly. --- hydra/modules/sysadmin/services.scm | 42 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/hydra/modules/sysadmin/services.scm b/hydra/modules/sysadmin/services.scm index 429d8d6..401707e 100644 --- a/hydra/modules/sysadmin/services.scm +++ b/hydra/modules/sysadmin/services.scm @@ -61,36 +61,30 @@ ;;; Cuirass. ;;; +(define* (guix-input #:key (branch "master")) + `((#:name . "guix") + (#:url . "https://git.savannah.gnu.org/git/guix.git") + (#:load-path . ".") + (#:branch . ,branch) + (#:no-compile? . #t))) + (define (cuirass-specs systems) "Return the Cuirass specifications to build Guix for the given SYSTEMS." - #~(list `((#:name . "guix") - ;; FIXME: The campus firewall blocks access to git:// - (#:url . "https://git.savannah.gnu.org/git/guix.git") - (#:load-path . ".") - - ;; This file is loaded relative to the checkout. - (#:file . "build-aux/cuirass/gnu-system.scm") - - (#:no-compile? . #t) ;don't try to run ./bootstrap etc. + #~(list `((#:name . "guix-master") + (#:load-path-inputs . ("guix")) + (#:proc-input . "guix") + (#:proc-file . "build-aux/cuirass/gnu-system.scm") (#:proc . cuirass-jobs) + (#:proc-arguments (subset . "all") (systems #$@systems)) + (#:inputs . ,(list (guix-input "master")))) - (#:arguments (subset . "all") (systems #$@systems)) - (#:branch . "master")) - - `((#:name . "guix-modular") - (#:url . "https://git.savannah.gnu.org/git/guix.git") - (#:load-path . ".") - - ;; This file is loaded relative to the checkout. - (#:file . "build-aux/cuirass/guix-modular.scm") - - (#:no-compile? . #t) ;don't try to run ./bootstrap etc. - + `((#:name . "guix-modular-master") + (#:proc-input . "guix") + (#:proc-file . "build-aux/cuirass/guix-modular.scm") (#:proc . cuirass-jobs) - - (#:arguments (systems #$@systems)) - (#:branch . "master")))) + (#:proc-arguments (systems #$@systems)) + (#:inputs . ,(list (guix-input "master")))))) ;;;