From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 02 03:02:43 2020 Received: (at submit) by debbugs.gnu.org; 2 Mar 2020 08:02:43 +0000 Received: from localhost ([127.0.0.1]:37243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8g2F-0004F7-88 for submit@debbugs.gnu.org; Mon, 02 Mar 2020 03:02:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:36538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8g2D-0004Ez-A1 for submit@debbugs.gnu.org; Mon, 02 Mar 2020 03:02:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35055) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8g2C-0007Xa-25 for guix-patches@gnu.org; Mon, 02 Mar 2020 03:02:41 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8g2A-0005gG-Tc for guix-patches@gnu.org; Mon, 02 Mar 2020 03:02:39 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:34851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j8g2A-0005dY-Kx for guix-patches@gnu.org; Mon, 02 Mar 2020 03:02:38 -0500 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id E0BF327BBE4 for ; Mon, 2 Mar 2020 08:02:35 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 24912c77 for ; Mon, 2 Mar 2020 08:02:33 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] services: cuirass: Allow passing extra command line options. Date: Mon, 2 Mar 2020 08:02:33 +0000 Message-Id: <20200302080233.28953-1-mail@cbaines.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) This is so that the options supported by the service configuration don't = have to always be changed. Generally though all options should be explicitly supported and documented, so this is mostly to facilitate experimentation= . * gnu/services/cuirass.scm (): Add an extra-option= s field. (cuirass-shepherd-service): Pass the extra options to the shepherd servvi= ces. * doc/guix.texi (Continuous Integration): Document it. --- doc/guix.texi | 3 +++ gnu/services/cuirass.scm | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index fab9159530..43fd17e59f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22445,6 +22445,9 @@ Only evaluate specifications and build derivation= s once. When substituting a pre-built binary fails, fall back to building packages locally. =20 +@item @code{extra-options} (default: @code{'()}) +Extra options to pass when running the Cuirass processes. + @item @code{cuirass} (default: @code{cuirass}) The Cuirass package to use. @end table diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 7bfb021161..0f4f0f9948 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -77,7 +77,9 @@ (one-shot? cuirass-configuration-one-shot? ;boolean (default #f)) (fallback? cuirass-configuration-fallback? ;boolean - (default #f))) + (default #f)) + (extra-options cuirass-configuration-extra-options + (default '()))) =20 (define (cuirass-shepherd-service config) "Return a for the Cuirass service with CONFIG." @@ -95,7 +97,8 @@ (specs (cuirass-configuration-specifications config)) (use-substitutes? (cuirass-configuration-use-substitutes? config= )) (one-shot? (cuirass-configuration-one-shot? config)) - (fallback? (cuirass-configuration-fallback? config))) + (fallback? (cuirass-configuration-fallback? config)) + (extra-options (cuirass-configuration-extra-options config))) (list (shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -110,7 +113,8 @@ "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes"= ) '()) #$@(if one-shot? '("--one-shot") '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) =20 #:environment-variables (list "GIT_SSL_CAINFO=3D/etc/ssl/certs/ca-certifica= tes.crt" @@ -137,7 +141,8 @@ "--listen" #$host "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes"= ) '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) =20 #:user #$user #:group #$group --=20 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 07 16:21:32 2020 Received: (at 39866) by debbugs.gnu.org; 7 Mar 2020 21:21:32 +0000 Received: from localhost ([127.0.0.1]:47675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jAgt2-0001NR-4C for submit@debbugs.gnu.org; Sat, 07 Mar 2020 16:21:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jAgt0-0001NE-7f for 39866@debbugs.gnu.org; Sat, 07 Mar 2020 16:21:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jAgsv-0007xJ-3q; Sat, 07 Mar 2020 16:21:25 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=34404 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jAgsu-000467-Mm; Sat, 07 Mar 2020 16:21:24 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#39866] [PATCH] services: cuirass: Allow passing extra command line options. References: <20200302080233.28953-1-mail@cbaines.net> Date: Sat, 07 Mar 2020 22:21:23 +0100 In-Reply-To: <20200302080233.28953-1-mail@cbaines.net> (Christopher Baines's message of "Mon, 2 Mar 2020 08:02:33 +0000") Message-ID: <87d09neu98.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39866 Cc: 39866@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Christopher Baines skribis: > This is so that the options supported by the service configuration don't have > to always be changed. Generally though all options should be explicitly > supported and documented, so this is mostly to facilitate experimentation. > > * gnu/services/cuirass.scm (): Add an extra-options > field. > (cuirass-shepherd-service): Pass the extra options to the shepherd servvices. > * doc/guix.texi (Continuous Integration): Document it. LGTM too! From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 08 19:56:03 2020 Received: (at 39866-done) by debbugs.gnu.org; 8 Mar 2020 23:56:03 +0000 Received: from localhost ([127.0.0.1]:49493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB5m6-0001Cc-VX for submit@debbugs.gnu.org; Sun, 08 Mar 2020 19:56:03 -0400 Received: from mira.cbaines.net ([212.71.252.8]:55414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB5m5-0001CH-CY for 39866-done@debbugs.gnu.org; Sun, 08 Mar 2020 19:56:01 -0400 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id 95E1127BBEA; Sun, 8 Mar 2020 23:56:00 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 69b1637c; Sun, 8 Mar 2020 23:55:58 +0000 (UTC) References: <20200302080233.28953-1-mail@cbaines.net> <87d09neu98.fsf@gnu.org> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#39866] [PATCH] services: cuirass: Allow passing extra command line options. In-reply-to: <87d09neu98.fsf@gnu.org> Date: Sun, 08 Mar 2020 23:55:56 +0000 Message-ID: <878skae703.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39866-done Cc: 39866-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Christopher Baines skribis: > >> This is so that the options supported by the service configuration don't= have >> to always be changed. Generally though all options should be explicitly >> supported and documented, so this is mostly to facilitate experimentatio= n. >> >> * gnu/services/cuirass.scm (): Add an extra-optio= ns >> field. >> (cuirass-shepherd-service): Pass the extra options to the shepherd servv= ices. >> * doc/guix.texi (Continuous Integration): Document it. > > LGTM too! Thanks for taking a look, I've pushed this now :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl5lhgxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xd5RA//TtnVqrPLsdZjjnz0fy8o6g0prBvypmscZLy0uqL7dW+pE8e15Kx7xjJ0 v3GfLBfcJrsHNkS5aUa1vmlGP2mZKiLhWqKmyf+3mZxN5xg16ISBAAvUIFNrpD7j FjJoj8yeL6i/dprphmBydi9W+FDXLYd54swWwmcuv8oNf/ZGuVP0am+dR+//kbu1 7GDQQmx90clVEzXNfMmJ5iGkff5PMlOCLRNJeGUfhlJSViDti4i1EG+Dr/IbmFba +VKZf3TUmwiFvWtlG1TvXZRkl2JpzQya+TR9t7n6lsPZMue8sNNXFUqnJcu9av/W wYGS0a9xaT4+JeWPfSMz4aPZwCs/62wpf5OzcVt60fEMPv0M0b56t95bEqhSsO2e NhMinyvRomtOCcQ98cdFCbMfv256eG0JBykoAxDdOzmv8GRNHWNpCznhLbLMJh5t bj+Y3biDEAQw764pVRYCd2JNxMFFxwKfoYDZu00rt6x5G7J9wRdAqFIgSSCn94Ow MfDqgm6SdiYFIov+MBpfeqKzJ+qqRWLUW2P6MOorj7veh0IjtS44X0Dsq/9HjDep zVZz9jnNFB+zt2lxe1E6T5NrQujdoOlNhaI+GtT3lAdcNz0IwYaXZ/Q0FfhbAuGs Rl25fiG0G61QTz4z+geEhyyJ4oZLBeEJcuVjPmIbzPFHjl6Bkfs= =Fktl -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 09 05:04:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 06 Apr 2020 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator