From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aMvaBXVmWGdRCAEA62LTzQ:P1 (envelope-from ) for ; Tue, 10 Dec 2024 16:04:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aMvaBXVmWGdRCAEA62LTzQ (envelope-from ) for ; Tue, 10 Dec 2024 17:04:05 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=K9B+9t7s; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=D1Paf0nL; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733846645; a=rsa-sha256; cv=none; b=jvmntO4lKZkXzwZo52hL66R9QMkqy3ECcZRubAGGIcYFJNAWY7xnYwHwNZumCROtTwxW54 mindn6WaRTgKM6Z6H5TSUXMfzU0sNSkIIKzNjMAp39f0/QHv/GYObgjFwESzggauc/fU57 7CazpZtcshIIm7UJexiplGr/Va0PugGl8JZjWIuMtICFBdNMwQUcKZ7kF5RtA4hCYeBBcp vQKLjzB1/pZZOdVJNxw9Sn5D26dbQTKSfgv3lNIXOlfUOi1PaJoU6lQKNY5gfxbsgPXW7x PKOjhER79U1L3Y/5fm0bKcEtxRtTWGa0s/WvAspWuiC9gLnVojfp87ExlPz+WQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=K9B+9t7s; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=D1Paf0nL; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733846645; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=; b=U60IwKTSVL7HtOmwDm3VowgTlGU1GJVaEm27DFW9lMdlh3qxC7q/A/qbv2drW9VBpXyBYn 0VBLZYWvH7OpOLg5qfLqzUUWIlPpIN0A20RXu1sWxYmy+aMI2iIySumY3xAK9mps8/2MD6 ehQiA/+Qe0C6vi8tGTPitmj0HaEZ2ub81WaXoDrA2UmcQH8BuBHV6CgLU5ybvQVSiGL/BF ez4tz/Sqh6j+ZwHdqAc8l/F8vhjbsnSr7OCfBawzGy81OWmUHrG4rKwTsWHXTB5bIJbB6W c6y1j6D2jhyAixlrQ6sP/Cn6/SRDGzTrWMaSudTjLe7wXx2320c7yptar89RyA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2E92F54773 for ; Tue, 10 Dec 2024 17:04:04 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tL2O9-0002YB-JS; Tue, 10 Dec 2024 10:43:05 -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 1tL2O6-0002Xu-Vk for guix-patches@gnu.org; Tue, 10 Dec 2024 10:43:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tL2O6-0001yq-N3 for guix-patches@gnu.org; Tue, 10 Dec 2024 10:43:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=; b=K9B+9t7sEoVNcOqJLaVpCgfKAWuKWiJFVoBwAf2f2XoXHurixw0eBFZ8qkwXS9Z3ic+QQWOVrT6tpyr1L9ftIksLmHgSo8rYfR3E1RGkkCNx+B+ASlLOkKIwBm/U1uYvGKnFpYIZVHnRccf+ucc2XjCYKObJwxajnvNboY+RNbWtJCIBaKtAu0sg00P5YLAFJiarA+1IPqBTP/MW/1CusFMepCQQ636W0HX0K+BylyPq16na8DCeO/qNxTJqNyQzAxITgDsNwUf/LSLqwh7PEc6Pgc4hZL35mad6NL2n9fLlTSoOyHC6AmWjQrMFuV37ZI3vIiS8EsYZ7QTS6Ms6bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tL2O6-0007zc-HF for guix-patches@gnu.org; Tue, 10 Dec 2024 10:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v4 01/11] build-system: cargo: Accept unlabeled #:cargo-inputs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Dec 2024 15:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Herman Rimm Cc: 70923@debbugs.gnu.org Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.173384535630663 (code B ref 70923); Tue, 10 Dec 2024 15:43:02 +0000 Received: (at 70923) by debbugs.gnu.org; 10 Dec 2024 15:42:36 +0000 Received: from localhost ([127.0.0.1]:59145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL2Nf-0007yO-6l for submit@debbugs.gnu.org; Tue, 10 Dec 2024 10:42:36 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:46458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL2Nd-0007yA-E0 for 70923@debbugs.gnu.org; Tue, 10 Dec 2024 10:42:34 -0500 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-434a766b475so55128895e9.1 for <70923@debbugs.gnu.org>; Tue, 10 Dec 2024 07:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733845293; x=1734450093; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=; b=D1Paf0nL0z/L9bffc1xRCd08ThxjKleut/Dt8TslBxwNIBbyJARb6uoYlF27NKzq02 JI03rz/eRIQfq0G9EwNC1hs00gA8qiL3S9TZskxhH6pf48NoumD+qqTznUCH1yV9/22r K0Oj9SgsdTzuUOCey9MttHhZtPvF75kKblv9cHdUP1+xxGMz3PSojW6jmrbxNTbNTFqm wsc9LIvfyvZvSCj7YG50pa3m5lgHwgt2ouItSvrbjGxRY7VqgZbSTg099p6cApHQ1M18 p931HCi+3KmO/zfMozoSJCWpIu/JxruxbTMD7/pXdWLhsOrEnXMD+7O0I+yvTAT5ZrRF vWNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733845293; x=1734450093; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=; b=GoWlIT/5UGdIfRL/fQR5hLWO7+ah/uX/So4979r8Ej4fSW+4IfGYjGytf0KBrbmr59 1dpI4dcN0vqCgqB8Si55UXAIs91jsIQy4EOOkvDx30jDqFwexjL6sxRSZlZZ/j5xePJE KLaN6mi3C6bI6BRZFos7W3DNP1FDiQZ9cRnxrCRWevy6MVSMzppiOKpL6raOAIKilcLP noKSzJujLxXOFXe1Jrh0KMZ7SqcCsdSig4PsHeEew+h1PYiHc4NpTf42AisVGHkD0k4b uJxey6Qwq6AreTaiD55n7rK1gq3eJ/uBiQJul1MyF8OhBTuFY2wYfLowBzsXWt6ENMdW iI0w== X-Gm-Message-State: AOJu0Ywz8orCf9uZD6Q6b151rPj48LJ39UhNQxaDNJjSUMZW8mHdbQ+t E6GbNE+F0HAht8S4+1WsxWQBf6ZbsNfiEqmO8IUEWoA1Nz7Ks8U5EO8xz6Xw X-Gm-Gg: ASbGnctaaq1//DIAlKDva00bMfGZ+GZpTi1WGriDGQxtxBKZU5+TwJCiXUF7VXvBwON SKxcEHsFCpXKJsimwycG3TKSDYW69jHAEfBscS17WsDq1EKW4NPr8v6+8QTZ1mCiHhmNW2R14tf SRUcmK2WpAUJ3zbGyKnI3qZ5d1Onc5nh5XxILd/ffN+UwdI2/MU+8/+B/oXUpgohVaDsEj02zRG LqpEZHSz0uXHXbeA1FoNvIqmqgShOXkVwzyxwmtFnBy01WgE9hSSg== X-Google-Smtp-Source: AGHT+IGnx2mi2dHwKNqoKRVL7kDK0Hgrl+t4Pf2MRg4yz0mtKNvogxfhanfuu3PFWdliSMMpiGj8OA== X-Received: by 2002:a05:600c:1d01:b0:434:a684:9b1 with SMTP id 5b1f17b1804b1-434fff6f5dfmr44703555e9.4.1733845290932; Tue, 10 Dec 2024 07:41:30 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38636c919e5sm10233804f8f.18.2024.12.10.07.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 07:41:30 -0800 (PST) Date: Tue, 10 Dec 2024 17:41:27 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Herman Rimm , 70923@debbugs.gnu.org References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@rimm.ee> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gGyXW5Mk1u60rtap" Content-Disposition: inline In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@rimm.ee> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 2E92F54773 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -11.38 X-Spam-Score: -11.38 X-TUID: EJRqdtNY7jZ1 --gGyXW5Mk1u60rtap Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've applied this one for now to the rust-team branch since it'll cause a rebuild if applied to master. I tried out the patches for the importer too, but I think with the changes it needs the input from some other teams too? On Mon, Dec 09, 2024 at 08:58:05PM +0100, Herman Rimm wrote: > * guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs. >=20 > Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 > --- > guix/build-system/cargo.scm | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) >=20 > diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm > index 658a2e525e..2e3061c0e8 100644 > --- a/guix/build-system/cargo.scm > +++ b/guix/build-system/cargo.scm > @@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2019 Ivan Petkov > ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka > ;;; Copyright =C2=A9 2021 Efraim Flashner > +;;; Copyright =C2=A9 2024 Herman Rimm > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -234,11 +235,14 @@ (define (crate-closure inputs) > (if (null? propagated) > (reverse result) > (loop (reverse (concatenate propagated)) result '() #f seen))) > - (((and input (label (? package? package))) rest ...) > + ;; Match inputs with labels for backward compatibility. > + (((or (_ (? package? package)) > + (? package? package)) > + rest ...) > (if (and (not first?) (seen? seen package)) > (loop rest result propagated first? seen) > (loop rest > - (cons input result) > + (cons package result) > (cons (package-cargo-inputs package) > propagated) > first? > @@ -296,8 +300,8 @@ (define (expand-crate-sources cargo-inputs cargo-deve= lopment-inputs) > something that can always be extended or reworked in the future)." > (filter-map > (match-lambda > - ((label (? package? p)) > - (list label (package-source p))) > + ((? package? p) > + (list (package-name p) (package-source p))) > ((label input) > (list label input))) > (crate-closure (append cargo-inputs cargo-development-inputs)))) >=20 > base-commit: a5a540d71331fd43fd53e23eb49102c55462c28f > --=20 > 2.45.2 >=20 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --gGyXW5Mk1u60rtap Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmdYYScACgkQQarn3Mo9 g1GR7g/+MqpHDQFNX7+bvh9DutJhSNs9ib7/cNJfmqEi0JUC/Fh4CFQj2i9+Uvtw 6JUCW6X5L5p0wE8fQs4RVgsDsOPx0P7Qd9MoVKF12GIJSuhupUyMDiW+5iEu9Zq+ kRqQTYkM9qnvZ5WAGIikZvZw/Bu3440hffDTFWEFL696g0KAJr4x7GXwd0TfwrRP qfmUjKGvpnkobqMUqx9P/mu7zAczNDVQge1tRGFDLOQZr8aiaIMnoRbA3bWLunst LjDXIRhbhyns+rWpwACT0GiVIb88oydWAhT1wnjPwm4DsQhrs2bz6UUI9Dythpgh 4pzCXc3zrV9cDQklejIp54KcN07LdFGe1L2zPUQkxn41rvoDTwL555TuKW72Ne78 qkp6FZIckeWBjZJ+caRB7NuSIHOEVYnPZqz+Z8WJVlhZ5FJSSjeTB2txqK/VR1rJ WLKCZUXJb6N+Z7Ur8jealQjEWd+CkDkDilfuzhEJx2X6D7nx7usWY0GpWar4b8st 5JNUpyv3tzVcCbv7WcraCqVor4lW1WI/SzOPdKbGJxnZe+tx+8nOX4YX+U11gMDp mwdN0TXhLbDbr9ZkAEhQjFeNfWUqDXoo7/m6EcoShjkmNqrJRV2kbAp5cad5+6OW bdlFO/eGYsFea7WsQNV4RW7SsvaTrMiV5kqQpJyjqO6tSuBIUT0= =IchR -----END PGP SIGNATURE----- --gGyXW5Mk1u60rtap--