From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT6B1-0000SQ-1Q for guix-patches@gnu.org; Wed, 13 Jun 2018 09:51:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT6Ax-0008Ga-NV for guix-patches@gnu.org; Wed, 13 Jun 2018 09:51:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fT6Ax-0008GO-Jt for guix-patches@gnu.org; Wed, 13 Jun 2018 09:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fT6Ax-0005s5-DP for guix-patches@gnu.org; Wed, 13 Jun 2018 09:51:03 -0400 Subject: [bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT6AD-0000BW-Gq for guix-patches@gnu.org; Wed, 13 Jun 2018 09:50:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT6AA-0005oc-8M for guix-patches@gnu.org; Wed, 13 Jun 2018 09:50:17 -0400 Received: from mail.lassieur.org ([83.152.10.219]:49970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fT6A9-0005gR-GT for guix-patches@gnu.org; Wed, 13 Jun 2018 09:50:13 -0400 Received: from newt.Parrot.Biz (smtp.parrot.biz [62.23.167.188]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id a9abe510 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Wed, 13 Jun 2018 13:50:10 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Wed, 13 Jun 2018 15:50:01 +0200 Message-Id: <20180613135001.28724-1-clement@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 31813@debbugs.gnu.org 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 © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 Mathieu Lirzin -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2018 Mathieu Othacehe +;;; Copyright © 2018 Clément 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) '()))) -- 2.17.1