From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uPGeAo7E2GancgEA62LTzQ:P1 (envelope-from ) for ; Wed, 04 Sep 2024 20:35:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id uPGeAo7E2GancgEA62LTzQ (envelope-from ) for ; Wed, 04 Sep 2024 22:35:26 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jNjHL0Pb; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=McvrFc0s; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725482126; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=ei/xDBVjakCQxc0+XQPJqy2knjiNOwQQAWuNs81w8Pk=; b=o3jkbWSpX+adHwNggbKtYReJlzPZvMfOA0giK46Rdu0WbqhtJtUTE9X8VTiusjNrjWxJww 8bcCMBH4YljpPVSo2VMsfMfSEksMuD/RvdHY7gmaA2JPLk3irHXQSK4SDgZzuP+Ndba9Gf 6T3yM5kH5dfTVWcjEERTxMlym+y4iWSCA95ar8p0UGXL7Of5ANfAnTYW6tAlUMFFup1jvm l+v2E4P+SxwnJ+E3HtM2R+CSBhO0BBq4p6LfitPN7ppn8KyLkE91v+p2laBd78p687JIN/ t/dggmlOydx7Q+0l4TNsvkYbgNQqsaV/5D3buZhabLgqDssGm32PI87VGplbAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=jNjHL0Pb; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=McvrFc0s; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725482126; a=rsa-sha256; cv=none; b=GVLmHl6QfP0lfsdc2wzx+gDnsnW/PkLPOfXOeVNMQGJtZ4HaWGKGIebnRmmJG0Q+XlBX/4 vNTjB+zOUXUHgsNiQlYiHdohStX6lu00v8oUNGbdQjLO/QzVJuSR6yuCndHyDqrenXncWP tjgD+xEoTvxmkZl7p0Si3xMUuzeZyizpp9kspy5iC9E3bs6ycHzpKEfr++jt4Du+VkqbGL uV9PYD32ymfVdf2LsU08RMgDMBhegsABLtZIvy9qxjPTYY9PbmZRIFy+5nn+vBxwEW9XB/ ja2bZIgy1+g2QO9bW4eUT/WeDf55nY6+HnzTeaLM3h7WMDGkmXri70kMkYFb/Q== 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 C1578697DA for ; Wed, 4 Sep 2024 22:35:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slwiW-00038B-BK; Wed, 04 Sep 2024 16:35:05 -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 1slwiQ-00036w-Ny for guix-patches@gnu.org; Wed, 04 Sep 2024 16:34:58 -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 1slwiQ-0002ED-Et for guix-patches@gnu.org; Wed, 04 Sep 2024 16:34:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=ei/xDBVjakCQxc0+XQPJqy2knjiNOwQQAWuNs81w8Pk=; b=jNjHL0Pb/G/C6WOmrXHkJp8q8Jrrnekz4sz3EZYyIEHe3jaaqhC2ra5+QnmGSISmFeq1sp1IPeL7ICg1nhc7KRjbVX3h2M5+VhC8UOaYE2HBmaf3kdFj/5333qAvuHw9rj9jZcu6Yfi9rLM12zNkrl0JAH2xA1Fns9NlZ1n7oxuYArqY6TO1JFBuNZCg5Yt+PrurY7FR86x9h9hoN+LjL0zRQ4M54YnmJJB09B9fGdxYrBRX8Fpcwt/rfzKO+RKLOBrsDV+PTGZYUbPLXwokEQb/7iypEFuiBM6jDjjndDFQSwZO/4kXTuNq2bG3rIE14LpUwuFhIWupSKFL0xTzCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slwjR-0005LT-Qu for guix-patches@gnu.org; Wed, 04 Sep 2024 16:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v2 01/12] build-system: cargo: Accept unlabeled #:cargo-inputs. References: In-Reply-To: Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Sep 2024 20:36:01 +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 Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.172548210620329 (code B ref 70923); Wed, 04 Sep 2024 20:36:01 +0000 Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:06 +0000 Received: from localhost ([127.0.0.1]:35448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slwiX-0005Hi-Vn for submit@debbugs.gnu.org; Wed, 04 Sep 2024 16:35:06 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slwiU-0005Gz-NI for 70923@debbugs.gnu.org; Wed, 04 Sep 2024 16:35:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725482029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei/xDBVjakCQxc0+XQPJqy2knjiNOwQQAWuNs81w8Pk=; b=McvrFc0shp92bcryKcaqpiemH5vnf6ICR6TnjH5v04L6HtbNnRkcXtVEvHd6nE6x2qXiat heLvSwDIVd9M4knidVD6NOGCW0kqobH88fSqS00kb3s9Qo10YxV4mKeI5/WN1CRzYjcMdN J2e6ABVJiVtUFoOah28hM2lBXkLt4wTcwE3esZtssZPfBBX3zkHvBEzxQv1zfGKnY21+Uu wrW4BeM8oIdQ39ConeJmxHk0VucKPkg+10E0345jxXmLZ2FLVefM+Ci3pKr0/qGzo1KnK6 51KHWHQ6dWanpGySyN6gx0NrI0SyxY9tGKY6d0esSZ0VlC/xuwvzAV6brKFvww== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9798ca85 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:49 +0000 (UTC) Date: Wed, 4 Sep 2024 22:32:55 +0200 Message-ID: <20240904203309.23715-1-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.98 X-Migadu-Queue-Id: C1578697DA X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.98 X-TUID: Usv1J0VeqYeL * guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 © 2019 Ivan Petkov ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -234,11 +235,14 @@ (define (seen? seen item) (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-development-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)))) -- 2.45.2