From patchwork Tue Sep 24 20:13:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 31397 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 343D527BBE2; Tue, 24 Sep 2024 21:21:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3656F27BBE9 for ; Tue, 24 Sep 2024 21:21:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stC2g-0000NM-5G; Tue, 24 Sep 2024 16:21:50 -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 1stC2W-0000Ix-Fr for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:41 -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 1stC2U-0003Ol-CZ for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:38 -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:References:In-Reply-To:Date:From:To:Subject; bh=PLXxgB+Ns3CX0w+wN615sREAl/GGOCCzcIUFd9+skMA=; b=Kg08AaHUQm6He023Z3I9gc1XWBP/LirZpYRyJ1fJC64fd3vP7n9x5Vy4yo6axld4W9A44MtKIkoeJAjlh6z+Lyh4YFnnGk/BTSMAaA0sFKTrxkNsAt/Ny4mmGZDBIsExqu5O67dVLNufKxkEQ54H82wrnUQiI1OpI9VtkROCm2hC0Bx2kryVHgb7iIO130suTgPZTRT2YyS5lu5Ob1hi7wbCpJhn++ryJEd6qVQZYoq00Uvv6E4+nFP9AEMgFkMnh+TbZAcX/O9b2Avm5iLJln4g5NFTanvAbagthB/YC6KbWVARouBhfIEvt21Qbt9FLx8FkO+MrVy2/mRexU7lUQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stC2t-00054G-4U; Tue, 24 Sep 2024 16:22:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v3 01/11] 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: Tue, 24 Sep 2024 20:22:03 +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.172720928419297 (code B ref 70923); Tue, 24 Sep 2024 20:22:03 +0000 Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:24 +0000 Received: from localhost ([127.0.0.1]:38494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2F-000512-Ad for submit@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:23 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2A-00050F-B1 for 70923@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727208844; 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: in-reply-to:in-reply-to:references:references; bh=PLXxgB+Ns3CX0w+wN615sREAl/GGOCCzcIUFd9+skMA=; b=diFaJysOgdryCF/LWFV5+wi7b7PZ1fsqM3X/T8jH/IKOsnrydD1HPgq1Arl63WNCnK6mF8 QDKPVkUVM9Rbl2q6eUJqF4x+m77YGaTBAQjw01X6RS+Ot1BgI7yp64Dwiza1+QG9i5550v TKyCvLR0ocepf8edfSPITWxNZMRspWWIGjcwdENBIxADVHZmh7lELeAvr5uclxXwCj3eZ7 4lEvMPcSc0NsiLthXNIOb+H5oQ20h0waB3w1PlNiQokFtNx7SjuNJQU78PfeZhhlsP8Mse 8YfEZD1T06AmmTPPgiGcqQipnPvlaAdDkv5nBU3WcopYF20V30y8uKt0mjG1Og== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f9d71bc0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:04 +0000 (UTC) Date: Tue, 24 Sep 2024 22:13:07 +0200 Message-ID: <368720732ff9491a4ab81657c4691f79ee2c9d5b.1727207512.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 (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-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))))