civodul pushed a commit to branch wip-pull-multiple-derivations in repository guix.
commit 49143ba0bcbfe82546322a83cf77fd9d729b5448 Author: Ludovic Courtès <l...@gnu.org> Date: Tue Mar 27 09:48:16 2018 +0200 cuirass: Add job specs for the modular Guix. * build-aux/cuirass/guix-modular.scm: New file. * Makefile.am (EXTRA_DIST): Add it. --- Makefile.am | 1 + build-aux/cuirass/guix-modular.scm | 6 ++++++ build-aux/hydra/guix-modular.scm | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e630797..517322b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -469,6 +469,7 @@ EXTRA_DIST = \ build-aux/hydra/guix.scm \ build-aux/hydra/guix-modular.scm \ build-aux/cuirass/gnu-system.scm \ + build-aux/cuirass/guix-modular.scm \ build-aux/cuirass/hydra-to-cuirass.scm \ build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ diff --git a/build-aux/cuirass/guix-modular.scm b/build-aux/cuirass/guix-modular.scm new file mode 100644 index 0000000..50afabe --- /dev/null +++ b/build-aux/cuirass/guix-modular.scm @@ -0,0 +1,6 @@ +;;; +;;; This file defines Cuirass build jobs to build Guix itself. +;;; + +(include-from-path "build-aux/hydra/guix-modular.scm") +(include-from-path "build-aux/cuirass/hydra-to-cuirass.scm") diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index bdbb2fa..9155f32 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -86,7 +86,8 @@ for SYSTEM. Use VERSION as the version identifier." (list (%current-system))))) (define guix-checkout - (assq-ref arguments 'guix)) + (or (assq-ref arguments 'guix) ;Hydra on hydra + (assq-ref arguments 'guix-modular))) ;Cuirass on berlin (define version (or (assq-ref guix-checkout 'revision)