X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH core-updates] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 09 Sep 2022 16:03:02 +0000
Resent-Message-ID: <handler.57704.B.166273935525898 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 57704 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.166273935525898
(code B ref -1); Fri, 09 Sep 2022 16:03:02 +0000
Received: (at submit) by debbugs.gnu.org; 9 Sep 2022 16:02:35 +0000
Received: from localhost ([127.0.0.1]:35108 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWgSh-0006jd-Fu
for submit <at> debbugs.gnu.org; Fri, 09 Sep 2022 12:02:35 -0400
Received: from lists.gnu.org ([209.51.188.17]:36820)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1oWgSd-0006jT-KJ
for submit <at> debbugs.gnu.org; Fri, 09 Sep 2022 12:02:33 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:52312)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <liliana.prikler@HIDDEN>)
id 1oWgSb-0006Ck-Sc
for guix-patches@HIDDEN; Fri, 09 Sep 2022 12:02:31 -0400
Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:41966)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <liliana.prikler@HIDDEN>)
id 1oWgSa-000224-AU
for guix-patches@HIDDEN; Fri, 09 Sep 2022 12:02:29 -0400
Received: by mail-ed1-x542.google.com with SMTP id z97so3196574ede.8
for <guix-patches@HIDDEN>; Fri, 09 Sep 2022 09:02:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:content-transfer-encoding:to:subject:date
:from:from:to:cc:subject:date;
bh=T7NXtGAp8UgfAsTmf5v9aIVnSAEoUIQua0GG65/nrpk=;
b=p7VEEa0FQSOMGgwfSjHY/1vED3OIHFq9psFv6aM99EioY2rcSMr/9iAp3FdUawilsT
ienbtzUdjRbY8E9h0u3oc7C8QAXeDQDIiVGG217n9j5B4m6GPtcXKhE52rGDOm1GCpN5
bamJu52Eq76hGDq/OFNTxJDvK6SgKsen0IWLBbuxvWYDMq0Jf1USMTPD/P1IIGXImOo1
wuhMouKqsv0QuQX3eLeR+BIGVzoRyzhHGad8XJFEwI6iAhqO6YcvAVNbQEw9dFap3fdR
jJGJ1zBYETV74eLizEBIVGP/y4DT88QMDwLMriqsig9w0MSiZeJAqLD2ulRzXwGrk0yj
hxDw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:content-transfer-encoding:to:subject:date
:from:x-gm-message-state:from:to:cc:subject:date;
bh=T7NXtGAp8UgfAsTmf5v9aIVnSAEoUIQua0GG65/nrpk=;
b=APcERgrg0zB+EEck6y27zyBiG0l9fk0NmLBizsCBuJTDYy69RWcBuj0CP/P0l5iu7R
pW1wlITd67it4+au4sF3Rfl3oZrH+paIsOOjuTm9YJIYo9mNZhOp9yg0ciK//VOYC3XU
AmmK7ySARu7nRHDudK+kM723JuT+9u1/qR8bXtzkFp9ZXUDjGdBlC0CuUu9myxUMzqpT
xQe8lNJA++gtluCeh5guT2qfUqYzJBRHz9r5OpK+A08Mtde3vkL5c1uk+fUYYKTQvhNF
5C3WUXqVV9ZGGJZRYsm3mCtRK8/8q7KeiNIXUkRiJbNfS3FPMl0DZ1a05ePMIVDmLKCb
mNKA==
X-Gm-Message-State: ACgBeo30uYWf2UUIYE4imGIZC8bwoIM+aW0nhnRK/uIoPEGLjERwHJvF
nU/dl2Uo+DpLh+1kv9aHGWheAS69gfs=
X-Google-Smtp-Source: AA6agR4i3A7tKxPAXiLI/m0VN3zBSjrO9uyRxdqJp7TjDNkYlUYpZ1hB8C46ojTUnfGKWbv4gFq7IQ==
X-Received: by 2002:aa7:d5d0:0:b0:44e:f6cc:7107 with SMTP id
d16-20020aa7d5d0000000b0044ef6cc7107mr12149958eds.371.1662739346061;
Fri, 09 Sep 2022 09:02:26 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
s22-20020a17090699d600b0076559407303sm415538ejn.159.2022.09.09.09.02.25
for <guix-patches@HIDDEN>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 Sep 2022 09:02:25 -0700 (PDT)
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Fri, 9 Sep 2022 17:56:20 +0200
Content-Transfer-Encoding: 7bit
Message-ID: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
MIME-Version: 1.0
Received-SPF: pass client-ip=2a00:1450:4864:20::542;
envelope-from=liliana.prikler@HIDDEN; helo=mail-ed1-x542.google.com
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, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
This makes it so that new-style inputs can be optional using regular Guile
patterns, e.g. (and (target-x86-64?) rust).
* guix/packages.scm (sanitize-inputs): Filter inputs by identity before adding
labels.
---
Note that this patch was prepared using master, but since it affects the
package record, it needs to go to core-updates. I don' think there should
be a merge conflict here.
guix/packages.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 94e464cd01..5bb2e81e18 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -430,11 +430,12 @@ (define %cuirass-supported-systems
(define-inlinable (sanitize-inputs inputs)
"Sanitize INPUTS by turning it into a list of name/package tuples if it's
not already the case."
- (cond ((null? inputs) inputs)
- ((and (pair? (car inputs))
- (string? (caar inputs)))
- inputs)
- (else (map add-input-label inputs))))
+ (let ((inputs (filter identity inputs)))
+ (cond ((null? inputs) inputs)
+ ((and (pair? (car inputs))
+ (string? (caar inputs)))
+ inputs)
+ (else (map add-input-label inputs)))))
(define-syntax current-location-vector
(lambda (s)
--
2.37.2
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Liliana Marie Prikler <liliana.prikler@HIDDEN> Subject: bug#57704: Acknowledgement ([PATCH core-updates] guix: packages: Remove #f from inputs when sanitizing.) Message-ID: <handler.57704.B.166273935525898.ack <at> debbugs.gnu.org> References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN> X-Gnu-PR-Message: ack 57704 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 57704 <at> debbugs.gnu.org Date: Fri, 09 Sep 2022 16:03:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 57704 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 57704: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D57704 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH core-updates] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Maxime Devos <maximedevos@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 09 Sep 2022 18:55:02 +0000
Resent-Message-ID: <handler.57704.B57704.166274965529485 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166274965529485
(code B ref 57704); Fri, 09 Sep 2022 18:55:02 +0000
Received: (at 57704) by debbugs.gnu.org; 9 Sep 2022 18:54:15 +0000
Received: from localhost ([127.0.0.1]:35462 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWj8o-0007fV-OC
for submit <at> debbugs.gnu.org; Fri, 09 Sep 2022 14:54:15 -0400
Received: from baptiste.telenet-ops.be ([195.130.132.51]:56630)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1oWj8n-0007fM-6r
for 57704 <at> debbugs.gnu.org; Fri, 09 Sep 2022 14:54:13 -0400
Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]
([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16])
by baptiste.telenet-ops.be with bizsmtp
id Huu92800T20ykKC01uu9qY; Fri, 09 Sep 2022 20:54:10 +0200
Message-ID: <23051978-3831-94af-48ce-d67691248aa6@HIDDEN>
Date: Fri, 9 Sep 2022 20:54:09 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.12.0
Content-Language: en-US
References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
From: Maxime Devos <maximedevos@HIDDEN>
In-Reply-To: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature";
boundary="------------vDgEMEEA1bmh5ghOkmSBxPTI"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1662749650; bh=IqtRJkhbVm5xD4gZWOAK3DYRW8sEVDhHvQCcgAk4PdI=;
h=Date:To:References:From:Subject:In-Reply-To;
b=ETQEiwHesYSuZYQNv/oZxKVvojew4mm2jhLPEGQB8593emVF9uKQTO01p71k4njvN
ox+/LZA0El0gE1esOqn7WBwX1VHFJTSpcYFMw9P3r07H7QoMnpxWlt9+JmT/QQpLhb
DzlIQSbilMVbxbunSa7cQHZE2Cm/VPJMMG6TJv7hv9LPC5bchvovIVgz5HerhbQJfP
s3tFoxsBwjNf3wOi5doLBVcywUGh4AceLK79ChoCfHIDOJ8GInc088ms0ZDXwX5XTl
tz24uz8x+XXo9tajlibMt4TX83H7IVvJmqZNyPqBtWj/eyUMlKFWkltAGLY9YkJRHU
Y0dDUi3l/oDNQ==
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------vDgEMEEA1bmh5ghOkmSBxPTI
Content-Type: multipart/mixed; boundary="------------aJaPTv2tOMwjE3x46S4eTkFu";
protected-headers="v1"
From: Maxime Devos <maximedevos@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Message-ID: <23051978-3831-94af-48ce-d67691248aa6@HIDDEN>
Subject: Re: [bug#57704] [PATCH core-updates] guix: packages: Remove #f from
inputs when sanitizing.
References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
In-Reply-To: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
--------------aJaPTv2tOMwjE3x46S4eTkFu
Content-Type: multipart/mixed; boundary="------------bZOXlb0IX4fhkSUY7KZOfZqD"
--------------bZOXlb0IX4fhkSUY7KZOfZqD
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64
T24gMDktMDktMjAyMiAxNzo1NiwgTGlsaWFuYSBNYXJpZSBQcmlrbGVyIHdyb3RlOg0KPiBU
aGlzIG1ha2VzIGl0IHNvIHRoYXQgbmV3LXN0eWxlIGlucHV0cyBjYW4gYmUgb3B0aW9uYWwg
dXNpbmcgcmVndWxhciBHdWlsZQ0KPiBwYXR0ZXJucywgZS5nLiAoYW5kICh0YXJnZXQteDg2
LTY0PykgcnVzdCkuDQoNClNlZW1zIHVzZWZ1bC4NCg0KPiAqIGd1aXgvcGFja2FnZXMuc2Nt
IChzYW5pdGl6ZS1pbnB1dHMpOiBGaWx0ZXIgaW5wdXRzIGJ5IGlkZW50aXR5IGJlZm9yZSBh
ZGRpbmcNCj4gbGFiZWxzLg0KDQpEb2N1bWVudGF0aW9uIGlzIG1pc3NpbmcuDQoNCj4gLS0t
DQo+IE5vdGUgdGhhdCB0aGlzIHBhdGNoIHdhcyBwcmVwYXJlZCB1c2luZyBtYXN0ZXIsIGJ1
dCBzaW5jZSBpdCBhZmZlY3RzIHRoZQ0KPiBwYWNrYWdlIHJlY29yZCwgaXQgbmVlZHMgdG8g
Z28gdG8gY29yZS11cGRhdGVzLiAgSSBkb24nIHRoaW5rIHRoZXJlIHNob3VsZA0KPiBiZSBh
IG1lcmdlIGNvbmZsaWN0IGhlcmUuDQoNCkl0IGRvZXMgYWZmZWN0IHRoZSBwYWNrYWdlIHJl
Y29yZCwgYnV0IGl0IGRvZXNuJ3QgY2F1c2UgYW55IHJlYnVpbGRzLCBzbyANCm1hc3RlciBz
aG91bGQgYmUgZmluZToNCg0KKiBUaGVyZSBhcmVuJ3QgYW55IGN1cnJlbnQgdXNlcyBvZiAj
ZmFsc2U6DQoNCih1c2UtbW9kdWxlcyAoZ3VpeCBwYWNrYWdlcykgKGdudSBwYWNrYWdlcykp
DQoocGFja2FnZQ0KICAgKGluaGVyaXQgKHNwZWNpZmljYXRpb24tPnBhY2thZ2UgImhlbGxv
IikpDQogICAoaW5wdXRzIChsaXN0ICNmYWxzZSkpKQ0KOzsgZ3VpeCBidWlsZCAtZiBbLi4u
XSAtLT4gcGFja2FnZSDigJhoZWxsb0AyLjEyLjHigJkgaGFzIGFuIGludmFsaWQgaW5wdXQN
Cg0KKiBJbiB0aGUgYWJzZW5jZSBvZiAjZmFsc2UsIHRoZSBiZWhhdmlvdXIgcmVtYWlucyB1
bmNoYW5nZWQuDQoNCiogZ3VpeC9wYWNrYWdlcy5zY20gaXMgbm90IHVzZWQgYnkgYW55IGRl
cml2YXRpb24NCiAgIChleGNlcHQgZm9yICJndWl4IHB1bGwiIGFuZCB0aGUgZ3VpeCBwYWNr
YWdlKQ0KDQpBcyBhIHRlc3QsIEkgYXBwbGllZCB0aGUgcGF0Y2ggYW5kIGRpZA0K4oCYbWFr
ZSAmJiAuL3ByZS1pbnN0LWVudiBndWl4IGJ1aWxkIC1uIGxpYnJlb2ZmaWNl4oCZLA0KYW5k
IGl0IHR1cm5lZCBvdXQgSSBhbHJlYWR5IGhhdmUgaXQgaW5zdGFsbGVkLg0KDQpHcmVldGlu
Z3MsDQpNYXhpbWUuDQo=
--------------bZOXlb0IX4fhkSUY7KZOfZqD
Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc"
Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc"
Content-Description: OpenPGP public key
Content-Transfer-Encoding: quoted-printable
-----BEGIN PGP PUBLIC KEY BLOCK-----
xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m
xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2
ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL
CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc
/gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4
LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C
kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK
CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W
ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ
Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0
k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo
AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE
fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D
=3DOVqp
-----END PGP PUBLIC KEY BLOCK-----
--------------bZOXlb0IX4fhkSUY7KZOfZqD--
--------------aJaPTv2tOMwjE3x46S4eTkFu--
--------------vDgEMEEA1bmh5ghOkmSBxPTI
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"
-----BEGIN PGP SIGNATURE-----
wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYxuL0QUDAAAAAAAKCRBJ4+4iGRcl7rHc
AQDsCeVg1KrEIkagwrK575Bu7hBWhU2q+28tNMebTIYbPQEAoyOUeG9bqV/RLI1yPF4FI5uboWaP
3dIrbunZaNLoTA4=
=8X9F
-----END PGP SIGNATURE-----
--------------vDgEMEEA1bmh5ghOkmSBxPTI--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v2] guix: packages: Remove #f from inputs when sanitizing.
References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
In-Reply-To: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 09 Sep 2022 21:44:01 +0000
Resent-Message-ID: <handler.57704.B57704.166275981223015 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 57704 <at> debbugs.gnu.org
Cc: Maxime Devos <maximedevos@HIDDEN>
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166275981223015
(code B ref 57704); Fri, 09 Sep 2022 21:44:01 +0000
Received: (at 57704) by debbugs.gnu.org; 9 Sep 2022 21:43:32 +0000
Received: from localhost ([127.0.0.1]:35853 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWlme-0005z8-98
for submit <at> debbugs.gnu.org; Fri, 09 Sep 2022 17:43:32 -0400
Received: from mail-ed1-f66.google.com ([209.85.208.66]:42600)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1oWlmZ-0005yr-Pi
for 57704 <at> debbugs.gnu.org; Fri, 09 Sep 2022 17:43:31 -0400
Received: by mail-ed1-f66.google.com with SMTP id q21so4453091edc.9
for <57704 <at> debbugs.gnu.org>; Fri, 09 Sep 2022 14:43:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:content-transfer-encoding:cc:to:subject
:date:from:from:to:cc:subject:date;
bh=2g0B9wpBwCQIWmq+mHMAxM69ABYApHTbquSBC2cqzZ0=;
b=UVCNTSdb9wl6TSb89BXyJBs0u0EFsiJQAADv4E/lY7EwVFgHNb7qPXhelezbzbI1yB
ZPXqvVKdFhlz+iukZliiGtymEwfwiQy/btKojl7msRxWzzG984gh3FP9I06gdN+u0Owz
8dThTqYBh9xyXz7pjjibei7eU5jyoP8miuWpS3a7s0T6d9jkEtuzNfGzquHUble+dk1J
KnHZa0rHj1zYYoEFdftaffSJLKQ7Uvkre/8zH5MS6KGCE0kMlbW9KtnBQgKNOiVTB9th
UDYujwcfBUqGx0S5DUI0AdpW9ACTtdFvhji8RKB3KhLukMhgYLFwsTbB5EszWl1fDRjd
o7SQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:content-transfer-encoding:cc:to:subject
:date:from:x-gm-message-state:from:to:cc:subject:date;
bh=2g0B9wpBwCQIWmq+mHMAxM69ABYApHTbquSBC2cqzZ0=;
b=tWAwJAQ7a7Mbp0is0HhfRydKLL8vD1HivyaIvQVzbwt6AajwEckBfIEk2E+CIcCkCy
9xy0h8hAwVKYuGjN2z3m89alFpIhJ7RViss9Il0aO08s4SDmXDlpmNMIL2weYab0e5rN
P+vIrFQLgTtdiakmbokhrmBbuH+8cdYrVEuiQdpI004zuZp0vDcbNXXAS64LlcEXn2bT
51xpn2z09hfDEKD/IGiZB4HUwPqFJIt3ssUx/NxKxOFq3dKARok9DLj/E5+T94lHLXtr
Dfwahjv0rx6UYKg01Wmg+pa0oYiSIQJ/EZ/TZKeUK2NLvZZX0PdUb+H0bTkNrEGbnXDD
UmBQ==
X-Gm-Message-State: ACgBeo1D1gJtcg7k8hrIZ3PEC9v7j2WP4Dkrjw9emC7MYaxecnzmwJIB
dBWFpXT7AjwAvM6tLr8qROo4TMq61oQ=
X-Google-Smtp-Source: AA6agR564hMwwDJhsqKNc1bpq/XkDqWkrDKpG+f9GqoyFF32Ah5u+gTyheUd1TD6d4wYQf652W14dQ==
X-Received: by 2002:a05:6402:2b8d:b0:43a:5410:a9fc with SMTP id
fj13-20020a0564022b8d00b0043a5410a9fcmr13305955edb.99.1662759801653;
Fri, 09 Sep 2022 14:43:21 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
g1-20020a17090604c100b0073da4b623e8sm781292eja.152.2022.09.09.14.43.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 Sep 2022 14:43:21 -0700 (PDT)
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Fri, 9 Sep 2022 17:56:20 +0200
Content-Transfer-Encoding: 7bit
Message-ID: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
MIME-Version: 1.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: This makes it so that new-style inputs can be optional using
regular Guile patterns, e.g. (and (target-x86-64?) rust). * guix/packages.scm
(sanitize-inputs): Filter inputs by identity before adding labels. --- As
noted by Maxime, this doesn't seem to be cause any rebuilds, so retargeting
master. Also added missing doc [...]
Content analysis details: (1.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (liliana.prikler[at]gmail.com)
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[209.85.208.66 listed in wl.mailspike.net]
-0.0 T_SCC_BODY_TEXT_LINE No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.1 (/)
This makes it so that new-style inputs can be optional using regular Guile
patterns, e.g. (and (target-x86-64?) rust).
* guix/packages.scm (sanitize-inputs): Filter inputs by identity before adding
labels.
---
As noted by Maxime, this doesn't seem to be cause any rebuilds, so retargeting
master. Also added missing documentation.
guix/packages.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 94e464cd01..7569380610 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -428,13 +428,14 @@ (define %cuirass-supported-systems
(fold delete %supported-systems '("mips64el-linux" "powerpc-linux" "riscv64-linux")))
(define-inlinable (sanitize-inputs inputs)
- "Sanitize INPUTS by turning it into a list of name/package tuples if it's
-not already the case."
- (cond ((null? inputs) inputs)
- ((and (pair? (car inputs))
- (string? (caar inputs)))
- inputs)
- (else (map add-input-label inputs))))
+ "Sanitize INPUTS by removing falsy elements and turning it into a list of
+name/package tuples if it's not already the case."
+ (let ((inputs (filter identity inputs)))
+ (cond ((null? inputs) inputs)
+ ((and (pair? (car inputs))
+ (string? (caar inputs)))
+ inputs)
+ (else (map add-input-label inputs)))))
(define-syntax current-location-vector
(lambda (s)
--
2.37.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v2] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Maxime Devos <maximedevos@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 10 Sep 2022 00:34:02 +0000
Resent-Message-ID: <handler.57704.B57704.16627699856689 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.16627699856689
(code B ref 57704); Sat, 10 Sep 2022 00:34:02 +0000
Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 00:33:05 +0000
Received: from localhost ([127.0.0.1]:35966 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWoQj-0001jo-8C
for submit <at> debbugs.gnu.org; Fri, 09 Sep 2022 20:33:05 -0400
Received: from andre.telenet-ops.be ([195.130.132.53]:39814)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1oWoQg-0001jO-K6
for 57704 <at> debbugs.gnu.org; Fri, 09 Sep 2022 20:33:03 -0400
Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]
([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16])
by andre.telenet-ops.be with bizsmtp
id J0Z02800U20ykKC010Z1Vg; Sat, 10 Sep 2022 02:33:01 +0200
Message-ID: <7c897510-3362-2ca1-641a-2728c013678f@HIDDEN>
Date: Sat, 10 Sep 2022 02:33:00 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.12.0
Content-Language: en-US
References: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
From: Maxime Devos <maximedevos@HIDDEN>
In-Reply-To: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature";
boundary="------------If4nmMgEy47O4Dy41SguMbdN"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1662769981; bh=KrARFSW3sUWFD4jo5bg5TG5bqjno3cNcX0efb4qCwq4=;
h=Date:To:References:From:Subject:In-Reply-To;
b=mANoMp+gkbjiJyVHh8yQeHoI1zCD23zUaSRHs9f0xIqrrft2H2/xdqzWlZV9zpsMw
L/EIrjRazl5h927XZ5wXOvCTTJqk9CXonitpq1PaTEiICVxQz+zbCnyze5sL9bvFOm
kAFKxJMFEPXi0UrfKjQ9ceVLGzgRMB7a0Ex215mR4WgPxryEFWTaf43Qw1GFvJfzTh
OTwaH3Wbvfag/ULzd7BFStUiGHsb3qSGDe9I3MeEwEscXy9/pUKcRAsdW6+uw4Vt6c
ljX9Fk/M+oCpYRPme+pw4hO/FGIQl2V570Ji2fIliW5Qhw1IRr5E9ug7GAIPyllstQ
u2damu+NTe1cA==
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------If4nmMgEy47O4Dy41SguMbdN
Content-Type: multipart/mixed; boundary="------------ISktOP3QETHyP5Tat31I5qzz";
protected-headers="v1"
From: Maxime Devos <maximedevos@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Message-ID: <7c897510-3362-2ca1-641a-2728c013678f@HIDDEN>
Subject: Re: [PATCH v2] guix: packages: Remove #f from inputs when sanitizing.
References: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
In-Reply-To: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
--------------ISktOP3QETHyP5Tat31I5qzz
Content-Type: multipart/mixed; boundary="------------NAFvmn72s09iRaQiAA8eMbh0"
--------------NAFvmn72s09iRaQiAA8eMbh0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64
DQoNCk9uIDA5LTA5LTIwMjIgMTc6NTYsIExpbGlhbmEgTWFyaWUgUHJpa2xlciB3cm90ZToN
Cj4gVGhpcyBtYWtlcyBpdCBzbyB0aGF0IG5ldy1zdHlsZSBpbnB1dHMgY2FuIGJlIG9wdGlv
bmFsIHVzaW5nIHJlZ3VsYXIgR3VpbGUNCj4gcGF0dGVybnMsIGUuZy4gKGFuZCAodGFyZ2V0
LXg4Ni02ND8pIHJ1c3QpLg0KPiANCj4gKiBndWl4L3BhY2thZ2VzLnNjbSAoc2FuaXRpemUt
aW5wdXRzKTogRmlsdGVyIGlucHV0cyBieSBpZGVudGl0eSBiZWZvcmUgYWRkaW5nDQo+IGxh
YmVscy4NCj4gLS0tDQo+IEFzIG5vdGVkIGJ5IE1heGltZSwgdGhpcyBkb2Vzbid0IHNlZW0g
dG8gYmUgY2F1c2UgYW55IHJlYnVpbGRzLCBzbyByZXRhcmdldGluZw0KPiBtYXN0ZXIuICBB
bHNvIGFkZGVkIG1pc3NpbmcgZG9jdW1lbnRhdGlvbi4NCg0KVGhlIGRvY3N0cmluZyBpcyBu
aWNlLCBidXQgd2l0aCBkb2N1bWVudGF0aW9uLCBJIG1lYW50IHRoZSBtYW51YWwsIA0KcHJl
c3VtYWJseSBpbiDigJgoZ3VpeClwYWNrYWdlIFJlZmVyZW5jZeKAmSwgbWF5YmUgYWxzbyBp
biB0aGUgcGFja2FnaW5nIA0KdHV0b3JpYWwgaW4gdGhlIGNvb2tib29rLg0KDQpBbHNvLCBz
b21ldGhpbmcgSSBmb3Jnb3Q6IHBlcmZvcm1hbmNlLiAgc2FuaXRpemUtaW5wdXRzIGlzIGNh
bGxlZCBmb3IgDQpldmVyeSBwYWNrYWdlLCBhbmQgdGhlIGNoYW5nZSBhZGRzIGFkZGl0aW9u
YWwgbWVtb3J5IGFsbG9jYXRpb25zIChkdWUgdG8gDQp0aGUgdXNlIG9mICdmaWx0ZXInKSwg
aXMgdGhlcmUgYW4gb2JzZXJ2YWJsZSBwZXJmb3JtYW5jZSBpbXBhY3QgKG1heWJlIA0KIkdV
SVhfUFJPRklMSU5HPWdjIHRpbWUgZ3VpeCByZWZyZXNoIC1sIHBrZy1jb25maWciIHdvdWxk
IGJlIGEgZ29vZCANCnRlc3QpPyAgSWYgdGhlcmUgaXMsIHNvbWUgb3B0aW1pc2F0aW9ucyBt
YXkgYmUgaW4gb3JkZXINCg0KR3JlZXRpbmdzLA0KTWF4aW1lLg0K
--------------NAFvmn72s09iRaQiAA8eMbh0
Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc"
Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc"
Content-Description: OpenPGP public key
Content-Transfer-Encoding: quoted-printable
-----BEGIN PGP PUBLIC KEY BLOCK-----
xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m
xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2
ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL
CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc
/gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4
LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C
kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK
CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W
ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ
Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0
k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo
AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE
fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D
=3DOVqp
-----END PGP PUBLIC KEY BLOCK-----
--------------NAFvmn72s09iRaQiAA8eMbh0--
--------------ISktOP3QETHyP5Tat31I5qzz--
--------------If4nmMgEy47O4Dy41SguMbdN
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"
-----BEGIN PGP SIGNATURE-----
wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYxvbPAUDAAAAAAAKCRBJ4+4iGRcl7hZ6
AQCEt7BRu8g5HrrcYy/PQ5N5qdkElJ+9EJFIpSN6OFUWUQD/bh4PDIbl9oouZGWMHUEB9Rz4m548
4ByEtwqIrdXTxQI=
=dBnD
-----END PGP SIGNATURE-----
--------------If4nmMgEy47O4Dy41SguMbdN--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v2] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 10 Sep 2022 06:41:01 +0000
Resent-Message-ID: <handler.57704.B57704.16627920254515 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Maxime Devos <maximedevos@HIDDEN>, 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.16627920254515
(code B ref 57704); Sat, 10 Sep 2022 06:41:01 +0000
Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 06:40:25 +0000
Received: from localhost ([127.0.0.1]:36414 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWuAC-0001Al-Vl
for submit <at> debbugs.gnu.org; Sat, 10 Sep 2022 02:40:25 -0400
Received: from mail-ej1-f66.google.com ([209.85.218.66]:46612)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1oWuAA-0001AP-AT
for 57704 <at> debbugs.gnu.org; Sat, 10 Sep 2022 02:40:23 -0400
Received: by mail-ej1-f66.google.com with SMTP id bj12so8826507ejb.13
for <57704 <at> debbugs.gnu.org>; Fri, 09 Sep 2022 23:40:22 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:references
:in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date;
bh=7VQBo49cm+Gcwl/jCcU1sflHafuVIlBiy0jLMr3KPkk=;
b=MvcBWzdU2h4dxtkDfGIAwB13qE05ozPu4C11sayEuEG+A84tDNPBh/4nGCo+Bx4ekx
OGVrspN0PtKLNg3y/2jLx6XpgOLWlkNIGaS50JH1IiDuDZa03gS2Exr73LEw1MtW9ttP
ZwoSvxfbNfXRPXxx+tkSQsXkQGNlWmgbj61lv+HNnTYi+pmyRrYpYMWuGE14JxagmOak
dwVAuRB/eF7GMQcp5Gox9XICI+TtK216LM9YMgWX7Jq2fn0PBL103SLSoQXfrs5WuSZp
hZp6c7BOROzBeCdJkcqB0KVGvrFBuyijqDkiNQRG4pXDoV5l3zohyhchA7IvxmDBOJxm
YLWQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:references
:in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from
:to:cc:subject:date;
bh=7VQBo49cm+Gcwl/jCcU1sflHafuVIlBiy0jLMr3KPkk=;
b=KMPWf/fb4Zmu8moLxWv67tXiaKQGMQm55a+Zbrdse4XX7m3FOU4sPOLZu8Wunw3ROn
3c6e4ySN9X2sTW1yD6zNQ6+W4mn4JHp+Pyn+BL2JO9UCxPEvCIP0Onb4TnbOu2PNZezE
8KklUrdjXJLxpW/1XcJ72+bhVJe6EBHEUOMqefG2lxfr/L2N5PZc2TTFVhJ9HWEUOJJj
OD5NsaoCDOJGVMVWBOewp9d/Q9HhxSyIvjFBYEnEqFUPA5XJvD1S2uq43wgpe6caIRck
oZ1oPte8GGRx0yWTRowUJhzR5E7SEQFqyYbJ9xJo62CP7BvGAs2vZKvjboJCCBPJwzUE
yxLg==
X-Gm-Message-State: ACgBeo1nhb3tbb1SaD81QAng7MSxIh8cNRouN5bEbyAaP3Ohu8fEowve
EurOybGVg2ZAGVeY1xA36Cc=
X-Google-Smtp-Source: AA6agR7gWIUburcodaH5osIjrvp+GbqcK5CH1hKWS7kWmnCcQG6Kp0Q4lTgunD2FLvs9y1P3EbQ09w==
X-Received: by 2002:a17:907:7d9e:b0:771:db66:7b7c with SMTP id
oz30-20020a1709077d9e00b00771db667b7cmr10025387ejc.393.1662792016299;
Fri, 09 Sep 2022 23:40:16 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
l4-20020aa7cac4000000b0044ee2869ef7sm1638028edt.4.2022.09.09.23.40.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 Sep 2022 23:40:15 -0700 (PDT)
Message-ID: <d53c94cb177679260842edc30212c245dea18bdb.camel@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Sat, 10 Sep 2022 08:40:14 +0200
In-Reply-To: <7c897510-3362-2ca1-641a-2728c013678f@HIDDEN>
References: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
<7c897510-3362-2ca1-641a-2728c013678f@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Am Samstag, dem 10.09.2022 um 02:33 +0200 schrieb Maxime Devos:
> The docstring is nice, but with documentation, I meant the manual,
> presumably in ‘(guix)package Reference’, maybe also in the packaging
> tutorial in the cookbook.
I don't see the current practice documented, so I think we're actually
good on this front.
> Also, something I forgot: performance. sanitize-inputs is called for
> every package, and the change adds additional memory allocations (due
> to the use of 'filter'), is there an observable performance impact
> (maybe "GUIX_PROFILING=gc time guix refresh -l pkg-config" would be a
> good test)? If there is, some optimisations may be in order
Looking at the numbers below
Garbage collection statistics:
heap size: 212.66 MiB
allocated: 739.15 MiB
GC times: 20
time spent in GC: 5.30 seconds (65% of user time)
real 0m3,606s
user 0m8,140s
sys 0m0,109s
Garbage collection statistics:
heap size: 276.29 MiB
allocated: 1292.10 MiB
GC times: 28
time spent in GC: 10.48 seconds (64% of user time)
real 0m11,638s
user 0m16,422s
sys 0m0,308s
it does appear that this increases times by a factor of two. Use of
filter! instead of filter brings only marginal benefits. I'll check if
we could instead simply ignore unspecified? values when collecting the
inputs – that would allow the natural use of (when) and (unless).
Cheers
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v2] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 10 Sep 2022 07:45:02 +0000
Resent-Message-ID: <handler.57704.B57704.166279587811135 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Maxime Devos <maximedevos@HIDDEN>, 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166279587811135
(code B ref 57704); Sat, 10 Sep 2022 07:45:02 +0000
Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 07:44:38 +0000
Received: from localhost ([127.0.0.1]:36502 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWvAL-0002tX-R0
for submit <at> debbugs.gnu.org; Sat, 10 Sep 2022 03:44:38 -0400
Received: from mail-ej1-f66.google.com ([209.85.218.66]:41962)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1oWvAJ-0002tI-S9
for 57704 <at> debbugs.gnu.org; Sat, 10 Sep 2022 03:44:36 -0400
Received: by mail-ej1-f66.google.com with SMTP id gh9so9093176ejc.8
for <57704 <at> debbugs.gnu.org>; Sat, 10 Sep 2022 00:44:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:references
:in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date;
bh=L2HcYC3+yA4n6iHSblSc06Fnk2wCbPfzwj2Siz7deiA=;
b=GJ09gS0E3x/Ua5d630y7cKoBGg3M6NQwtdh3OOz9jNRPWp0+mV2dsWKlX/AUDATnHH
JS+P1tpNmpfGJLlVTsvosojf1zfgRi0vfKEHJlEHNKH8O1lFNyS1kdnQP9DxLXrpdvsz
p7otgOj6P7HmX8Aspi1Izy891lAtDUOoALro9kCpgN+KlzWSR1ULLp8UWExJTcNKz79a
TSH/s2ABKnQ63WtcHbEfA/BA1sXN/O79p6fERboADHZBelX7uWWgOHxhfJDt/oWHAPqR
lSKvzTFZpsROMuBGfw3VJ2VuQRpT7s0Zh7Ed14saJulRVgGYcPsq9sHjLcnq5Au5J3Hq
LRvw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:user-agent:references
:in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from
:to:cc:subject:date;
bh=L2HcYC3+yA4n6iHSblSc06Fnk2wCbPfzwj2Siz7deiA=;
b=yzRhGAW8lj/txEzL/Mj0oIv7bik0iJ8hSx8BJC0v7T/VAM6qpmsJlj8hxITM46bPFP
2RPkW9d7Dg45wSYO5JgYzP2lI9jCQ4FPIoCdARpZODt851X2HdbrPE2XBIh5cd+dIqoJ
TEPJhToskItIFwJOQzdBL5cgXjc8gtLQNBz3Jj5/+HGiZwYfqvVvxRudWbzOWbNSuUtV
1Feb5+Hm7YNuJsslhaJf/dSk99pqEJUM9Zags8LWhRQUfERuI2UTnbySrfINg1K7vJCq
Qo4pGx2J+FUOkP5E0f/I3SJZhuj8SzPhgnRtWsZp5tbNd0QxkiotAbJms34bSfg89S+c
R2oA==
X-Gm-Message-State: ACgBeo2V7y+125wrCZIfJqMB1976xEDjyH/LJuiJ4kLlC+agUdnQ69Hp
fhy9SElpLeUxl6LE4FWjGzU=
X-Google-Smtp-Source: AA6agR6wJMybV/IIOZ95G6q6PAj3fPXlJubRiAvjPDaE/mqVVE2aTRNDCNi4cOP7ITkir4vklRnIiQ==
X-Received: by 2002:a17:907:6e90:b0:770:8130:b51b with SMTP id
sh16-20020a1709076e9000b007708130b51bmr12120536ejc.234.1662795869712;
Sat, 10 Sep 2022 00:44:29 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
u1-20020aa7d541000000b0045154772462sm636584edr.5.2022.09.10.00.44.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 10 Sep 2022 00:44:29 -0700 (PDT)
Message-ID: <6c48d1c7aaad8562eeabb6b7a265530ebb39b26d.camel@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Sat, 10 Sep 2022 09:44:28 +0200
In-Reply-To: <d53c94cb177679260842edc30212c245dea18bdb.camel@HIDDEN>
References: <bef2c9a9c67b2f6d6c50aa7f9fab3f263290d1b2.camel@HIDDEN>
<7c897510-3362-2ca1-641a-2728c013678f@HIDDEN>
<d53c94cb177679260842edc30212c245dea18bdb.camel@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.1
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Am Samstag, dem 10.09.2022 um 08:40 +0200 schrieb Liliana Marie
Prikler:
> Looking at the numbers below
> [...]
> it does appear that this increases times by a factor of two.
It seems I've been comparing apples to oranges. Running ./pre-inst-env
already increases the times for guix:
Garbage collection statistics:
heap size: 276.29 MiB
allocated: 1291.91 MiB
GC times: 28
time spent in GC: 9.39 seconds (66% of user time)
real 0m6,069s
user 0m14,172s
sys 0m0,140s
An alternative patch that I'll submit as v3 adds little to these times:
Garbage collection statistics:
heap size: 276.29 MiB
allocated: 1291.96 MiB
GC times: 28
time spent in GC: 9.32 seconds (66% of user time)
real 0m6,124s
user 0m14,138s
sys 0m0,147s
Cheers
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v3] guix: Filter unspecified inputs when sanitizing.
References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
In-Reply-To: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
Resent-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 10 Sep 2022 07:45:02 +0000
Resent-Message-ID: <handler.57704.B57704.166279588611156 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 57704 <at> debbugs.gnu.org
Cc: Maxime Devos <maximedevos@HIDDEN>
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166279588611156
(code B ref 57704); Sat, 10 Sep 2022 07:45:02 +0000
Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 07:44:46 +0000
Received: from localhost ([127.0.0.1]:36505 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWvAU-0002ts-3r
for submit <at> debbugs.gnu.org; Sat, 10 Sep 2022 03:44:46 -0400
Received: from mail-ej1-f68.google.com ([209.85.218.68]:43848)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1oWvAT-0002th-9z
for 57704 <at> debbugs.gnu.org; Sat, 10 Sep 2022 03:44:45 -0400
Received: by mail-ej1-f68.google.com with SMTP id v16so9061251ejr.10
for <57704 <at> debbugs.gnu.org>; Sat, 10 Sep 2022 00:44:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:message-id:content-transfer-encoding:cc:to:subject
:date:from:from:to:cc:subject:date;
bh=uSCj16rycL81O8iLtr0I5IDwb0xUxbxXOgC1ov/SzR4=;
b=MHL8CG+oCjYpDURslIY7/uW3EFNtiEbOhgDMET26OrZhZHrilzzBMWv+a6nwDgaNQo
ANRFlKAJhaKKkHlTSFCxlZTgDczfrUgZd78DiZzW3keXINauQoxC96lTLrsti1JWpTWh
VrseAubY2YBJlpkqIuUAvwThU8LVh3lFDlPVC7E2tBup0G1P2yDcXLNJs06Gzp7jSF/Q
JQj52fw56LBkHBYGlcRSLNC5uWfILiqOMzCeYyWUlAzglDdGaxsHxtI2azgIYMP6cwn3
k6isyySms76rZFwN82PDuxRJkCgEgPvdqIyANlohQS40GlVD37RXww4v4ZKKGlkDPZ5k
Sr3A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=mime-version:message-id:content-transfer-encoding:cc:to:subject
:date:from:x-gm-message-state:from:to:cc:subject:date;
bh=uSCj16rycL81O8iLtr0I5IDwb0xUxbxXOgC1ov/SzR4=;
b=fG2WeKfTHpyxNP3MGHZKYdCBk0PwLQSvLYY1MFEvAZNkCdlnW1LBBUTdtu5/bIuJvk
vRPU5l+WDfOcSyzaswSaaspFWN7WOvPx/F2YWPkDmbAEz3aEnXhqN42eZB5jHLd0E1L8
xJZSZyA9xaeRPr8xgYTOGBrLgrYLvCnG5hUkvydKlo3Zs3JBfUAXpt5F0bQGa6ghkiD4
FFQf8rFi0uGspws+2nhlQ59+ZVMPGn1soUch0m38dNbpQO9NfVTwkDhbkVSFF4aSSjET
pV2MryKZe76KjRVW1MzJnNtI+3YEG69tKsk2i6lfEt4xshNgitDyJAUsneSq4tncMsY+
ayaw==
X-Gm-Message-State: ACgBeo3xke1tNhurPSjLjc+7KgvtP7pZd0rHrCMb65B88RBQIFgRcotc
cSPsDCLwnGUh41KKvtm88EnGH0BjJm4=
X-Google-Smtp-Source: AA6agR6X0Pma3fHciMw79lx1pkVKxlyQc443PBjhUcONi715A61e43xNtJ82DDUf+wMJ1wInMk3JmA==
X-Received: by 2002:a17:907:1b1a:b0:74a:18f7:7f63 with SMTP id
mp26-20020a1709071b1a00b0074a18f77f63mr13066130ejc.28.1662795879673;
Sat, 10 Sep 2022 00:44:39 -0700 (PDT)
Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
w20-20020a170906185400b007713951ca7asm1335880eje.165.2022.09.10.00.44.39
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 10 Sep 2022 00:44:39 -0700 (PDT)
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Date: Sat, 10 Sep 2022 09:41:39 +0200
Content-Transfer-Encoding: 7bit
Message-ID: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@HIDDEN>
MIME-Version: 1.0
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/packages.scm (sanitize-inputs): Filter inputs which are unspecified?
rather than adding a label.
---
guix/packages.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 94e464cd01..0975002c13 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -429,12 +429,15 @@ (define %cuirass-supported-systems
(define-inlinable (sanitize-inputs inputs)
"Sanitize INPUTS by turning it into a list of name/package tuples if it's
-not already the case."
+not already the case and removing unspecified inputs."
(cond ((null? inputs) inputs)
((and (pair? (car inputs))
(string? (caar inputs)))
inputs)
- (else (map add-input-label inputs))))
+ (else (filter-map (lambda (input)
+ (if (unspecified? input) #f
+ (add-input-label input)))
+ inputs))))
(define-syntax current-location-vector
(lambda (s)
--
2.37.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH v3] guix: Filter unspecified inputs when sanitizing.
Resent-From: Maxime Devos <maximedevos@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 10 Sep 2022 10:20:01 +0000
Resent-Message-ID: <handler.57704.B57704.166280517725976 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166280517725976
(code B ref 57704); Sat, 10 Sep 2022 10:20:01 +0000
Received: (at 57704) by debbugs.gnu.org; 10 Sep 2022 10:19:37 +0000
Received: from localhost ([127.0.0.1]:36636 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1oWxaL-0006ku-HQ
for submit <at> debbugs.gnu.org; Sat, 10 Sep 2022 06:19:37 -0400
Received: from albert.telenet-ops.be ([195.130.137.90]:59910)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maximedevos@HIDDEN>) id 1oWxaI-0006ki-SK
for 57704 <at> debbugs.gnu.org; Sat, 10 Sep 2022 06:19:36 -0400
Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]
([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16])
by albert.telenet-ops.be with bizsmtp
id JAKY2800M20ykKC06AKYjr; Sat, 10 Sep 2022 12:19:33 +0200
Message-ID: <d3341dcd-fee3-204d-7949-6df5333bc5ea@HIDDEN>
Date: Sat, 10 Sep 2022 12:19:32 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.12.0
Content-Language: en-US
References: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@HIDDEN>
From: Maxime Devos <maximedevos@HIDDEN>
In-Reply-To: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@HIDDEN>
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature";
boundary="------------ITJ9jn4SmY2gCrYdFyDknrFC"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1662805173; bh=6nAvxLJ2TekqB+ckfvhA5dIiPdqOs2IpdRs5aCIKXH0=;
h=Date:To:References:From:Subject:In-Reply-To;
b=EI033S4Uydo+hz0JCtbYSF2oBR4t93/kbpQAblXKlNOE2V71vzi97ybjsnbCawfUA
Mod6ytyKnYwe72NsB2Dbjtmze2ez1tkOK/SXUpuAZwgqepZvl/OIb9w6Qvc6sU4Q+l
QXAE6KRP/cnmakDtsHz4gEbjQ/qTBG/pi+QPKZ1IkkgHXIMcxwUiMwTtFvaE1j3xP+
OwwUajCUzB7/Ir/WoY5cSaWFx+ZFksNKRU4R3uQqK2DS9qguvpY9VV6PEzASfiS9R5
jNE92Oji7VdzIcB2S1w1iMqPvDKHk4juSPJEL/yTQZv8/qypjDgfgvYfUbmJaJU6jN
DfdeTBL3Q7fUQ==
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------ITJ9jn4SmY2gCrYdFyDknrFC
Content-Type: multipart/mixed; boundary="------------X5u0eq1Xna80T78ii3hTAxQ3";
protected-headers="v1"
From: Maxime Devos <maximedevos@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 57704 <at> debbugs.gnu.org
Message-ID: <d3341dcd-fee3-204d-7949-6df5333bc5ea@HIDDEN>
Subject: Re: [PATCH v3] guix: Filter unspecified inputs when sanitizing.
References: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@HIDDEN>
In-Reply-To: <1b98ce69769d0366503c7fb7f956da7fa9ec5132.camel@HIDDEN>
--------------X5u0eq1Xna80T78ii3hTAxQ3
Content-Type: multipart/mixed; boundary="------------hOV5neSUuKmPFl0H2rkh07yo"
--------------hOV5neSUuKmPFl0H2rkh07yo
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64
PiBBbSBTYW1zdGFnLCBkZW0gMTAuMDkuMjAyMiB1bSAwMjozMyArMDIwMCBzY2hyaWViIE1h
eGltZSBEZXZvczoNCj4+IFRoZSBkb2NzdHJpbmcgaXMgbmljZSwgYnV0IHdpdGggZG9jdW1l
bnRhdGlvbiwgSSBtZWFudCB0aGUgbWFudWFsLCANCj4+IHByZXN1bWFibHkgaW4g4oCYKGd1
aXgpcGFja2FnZSBSZWZlcmVuY2XigJksIG1heWJlIGFsc28gaW4gdGhlIHBhY2thZ2luZyAN
Cj4+IHR1dG9yaWFsIGluIHRoZSBjb29rYm9vay4NCj4gSSBkb24ndCBzZWUgdGhlIGN1cnJl
bnQgcHJhY3RpY2UgZG9jdW1lbnRlZCwgc28gSSB0aGluayB3ZSdyZSBhY3R1YWxseQ0KPiBn
b29kIG9uIHRoaXMgZnJvbnQuDQoNClRoYXQgc291bmRzIGJhZCB0byBtZSAtLSB0aGUgdW5k
b2N1bWVudGVkIHN1cmZhY2Ugc2hvdWxkIGJlIGRlY3JlYXNlZCwgDQpub3QgaW5jcmVhc2Vk
LiAgQWxzbywgaXQgaXMgYWN0dWFsbHkgZG9jdW1lbnRlZCBhIGxpdHRsZToNCg0KICAgICAg
4oCYaW5wdXRz4oCZIChkZWZhdWx0OiDigJgnKCnigJkpDQogICAgICDigJhuYXRpdmUtaW5w
dXRz4oCZIChkZWZhdWx0OiDigJgnKCnigJkpDQogICAgICDigJhwcm9wYWdhdGVkLWlucHV0
c+KAmSAoZGVmYXVsdDog4oCYJygp4oCZKQ0KICAgICAgICAgICBUaGVzZSBmaWVsZHMgbGlz
dCBkZXBlbmRlbmNpZXMgb2YgdGhlIHBhY2thZ2UuICBFYWNoIGVsZW1lbnQNCiAgICAgICAg
ICAgb2YgdGhlc2UgbGlzdHMgaXMgZWl0aGVyIGEgcGFja2FnZSwgb3JpZ2luLCBvciBvdGhl
cg0KICAgICAgICAgICDigJxmaWxlLWxpa2Ugb2JqZWN04oCdICgqbm90ZSBHLUV4cHJlc3Np
b25zOjopOyBbLi4uXQ0KDQojZmFsc2UgKG9yLCBpbiB0aGlzIGNhc2UsICp1bnNwZWNpZmll
ZCopIGlzIG5laXRoZXIgYSBwYWNrYWdlLCBvcmlnaW4gb3IgDQpvdGhlciBmaWxlLWxpa2Ug
b2JqZWN0LiAgTWF5YmUgeW91IGNhbiBhZGQgdGhhdCAjZmFsc2UgaXMgYWxzbyBhbGxvd2Vk
IA0KYnV0IGlnbm9yZWQ/DQoNCk9uIDEwLTA5LTIwMjIgMDk6NDEsIExpbGlhbmEgTWFyaWUg
UHJpa2xlciB3cm90ZToNCj4gICAgICAgICAgICBpbnB1dHMpDQo+IC0gICAgICAgIChlbHNl
IChtYXAgYWRkLWlucHV0LWxhYmVsIGlucHV0cykpKSkNCj4gKyAgICAgICAgKGVsc2UgKGZp
bHRlci1tYXAgKGxhbWJkYSAoaW5wdXQpDQo+ICsgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgKGlmICh1bnNwZWNpZmllZD8gaW5wdXQpICNmDQo+ICsgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIChhZGQtaW5wdXQtbGFiZWwgaW5wdXQpKSkNCj4gKyAgICAgICAgICAg
ICAgICAgICAgICAgICAgaW5wdXRzKSkpKQ0KDQood2hlbiBjb25kIC4uLikgLyAodW5sZXNz
IGNvbmQgLi4uKSByZXR1cm5pbmcgKnVuc3BlY2lmaWVkKiB3aGVuIChub3QgDQpjb25kKS9j
b25kIGlzIGFuIGltcGxlbWVudGF0aW9uIGRldGFpbDoNCg0KICAgKiBUaGUgcmV0dXJuIHZh
bHVlcyhzKSB3aGVuIChub3QgY29uZCkvY29uZCBpcyBub3QgZG9jdW1lbnRlZCBpbg0KICAg
ICAoZ3VpbGUpQ29uZGl0aW9uYWxzDQogICAqIG1heWJlOiBodHRwczovL2RlYmJ1Z3MuZ251
Lm9yZy9jZ2kvYnVncmVwb3J0LmNnaT9idWc9NTY3OTkjMTcNCg0KICAgICBUaGVyZSBpcyBh
biBpbnRlcmVzdCBpbiBsZXR0aW5nIGl0IHJldHVybiB6ZXJvIHZhbHVlcyBpbnN0ZWFkIG9m
DQogICAgICp1bnNwZWNpZmllZCosIHNlZSBlLmcuIA0KaHR0cHM6Ly9zY2hlbWUtcmVwb3J0
cy5zY2hlbWUtcmVwb3J0cy5uYXJraXZlLmNvbS9RU1F0SlNBaC91bnNwZWNpZmllZC12YWx1
ZXMNCiAgICAgYW5kIGEg4oCYYnVn4oCZIG9uIGJ1Z3MuZ251Lm9yZyBJIGNhbm5vdCBmaW5k
IGFueW1vcmUgYWJvdXQgYWN0dWFsbHkNCiAgICAgZG9pbmcgdGhpcyBjaGFuZ2UuDQoNCiAg
ICAgQnkgYXNzdW1pbmcgdGhhdCB3aGVuL3VubGVzcyByZXR1cm5zICp1bnNwZWNpZmllZCog
aGVyZSwgYW4NCiAgICAgYWRkaXRpb25hbCBiYWNrd2FyZHMtY29tcGF0aWJpbGl0eSBjb25j
ZXJuIGlzIGludHJvZHVjZWQuDQoNCkFzIHN1Y2gsIEkgZG9uJ3QgdGhpbmsgcmVseWluZyBv
biB0aGlzIHRvIGJlIGEgZ29vZCBpZGVhLg0KDQpBbHRlcm5hdGl2ZSBwcm9wb3NhbDogaW5z
dGVhZCBvZiAod2hlbiBjb25kIHBhY2thZ2UpLCBtYXliZQ0KKGFuZCBjb25kIHBhY2thZ2Up
Pw0KDQpHcmVldGluZ3MsDQpNYXhpbWUNCg==
--------------hOV5neSUuKmPFl0H2rkh07yo
Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc"
Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc"
Content-Description: OpenPGP public key
Content-Transfer-Encoding: quoted-printable
-----BEGIN PGP PUBLIC KEY BLOCK-----
xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m
xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2
ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL
CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc
/gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4
LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C
kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK
CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W
ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ
Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0
k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo
AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE
fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D
=3DOVqp
-----END PGP PUBLIC KEY BLOCK-----
--------------hOV5neSUuKmPFl0H2rkh07yo--
--------------X5u0eq1Xna80T78ii3hTAxQ3--
--------------ITJ9jn4SmY2gCrYdFyDknrFC
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"
-----BEGIN PGP SIGNATURE-----
wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYxxktAUDAAAAAAAKCRBJ4+4iGRcl7p8l
AQCZHuDBWxdZjMMsKRj3gQLUEIrVMxxhaMS9R4iCA/xauAEAtfSfdOfDdriFhmsQJdDUWGjBpEFO
NIwazbzp5MkKUgk=
=xjA7
-----END PGP SIGNATURE-----
--------------ITJ9jn4SmY2gCrYdFyDknrFC--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#57704] [PATCH core-updates] guix: packages: Remove #f from inputs when sanitizing.
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 26 Sep 2022 20:52:01 +0000
Resent-Message-ID: <handler.57704.B57704.166422551528437 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 57704
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
Cc: 57704 <at> debbugs.gnu.org
Received: via spool by 57704-submit <at> debbugs.gnu.org id=B57704.166422551528437
(code B ref 57704); Mon, 26 Sep 2022 20:52:01 +0000
Received: (at 57704) by debbugs.gnu.org; 26 Sep 2022 20:51:55 +0000
Received: from localhost ([127.0.0.1]:51877 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ocv50-0007Ob-Rt
for submit <at> debbugs.gnu.org; Mon, 26 Sep 2022 16:51:55 -0400
Received: from eggs.gnu.org ([209.51.188.92]:35788)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1ocv4x-0007OM-T9
for 57704 <at> debbugs.gnu.org; Mon, 26 Sep 2022 16:51:53 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e]:51214)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1ocv4s-0006VA-M2; Mon, 26 Sep 2022 16:51:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To:
From; bh=l70ODMxBlRQnntD1DOYvU7VmQmfxb341JzPNTcavsGk=; b=BchMjm92nA890eZ1b4/i
vP6r7CojTVGnIFrFZgi+hMVloCLJ7cpbuIk9VJSNAEvXZwNfbEL6sM3kwjgnEINka0zhaS1F3Lqpf
Gwx2Rq5VpNBUoUBxLxsGVPRojrrHzXS8r8JU2/mGxGjyYtz9oRwC9Xfrrab0034kepfULCVxDGrxU
ZB8jyEUx0gFPZah4U3d5ozgH7Q/99LqziM5RA0gMD8bVZgvwXYARln4RbazNaxO32c1a3zogv8NyT
OLPYd34yAdwwAIv9QvnoAO/wy3gVyd4EvDqrm81flSpP5LOZfJz0aUfQVWN11XlhUITyt9ukimbd8
oUtQ+le4Vzlkpw==;
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=53578 helo=ribbon)
by fencepost.gnu.org with esmtpsa
(TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1)
(envelope-from <ludo@HIDDEN>)
id 1ocv4r-00016A-V3; Mon, 26 Sep 2022 16:51:46 -0400
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
References: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
Date: Mon, 26 Sep 2022 22:51:43 +0200
In-Reply-To: <b1b6504d725df23dc910cb04591a203979cdca7b.camel@HIDDEN>
(Liliana Marie Prikler's message of "Fri, 9 Sep 2022 17:56:20 +0200")
Message-ID: <87bkr1kgf4.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@HIDDEN> skribis:
> This makes it so that new-style inputs can be optional using regular Guile
> patterns, e.g. (and (target-x86-64?) rust).
I=E2=80=99d rather avoid that and make sure input lists are just plain list=
s,
remaining strict, and keeping the sanitize procedure simple (notably so
it can be optimized in common cases).
That means we have to live with idioms like:
(append (list x y z)
(if (target-x86-64?) (list rust) '()))
The =E2=80=98openmpi=E2=80=99 package has sugar to make that more concise.
Thoughts?
Thanks,
Ludo=E2=80=99.
Received: (at control) by debbugs.gnu.org; 6 Oct 2022 13:29:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 06 09:29:59 2022 Received: from localhost ([127.0.0.1]:59409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ogQwp-00078s-EU for submit <at> debbugs.gnu.org; Thu, 06 Oct 2022 09:29:59 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1ogQwn-00078k-AB for control <at> debbugs.gnu.org; Thu, 06 Oct 2022 09:29:57 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:fc93:27fb:8412:c8b7]) by mira.cbaines.net (Postfix) with ESMTPSA id D0DDE27BBE9 for <control <at> debbugs.gnu.org>; Thu, 6 Oct 2022 14:29:56 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a40404c5 for <control <at> debbugs.gnu.org>; Thu, 6 Oct 2022 13:29:55 +0000 (UTC) Date: Thu, 06 Oct 2022 14:29:55 +0100 Message-Id: <875ygx3wrw.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Christopher Baines <mail@HIDDEN> Subject: control message for bug #57704 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 57704 + moreinfo quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.