diff options
| author | Clément Lassieur <clement@lassieur.org> | 2018-06-13 15:50:01 +0200 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2018-06-18 17:58:34 +0200 |
| commit | 14f310f3b3e9fecfddce1529ec5631c829f8190c (patch) | |
| tree | 48c7b496a928431c567e6c9d5ac4b1c6a59051fe /bin | |
| parent | 85a373f639376307156510bbf24ec2fa30da5acd (diff) | |
| download | cuirass-14f310f3b3e9fecfddce1529ec5631c829f8190c.tar cuirass-14f310f3b3e9fecfddce1529ec5631c829f8190c.tar.gz | |
evaluate: Use a generic key to identify Cuirass arguments.
So that Cuirass specifications used to build 'guix-modular' can be named
differently than "guix" and "guix-modular" (see Guix's
build-aux/hydra/guix-modular.scm).
The name is used as a primary key, so before that commit, it was also
impossible to have several such specifications.
This is a workaround, Cuirass should normally support several inputs per
specification, as Hydra does. The specification's name would then only be
used to identify it. See <https://bugs.gnu.org/31813>.
* bin/evaluate.in (main): Replace custom NAME (passed to PROC) with 'guix'.
Co-authored-by: Mathieu Othacehe <m.othacehe@gmail.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/evaluate.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/evaluate.in b/bin/evaluate.in index d973c44..86d0e83 100644 --- a/bin/evaluate.in +++ b/bin/evaluate.in @@ -6,7 +6,8 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" ;;;; evaluate -- convert a specification to a job list ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> -;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of Cuirass. ;;; @@ -98,7 +99,7 @@ building things during evaluation~%") (proc (module-ref %user-module proc-name)) (commit (assq-ref spec #:current-commit)) (name (assq-ref spec #:name)) - (args `((,(string->symbol name) + (args `((guix (revision . ,commit) (file-name . ,source)) ,@(or (assq-ref spec #:arguments) '()))) |