From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 08:04:33 2022 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 12:04:33 +0000 Received: from localhost ([127.0.0.1]:55804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHua-0004gZ-MJ for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:04:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:36004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHuX-0004gP-Cx for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:04:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orHuM-00067c-SS for guix-patches@gnu.org; Sat, 05 Nov 2022 08:04:26 -0400 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1orHuG-0000nZ-GB for guix-patches@gnu.org; Sat, 05 Nov 2022 08:04:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4eeafa32 for ; Sat, 5 Nov 2022 12:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=SorpS2y7A5J 4gvJvyii6KrNS/1w=; b=sF+a6E2x51DQ2eXgH1PxuF5+5oNVpKG/w0F4kjxutjx x/kim2SsqMxbs7aKJfRSs/lpxxXvvTm+vvJMQuOuNOYBir7Ka8cIU9sNXWlb8Pvc svYWKkXddLuoHh4sqAJdVlzTIgmCwMiD5jOQZy87khHEr4jYk7SR/S4GgYovzTjw = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b25f17b8 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO) for ; Sat, 5 Nov 2022 12:04:01 +0000 (UTC) From: Vivien Kraus Date: Sat, 5 Nov 2022 12:59:01 +0100 Subject: [PATCH] guix: modify-input: Recommend prepend instead of append. To: guix-patches@gnu.org Message-ID: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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: -2.4 (--) * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of modify-inputs first. * guix/packages.scm (modify-inputs): use "prepend" in the docstring. --- doc/guix.texi | 12 ++++++------ guix/packages.scm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7806b21a0f..f818643ecd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8057,20 +8057,20 @@ following forms: @item (delete @var{name}@dots{}) Delete from the inputs packages with the given @var{name}s (strings). -@item (append @var{package}@dots{}) -Add @var{package}s to the end of the input list. - @item (prepend @var{package}@dots{}) Add @var{package}s to the front of the input list. + +@item (append @var{package}@dots{}) +Add @var{package}s to the end of the input list. @end table The example below removes the GMP and ACL inputs of Coreutils and adds -libcap to the back of the input list: +libcap to the front of the input list: @lisp (modify-inputs (package-inputs coreutils) (delete "gmp" "acl") - (append libcap)) + (prepend libcap)) @end lisp The example below replaces the @code{guile} package from the inputs of @@ -8081,7 +8081,7 @@ The example below replaces the @code{guile} package from the inputs of (replace "guile" guile-2.2)) @end lisp -The last type of clause is @code{prepend}, to add inputs to the front of +The last type of clause is @code{append}, to add inputs at the back of the list. @end deffn diff --git a/guix/packages.scm b/guix/packages.scm index 704b4ee710..502df7fdd1 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1176,9 +1176,9 @@ (define-syntax modify-inputs (modify-inputs (package-inputs coreutils) (delete \"gmp\" \"acl\") - (append libcap)) + (prepend libcap)) -Other types of clauses include 'prepend' and 'replace'. +Other types of clauses include 'append' and 'replace'. The first argument must be a labeled input list; the result is also a labeled input list." base-commit: 84d239599a10f31e7d414d962ae25888ab21165c -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 08:06:57 2022 Received: (at 59048) by debbugs.gnu.org; 5 Nov 2022 12:06:57 +0000 Received: from localhost ([127.0.0.1]:55823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHwv-0004lL-4D for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:06:57 -0400 Received: from knopi.disroot.org ([178.21.23.139]:55716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHws-0004lB-VF for 59048@debbugs.gnu.org; Sat, 05 Nov 2022 08:06:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 728E14089F; Sat, 5 Nov 2022 13:06:53 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hf4LnJaequP7; Sat, 5 Nov 2022 13:06:52 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667650012; bh=eljlOMUZ5TAqJJ8rpVoz4rNV1m40NV6qsuU0v4IOZ+M=; h=Date:To:Subject:From:References:In-Reply-To:From; b=O0JH+w8/kiYZtYT1xkRa6HdsDuHmvveef7K5ZSoWHAPAYrcrKO1uj5PNWxMb1cBt9 hUtRKz2fGbv9XN9t5SUxg4/LYr7Lo6EKZtK/WwwKjg5aEyipyJVKcj3dTPBIoyvD5L HuaTE6dcThZCAkA+nfoTpMhbSdduqtVDQdVNIatpPB2qe3EYsvfJFDGfJ0dYdqhNPf Ry/2ELk5zULnoy9AwxQfYSqMuD9zc5xsOJXMPJ2t3y+PDHyEu3EtvPvOGi51HMraXT fNQgnZVSvvWiMVrEq3hhAW1dKC1Ske3GG5sr3j8/mENuwbkTrMPEy1gVhKKP0Dv8i8 IYRpGk+74gX9g== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 05 Nov 2022 12:06:51 +0000 Message-Id: To: "Vivien Kraus" , <59048@debbugs.gnu.org> Subject: Re: [bug#59048] [PATCH] guix: modify-input: Recommend prepend instead of append. From: "(" References: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> In-Reply-To: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Sat Nov 5, 2022 at 11:59 AM GMT, Vivien Kraus via Guix-patches via wrote: > * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of > modify-inputs first. > * guix/packages.sc [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 59048 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.3 (/) On Sat Nov 5, 2022 at 11:59 AM GMT, Vivien Kraus via Guix-patches via wrote= : > * doc/guix.texi (Defining Package Variants): Document the "prepend" claus= e of > modify-inputs first. > * guix/packages.scm (modify-inputs): use "prepend" in the docstring. LGTM :) -- ( From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 15:18:45 2022 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 19:18:45 +0000 Received: from localhost ([127.0.0.1]:58078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orOgn-0005hh-2l for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:18:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:51552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orOgk-0005hY-6h for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orOgk-0002tj-0Z for guix-patches@gnu.org; Sat, 05 Nov 2022 15:18:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orOgi-0007ZO-Jv for guix-patches@gnu.org; Sat, 05 Nov 2022 15:18:41 -0400 Received: from localhost (host-82-184-251-30.business.telecomitalia.it [82.184.251.30]) by mira.cbaines.net (Postfix) with ESMTPSA id 3FDA927BBE9; Sat, 5 Nov 2022 19:18:39 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 15f34b8a; Sat, 5 Nov 2022 19:18:38 +0000 (UTC) References: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> User-agent: mu4e 1.8.9; emacs 28.1 From: Christopher Baines To: Vivien Kraus Subject: Re: [bug#59048] [PATCH] guix: modify-input: Recommend prepend instead of append. Date: Sat, 05 Nov 2022 20:17:28 +0100 In-reply-to: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> Message-ID: <87eduhgqgj.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 59048@debbugs.gnu.org, guix-patches@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: -2.4 (--) --=-=-= Content-Type: text/plain Vivien Kraus via Guix-patches via writes: > * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of > modify-inputs first. > * guix/packages.scm (modify-inputs): use "prepend" in the docstring. > --- > doc/guix.texi | 12 ++++++------ > guix/packages.scm | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) This seems OK, but it would be good to know why you're wanting to change this? In other words, how does this make things better? This information would be good to have in the commit message (I usually just write a sentance/paragraph above the changelog). Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmNmtwxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xe73BAAoOGvVo5owjpaqhGI8lQJjbSTRIFE/nn1 mKx8hf2kJLfZRDj2wmOp1J2JjtMdIGKOgjp2m+OJTxRTIQEou6hifEJlE0YXbfXd BFLrcHcgW6c6OKFJd6MqmZko5vFSpTkmjg47ueRZ1GwauwTCF0skEgLE+M8h8amx zZaLQxAtS/J4TTYjq/3o0htQALMtKX45c8HGkDViNDGJHz+n/JR5yiaqoMdeEPSZ kndLn+YECFlR5MBhxAlCpxd9sPSQHd2s9b7/5w1HH/VK+bF+ihn4r+YrgbmPM9NM ZXxJ8x5pHVtaRAxsnIt98fDrDK4JcOyWbzoxmXt1Bz1Hem7aBMky/5KItzCrUpSr rDFyZdrLbR9Tnr6GmplEkjMrGVWrzqjdZu/VxW4RsoG2G3nPmSUmBus2RqE2jAhd 0Rcc7r96saBlAbMtGLWXYhFsR5ENjxYBTvy6JpNmxW5MujSatVkfIc+W3zYPu+aH QY0zWn8/MUZyoCpx6/Z9uVuTYT6xlvixQdagEZ9Q7xTJN060v7n3ILVDPhfqnbgr iu9myu7ovzU+y9PYUM8Y7LnwsC/wcnG4OWLAg/wYSSFoR6lZmU3swZErzB/n0l5M /QWgDbbUD/9RNeChpvcYLAYAEEMvzCeup0LW6Eu9OunN7QgqtzAa/swBTe/w+lgM ujdfc4xhqeo= =/veU -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 15:47:51 2022 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 19:47:51 +0000 Received: from localhost ([127.0.0.1]:58112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orP8w-0000C1-HS for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:47:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:40548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orP8u-0000Bl-UN for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:47:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orP8u-0007M9-70 for guix-patches@gnu.org; Sat, 05 Nov 2022 15:47:48 -0400 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1orP8s-0002ou-9T for guix-patches@gnu.org; Sat, 05 Nov 2022 15:47:47 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e5a0f9f1; Sat, 5 Nov 2022 19:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=ve17mX0FOuRug11a0UsjvVFlhHI=; b=ZKKjGAZE5VZ6c2ikJSoSaighFVaC alQ5ezykanbhutXQWRF4rYjgQtnQekbGCrcGX2mBh46MZajnomeW4hFXpkEuZnF9 sgPifuiemLrFb3/D4Ju01PMvo3RbBC1es1g3cWmmR2CaG79i4EvtqhGw9+d3j+oj zvwI+tg8gCVPU6Q= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e68ddf81 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sat, 5 Nov 2022 19:47:38 +0000 (UTC) Message-ID: Subject: Re: [bug#59048] [PATCH] guix: modify-input: Recommend prepend instead of append. From: Vivien Kraus To: Christopher Baines Date: Sat, 05 Nov 2022 20:47:35 +0100 In-Reply-To: <87eduhgqgj.fsf@cbaines.net> References: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> <87eduhgqgj.fsf@cbaines.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 59048@debbugs.gnu.org, guix-patches@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: -2.4 (--) Hello! Le samedi 05 novembre 2022 =C3=A0 20:17 +0100, Christopher Baines a =C3=A9c= rit=C2=A0: >=20 > Vivien Kraus via Guix-patches via writes: >=20 > > * doc/guix.texi (Defining Package Variants): Document the "prepend" > > clause of > > modify-inputs first. > > * guix/packages.scm (modify-inputs): use "prepend" in the > > docstring. > > --- > > =C2=A0doc/guix.texi=C2=A0=C2=A0=C2=A0=C2=A0 | 12 ++++++------ > > =C2=A0guix/packages.scm |=C2=A0 4 ++-- > > =C2=A02 files changed, 8 insertions(+), 8 deletions(-) >=20 > This seems OK, but it would be good to know why you're wanting to > change > this? In other words, how does this make things better? I=E2=80=99m not sure of anything. What I gathered so far is: - it could be more efficient; - most instances in the packages use prepend rather than append: $ grep -R '(modify-inputs' gnu -A 3 | grep '(append' | wc -l 34 $ grep -R '(modify-inputs' gnu -A 3 | grep '(prepend' | wc -l 128 I=E2=80=99m inviting ( in the discussion because the issue was raised in an= IRC discussion about a previous patch of mine (test). Now, the old way I would reply to this message would be to attach an updated patch, but since I have been told to send patches as emails instead of attachments I don=E2=80=99t know how to proceed. Vivien From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 15:51:39 2022 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 19:51:39 +0000 Received: from localhost ([127.0.0.1]:58121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orPCc-0000Jk-Lz for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:51:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:45982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orPCa-0000Jd-Pz for submit@debbugs.gnu.org; Sat, 05 Nov 2022 15:51:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orPCa-0007zm-KT for guix-patches@gnu.org; Sat, 05 Nov 2022 15:51:36 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orPCY-0003UV-LF for guix-patches@gnu.org; Sat, 05 Nov 2022 15:51:36 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DA58B4129B; Sat, 5 Nov 2022 20:51:31 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2CVT3OFeVxjA; Sat, 5 Nov 2022 20:51:30 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667677890; bh=GNxlTVXvvoK3OLM9rXvsr33cz+i9R2g6CThQCOLJ/bk=; h=Date:Cc:Subject:From:To:References:In-Reply-To:From; b=C3EbcIb3uvSOCiNjG4ChPHeknb3084feqmiNrNTrl8D5iG1NZ9icDW+zLexQ6bUm+ LqNtqgJ7SIQkZY8T5eEVsb/ccpVua9WyMgM66YJKJx6ytXw/hjMNAvu0rQjTKrAryy uV9lbYIZptsUMFGO4TOvsNAvtBa6AvWVPzjD7bCR7N9lYH2jiORe/ByytlDNtMwyeB u8RWpQofGSuz4VHeAXfW/az9+HCJU9E3vvMJJuCHE1gQYcdudzxY7UkRd/i8Uu9yaC wgCBRBlnBEDsb9oJzEmgylO9OptSshZz4Ld8OrKAzDNwNbQqnDdpf/sR1G/sdqPT7H 0I47HhL+44LvA== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 05 Nov 2022 19:51:30 +0000 Message-Id: Subject: Re: [bug#59048] [PATCH] guix: modify-input: Recommend prepend instead of append. From: "(" To: "Vivien Kraus" , "Christopher Baines" References: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> <87eduhgqgj.fsf@cbaines.net> In-Reply-To: Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: 59048@debbugs.gnu.org, guix-patches@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 (-) On Sat Nov 5, 2022 at 7:47 PM GMT, Vivien Kraus wrote: > Now, the old way I would reply to this message would be to attach an > updated patch, but since I have been told to send patches as emails > instead of attachments I don=E2=80=99t know how to proceed. The "Single Patches" section tells you how to send a v2 patchset; this applies equally for multiple patches: If you need to send a revised patch, don=E2=80=99t resend it like this or= send a =E2=80=9Cfix=E2=80=9D patch to be applied on top of the last one; instead= , use git commit -a or git rebase to modify the commit, and use the ISSUE_NUMBER@debbugs.gnu.= org address and the -v flag with git send-email. $ git commit -a $ git send-email -1 -a --base=3Dauto -v REVISION \ --to=3DISSUE_NUMBER@debbugs.gnu.org -- ( From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 16:08:48 2022 Received: (at 59048) by debbugs.gnu.org; 5 Nov 2022 20:08:48 +0000 Received: from localhost ([127.0.0.1]:58144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orPTE-0000jJ-EK for submit@debbugs.gnu.org; Sat, 05 Nov 2022 16:08:48 -0400 Received: from planete-kraus.eu ([89.234.140.182]:56118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orPTB-0000j9-NU for 59048@debbugs.gnu.org; Sat, 05 Nov 2022 16:08:46 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id c07262ca for <59048@debbugs.gnu.org>; Sat, 5 Nov 2022 20:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=ANAw7pNFcme ftcznuBI0O4A1nOo=; b=B1OqRM2X3SgI8/x6nnnR/8tMDbalgqss6egku9YXQe2 eNwiMMqRzbLOh2YVLtYRwZnxyksrzd2c7+rElhB1gsxgre5LLHdX6u3DSAF7nzhh Eqjrmrm8QReS08C8iH/dguYB8BneRkwEetsfwV6+ioYaYQSLxpXdipkm0Wcrl5uk = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 75f89cbb (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO) for <59048@debbugs.gnu.org>; Sat, 5 Nov 2022 20:08:40 +0000 (UTC) From: Vivien Kraus Date: Sat, 5 Nov 2022 12:59:01 +0100 Subject: [PATCH v2] guix: modify-input: Recommend prepend instead of append. To: 59048@debbugs.gnu.org Message-ID: <13852d418ac206841fbb2abb3c19b95641338a94.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Most packages use prepend rather than append. If guix has to decide on an official policy, it should favor prepend. * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of modify-inputs first. * guix/packages.scm (modify-inputs): use "prepend" in the docstring. --- doc/guix.texi | 12 ++++++--- [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date X-Debbugs-Envelope-To: 59048 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.1 (/) Most packages use prepend rather than append. If guix has to decide on an official policy, it should favor prepend. * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of modify-inputs first. * guix/packages.scm (modify-inputs): use "prepend" in the docstring. --- doc/guix.texi | 12 ++++++------ guix/packages.scm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7806b21a0f..f818643ecd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8057,20 +8057,20 @@ following forms: @item (delete @var{name}@dots{}) Delete from the inputs packages with the given @var{name}s (strings). -@item (append @var{package}@dots{}) -Add @var{package}s to the end of the input list. - @item (prepend @var{package}@dots{}) Add @var{package}s to the front of the input list. + +@item (append @var{package}@dots{}) +Add @var{package}s to the end of the input list. @end table The example below removes the GMP and ACL inputs of Coreutils and adds -libcap to the back of the input list: +libcap to the front of the input list: @lisp (modify-inputs (package-inputs coreutils) (delete "gmp" "acl") - (append libcap)) + (prepend libcap)) @end lisp The example below replaces the @code{guile} package from the inputs of @@ -8081,7 +8081,7 @@ The example below replaces the @code{guile} package from the inputs of (replace "guile" guile-2.2)) @end lisp -The last type of clause is @code{prepend}, to add inputs to the front of +The last type of clause is @code{append}, to add inputs at the back of the list. @end deffn diff --git a/guix/packages.scm b/guix/packages.scm index 704b4ee710..502df7fdd1 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1176,9 +1176,9 @@ (define-syntax modify-inputs (modify-inputs (package-inputs coreutils) (delete \"gmp\" \"acl\") - (append libcap)) + (prepend libcap)) -Other types of clauses include 'prepend' and 'replace'. +Other types of clauses include 'append' and 'replace'. The first argument must be a labeled input list; the result is also a labeled input list." base-commit: e5a0381e6defd9c1ffd1b57d9de7f31636c87b68 -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 21 09:38:43 2022 Received: (at submit) by debbugs.gnu.org; 21 Nov 2022 14:38:43 +0000 Received: from localhost ([127.0.0.1]:45949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ox7wZ-0004dQ-11 for submit@debbugs.gnu.org; Mon, 21 Nov 2022 09:38:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:39442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ox7wX-0004d7-3h for submit@debbugs.gnu.org; Mon, 21 Nov 2022 09:38:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox7wV-0008LG-ES for guix-patches@gnu.org; Mon, 21 Nov 2022 09:38:40 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ox7wU-0004h3-0D for guix-patches@gnu.org; Mon, 21 Nov 2022 09:38:39 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 9CADD27BBE9; Mon, 21 Nov 2022 14:38:36 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e9587eee; Mon, 21 Nov 2022 14:38:36 +0000 (UTC) References: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> <13852d418ac206841fbb2abb3c19b95641338a94.camel@planete-kraus.eu> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: Vivien Kraus Subject: Re: [bug#59048] [PATCH v2] guix: modify-input: Recommend prepend instead of append. Date: Mon, 21 Nov 2022 14:36:21 +0000 In-reply-to: <13852d418ac206841fbb2abb3c19b95641338a94.camel@planete-kraus.eu> Message-ID: <87wn7otlsl.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 59048-done@debbugs.gnu.org, guix-patches@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: -2.4 (--) --=-=-= Content-Type: text/plain Vivien Kraus via Guix-patches via writes: > Most packages use prepend rather than append. If guix has to decide on an > official policy, it should favor prepend. > > * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of > modify-inputs first. > * guix/packages.scm (modify-inputs): use "prepend" in the docstring. > --- > doc/guix.texi | 12 ++++++------ > guix/packages.scm | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) I've now pushed this to master as 9283c80e604324f5449b5a8daf94285cdc6a8604. For some reason, I think I pushed the v1 of the patch, that's my bad. I think the changes are still fine, it's just I missed the commit message changes here. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmN7jWpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfuTw/8ClAtMoFmczQ7KKlRWHnOleoNNgi5zM0M +v1qnejm18riVTWLnqNOER8GfOqX0f6KPW8SAv5EZNGPo9icU81AyNl6B0mVhHOW R0fYHH51VGoDfFLbDhlO+xow1Y+81Sw7JZmawNIyuIaEFXSncczf4cM/zufTMVq6 s+wdODBcpEOZpYZ9Psbc5xLwh9om6Tbd90McgkOdPhv3Ypt+kp+uDpOhwXhEs6oI pRYBHTB++W4tnI5eIK6JERDNsZS3ONVExUVfL+iSkVCEGjzrqsfCYU43B6sqvQDX Jz8+nxV163GaN2vqNUyhNnUo5y7LsXHhXvBCjJGSbTyBwBcIbG+882NLUlczbmve 8ZkNkE8xCV2dT4oqtSzqCaH4Qe1621u0GbuNHV4d75VFwEYU4qsKWQfcyuVECRQU 1bLLoWcZ4NAoDXlGv64goAXGJ9bYs4tMjWBr2KIYw1ataEOfqptckYhKGtB1gwRT oxw0AJK6fhseejOnR+LvdjThYyzJQqrd0PNKnFbh4CTN3tmDUJN2RAWtwdMe+bvK NYTCeoobxej1dbkG0Fnk/Vjaqg5VIFOY9XYCyZX8+cTz4f2dSUX7PHOKk9CUOAzb 7HfaFhTahTt+7qm2FVECyErxCmLV3dOhSFCXwsZmDrQNYWRWDdoz0E5TRuBl0x3+ iHh7C4Nv/Yk= =w/GF -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Aug 20 06:40:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 20 Dec 2022 12:24:11 +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