[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass argu
From: |
Mathieu Othacehe |
Subject: |
[bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments. |
Date: |
Wed, 13 Jun 2018 15:58:42 +0200 |
User-agent: |
mu4e 1.0; emacs 26.1 |
Hi,
Thanks to this patch, we are able to build on Cuirass guix package from
multiple source repositories (guix-modular-url1, guix-modular-url2, ...)
and then guix pull --url=url1 or guix pull --url=url2
Cuirass + new "guix pull" is becoming awesome, can't wait to have a
nice web interface :)
Mathieu
Clément Lassieur writes:
> 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.
>
> * bin/evaluate.in (main): Replace custom NAME (passed to PROC) with 'guix'.
>
> Co-authored-by: Mathieu Othacehe <address@hidden>
> ---
> bin/evaluate.in | 5 +++--
> 1 file 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:address@hidden@} --no-auto-compile -e main -s
> "$0" "$@"
> ;;;; evaluate -- convert a specification to a job list
> ;;; Copyright © 2016, 2018 Ludovic Courtès <address@hidden>
> ;;; Copyright © 2016, 2017 Mathieu Lirzin <address@hidden>
> -;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
> +;;; Copyright © 2017, 2018 Mathieu Othacehe <address@hidden>
> +;;; Copyright © 2018 Clément Lassieur <address@hidden>
> ;;;
> ;;; 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) '())))