From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id WCt/G5RzQmbQ6wAAqHPOHw:P1 (envelope-from ) for ; Mon, 13 May 2024 22:09:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WCt/G5RzQmbQ6wAAqHPOHw (envelope-from ) for ; Mon, 13 May 2024 22:09:56 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=JdnCYM4r; dmarc=pass (policy=none) header.from=gnu.org; 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=1715630996; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=fcE2ROuORKfj73PcGqko244Of/JWMOrJ8xzvj5mcJ/s=; b=LQJh/nnB+wfSN08rWej7Mw+Epfe4aVy08crJn1+BBMrcA+yuDV49jvYIaXc3NPfaiSk/eI o/u1EqqNXZU+cSSpw6e/Io4GUz27e4QziJs1v4CcD8PBNMcxbXcXfx3yJMPQoqC+IrGYQb HiBsHj0lPF24W1ghyP/7+eD+Vbfh8+GZviDwC6pr3dHt5cdLxkLUNDgvOP+JKBsrI5QGFN XIHYe/m8eUA75LFr03w6pqSw1siOoPZRXnGP3x5qxz9bCjpIzWmBd+BiDsTAUbGfY9aINK wmpmFmkgk55IM3cEbkyAGYPMv4cAa7tFswuq4ng49lJ7Pz4x+kZTIdnqppI4yA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715630996; a=rsa-sha256; cv=none; b=gD/ipPuFDuuNQu3V1/ZJqvk6NvNu5kzKpxT4I3WgsQIQ4cZ5eAt93G1xSxjMky5B1yKPwv Arg8Z1xLTN9WyVdnjWm4LrtKod2x6RLgCAGR2/M7ef6P0iRzixSJrefh3lXKmgxEJ82Ysj WxJ6v/kQg3eFwe8udJ7V7LuHzORLnX9NPz11xsZVVsSsnxjdYBjdLXVoJPzW5pdFBmgy6Z lRcnBS8MMf+joBqiLNOctD925msLaSdvLq1onU7TS1W7CAGgwZdOsjJR7zvl3E1Yx/lTIK NCLJ8YH5sG9LTWC2Wn0tNvm3Yv9UaHyY1LqhAP8loKuqcNP6EmB4T257151/Hg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=JdnCYM4r; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 54A2D26F9 for ; Mon, 13 May 2024 22:09:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6byt-0004DV-Dd; Mon, 13 May 2024 16:09:07 -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 1s6byo-0004Ct-TI for guix-patches@gnu.org; Mon, 13 May 2024 16:09:02 -0400 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 1s6byo-0007nL-JO for guix-patches@gnu.org; Mon, 13 May 2024 16:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6byo-0000Hn-Ih; Mon, 13 May 2024 16:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH 01/13] build-system: cargo: Accept unlabeled #:cargo-inputs. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 20:09: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: 70923@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.1715630916929 (code B ref 70923); Mon, 13 May 2024 20:09:02 +0000 Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:36 +0000 Received: from localhost ([127.0.0.1]:34578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6byO-0000Ev-2t for submit@debbugs.gnu.org; Mon, 13 May 2024 16:08:36 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6byM-0000Ek-G3 for 70923@debbugs.gnu.org; Mon, 13 May 2024 16:08:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715630906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fcE2ROuORKfj73PcGqko244Of/JWMOrJ8xzvj5mcJ/s=; b=JdnCYM4rNJZf2CgMI+ciozbIfqdl4L7P4M2K/mkTGNpucyiEZ4n2BkMMa8VcJ4vFhhxa9b Yv9gm8MIb4EUfH867yVsJnjeqnXx8QzWLua1N6L2Xq4AVuFFgM8vMrkOytzSyaRo2Wv8MY 1K1/i1ksBqyJ3upcVWx8MxcDvyQRnayObwrytnEYWuUlhTmKDjPHRmzCZKKWm3hdTMwwLv sbzeUi1RXKwJa3/eXnD/1nYPfA+dp+E4nzWP7EyeWBsrsAiZEeM/+cyHFAJVB5f/SL59CY /YdDIhUnxcVBpCwSop4G0ozsAFmmya8srehBRUpOZf67CdrwUIB3SpR8lR/lNA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5f8fa723 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Mon, 13 May 2024 20:08:26 +0000 (UTC) Date: Mon, 13 May 2024 22:07:58 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via 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-Spam-Score: -3.37 X-Spam-Score: -3.37 X-Migadu-Queue-Id: 54A2D26F9 X-Migadu-Scanner: mx11.migadu.com X-TUID: tCtiftyXqEfp * guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index c029cc1dda..a918e25e7a 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -234,7 +234,17 @@ (define (crate-closure inputs) (if (null? propagated) (reverse result) (loop (reverse (concatenate propagated)) result '() #f seen))) - (((and input (label (? package? package))) rest ...) + (((? package? package) rest ...) + (if (and (not first?) (seen? seen package)) + (loop rest result propagated first? seen) + (loop rest + (cons (list (package-name package) package) result) + (cons (package-cargo-inputs package) + propagated) + first? + (vhash-consq package package seen)))) + ;; Match inputs with explicit labels for backward compatibility. + (((and input (_ (? package? package))) rest ...) (if (and (not first?) (seen? seen package)) (loop rest result propagated first? seen) (loop rest -- 2.41.0