From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT6Ij-0004IR-Lz for guix-patches@gnu.org; Wed, 13 Jun 2018 09:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT6Ig-0006Sn-EL for guix-patches@gnu.org; Wed, 13 Jun 2018 09:59:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:38807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fT6Ig-0006RB-8A for guix-patches@gnu.org; Wed, 13 Jun 2018 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fT6If-0006F0-PK for guix-patches@gnu.org; Wed, 13 Jun 2018 09:59:01 -0400 Subject: [bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments. Resent-Message-ID: References: <20180613135001.28724-1-clement@lassieur.org> From: Mathieu Othacehe In-reply-to: <20180613135001.28724-1-clement@lassieur.org> Date: Wed, 13 Jun 2018 15:58:42 +0200 Message-ID: <87sh5qiy99.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 31813@debbugs.gnu.org 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=3Durl1 or guix pull --url=3Durl2 Cuirass + new "guix pull" is becoming awesome, can't wait to have a nice web interface :) Mathieu Cl=C3=A9ment 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 > --- > 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:-@GUILE@} --no-auto-compile -e main -s "$0" = "$@" > ;;;; evaluate -- convert a specification to a job list > ;;; Copyright =C2=A9 2016, 2018 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2016, 2017 Mathieu Lirzin > -;;; Copyright =C2=A9 2017 Mathieu Othacehe > +;;; Copyright =C2=A9 2017, 2018 Mathieu Othacehe > +;;; Copyright =C2=A9 2018 Cl=C3=A9ment Lassieur > ;;; > ;;; 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) '())))