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 ms13.migadu.com with LMTPS id iPiJCXJMV2dtDwAAqHPOHw:P1 (envelope-from ) for ; Mon, 09 Dec 2024 20:00:50 +0000 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 iPiJCXJMV2dtDwAAqHPOHw (envelope-from ) for ; Mon, 09 Dec 2024 21:00:50 +0100 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=vII1Mk7D; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=g6KRXvJ0; 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=1733774449; 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-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=0Di93yy8Gn0ccmgADGHtanVps1ZA9snHbZkD327+loc=; b=QDrRNeGoAgQn9Ry1tWs37/9QwZNG1uQFzf5XYhJdhlgERZ1u2ZRvXOjNGFWHA0N5XTQeAm rdkGbeEARZvJP4//g9UIGKKohh+aVTIweoi1s1Nq8ZS0gvMpEBePIXyRrF8T7yNCY/z+YA U8BSafV7OqCNPggnFtyY45LSqBDqTNBfv4xsx+HPNnNxol2qsEzlzoO8IwbVbvCgkxz24/ pFdar5xFB4JmqatrH/VM1TClqC7xuouDT84g+q8snA9Mn7ie6DJc8jUvT+EzfTEkWC3Svh CHkrswg2lCFuX0KxpecvEKaATpAXGr4uSmf7iANgOB5S8EcaB3Gjtn4TVe8f+A== 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=vII1Mk7D; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=g6KRXvJ0; 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=1733774449; a=rsa-sha256; cv=none; b=UKxqQiAXovKuB6yGCOumAsPurIgPEns9kHNu56o+0ZsUUjO39KtRczv8Lk8ZufG60bZV7Z dXWi2PTRq4ss6VjzRQbpnaxHaFWs1U5GqUxKcRLQ0AEMtPPeEL6J86r2aSDRB2faHS+De9 quNpK011TPm8hGRMB8rv3UKHtAtut1fNsUTSHeEmrm429UO9cARmbc1bDmaqRyd7ieAMtx ZdDBEijfmLhfH+UJYOvxGTKnVa24yW8XOtCatk/69KEgS+splbj8dPuLVSdsA6NcVSkEaC dTDk04/t451QcIDo+i0zbIpyCsjTy6j6vn6iHri1CWcx9WdkiIi2yepW6sYaoQ== 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 C96E6794FE for ; Mon, 09 Dec 2024 21:00:49 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKjvK-0005AL-S8; Mon, 09 Dec 2024 15:00:06 -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 1tKjvI-00059m-Mb for guix-patches@gnu.org; Mon, 09 Dec 2024 15:00:04 -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 1tKjvI-0007O1-Ck for guix-patches@gnu.org; Mon, 09 Dec 2024 15:00:04 -0500 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=0Di93yy8Gn0ccmgADGHtanVps1ZA9snHbZkD327+loc=; b=vII1Mk7D9IMN1/aYW3P8zVFKTi4azHQ3xVxc1GyRviKmaqASSs8F5BkC3tUvjFMrMrMqGWjzGwjqvJCEdJ3zAMXKaHrU2fsT7deuK4bE7Iw62VJYUorlE75pGC2QDdLHs2u/TchftLOHaVFPI6sKKUTOV5ej32NERJLlMP/SerSWDYXWiYMZ0AGygkfEKTCg6BXsnauJvQqIWMvJFLsJdxCoITYrzRE3h07MV+fuhKa4dviy1Ua9L0cs1prjNBoS/wtefTfBnHMGNYUwmQ+Q7Sl2UdDjihQhPfLV8V/kO4bIA8izlRHIu9P22WGPzdstaZrqv+07MC5wflaOh+21KA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKjvG-0002C7-Tk; Mon, 09 Dec 2024 15:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v4 01/11] build-system: cargo: Accept unlabeled #:cargo-inputs. References: In-Reply-To: Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 20:00: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.17337743678203 (code B ref 70923); Mon, 09 Dec 2024 20:00:02 +0000 Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:27 +0000 Received: from localhost ([127.0.0.1]:55726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKjuc-00027t-JY for submit@debbugs.gnu.org; Mon, 09 Dec 2024 14:59:26 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKjuX-00027N-NN for 70923@debbugs.gnu.org; Mon, 09 Dec 2024 14:59:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1733774348; 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=0Di93yy8Gn0ccmgADGHtanVps1ZA9snHbZkD327+loc=; b=g6KRXvJ0gjyXau70Fp3hdfB+DEdu4nihS4yJBkm9L8zAoRKqmQSrz/d0NAwFTcrj5vAP87 41mRkA1Gy8VULvdadBoyhUDiVQxar8lTVCZe9u9c+bOFJdv53vi8eGvQyJf6fc8Mxemhzr n7bACcxYLSEaPHb4EtiM28ACGlco3AJ+ukKRHmhnZhH0A0kv5qyCOAJhEqyNqVe4hHMBex 8cybjVCx/rMfSYrKP6LEwsvrDKJuqQ4JElI/SQHwKaiRK3cyfi6O9mi/ySzIQJLuuDtFfa hzaA7nV/CfcAJhExbgTqGxpIzubbQVc5bAijjvJSPbUxM3sj+ep4nqRyCq2oJQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 64c933bf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:08 +0000 (UTC) Date: Mon, 9 Dec 2024 20:58:05 +0100 Message-ID: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.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-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -2.66 X-Spam-Score: -2.66 X-Migadu-Queue-Id: C96E6794FE X-TUID: fWoyE3hX5O5U * 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)))) base-commit: a5a540d71331fd43fd53e23eb49102c55462c28f -- 2.45.2