Message ID | 398066933ddc6d5c46d0f0b3ded007580930acdd.1716193122.git.herman@rimm.ee |
---|---|
State | New |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D92927BBE2; Mon, 20 May 2024 10:03:42 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6766327BBE9 for <patchwork@mira.cbaines.net>; Mon, 20 May 2024 10:03:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1s8yv4-0001i1-B0; Mon, 20 May 2024 05:02:58 -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 <Debian-debbugs@debbugs.gnu.org>) id 1s8yt7-0000Op-W3 for guix-patches@gnu.org; Mon, 20 May 2024 05:01:00 -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 <Debian-debbugs@debbugs.gnu.org>) id 1s8yt7-0006j2-Mx for guix-patches@gnu.org; Mon, 20 May 2024 05:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1s8ytC-0007B0-3s; Mon, 20 May 2024 05:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71076] [PATCH 01/81] build-system: cargo: Accept unlabeled #:cargo-inputs. Resent-From: Herman Rimm <herman@rimm.ee> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 20 May 2024 09:01:02 +0000 Resent-Message-ID: <handler.71076.B71076.171619560827074@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71076 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71076@debbugs.gnu.org Cc: Efraim Flashner <efraim@flashner.co.il> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@flashner.co.il> Received: via spool by 71076-submit@debbugs.gnu.org id=B71076.171619560827074 (code B ref 71076); Mon, 20 May 2024 09:01:02 +0000 Received: (at 71076) by debbugs.gnu.org; 20 May 2024 09:00:08 +0000 Received: from localhost ([127.0.0.1]:41057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1s8ysI-00072O-7K for submit@debbugs.gnu.org; Mon, 20 May 2024 05:00:07 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37059 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@rimm.ee>) id 1s8ysG-00071L-9x for 71076@debbugs.gnu.org; Mon, 20 May 2024 05:00:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1716195593; 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=Gy3lJwea5qON+vPBgk5Jpr+ko1E6YwLrD1b8lYt2bxHQHEf6v4R7nOoTECRWEmeZaAf2sO ENcQfmI5vyBtUHIaqEInMB5ezoEwbPJ0OH9vdTmaRuIhpakIpRF0mKx6S2LhEHFmeKZ6xN B5+SRS2CZnabQy1qwW8HmnnRRcyopdRnEDjTcqoXJC4he2SN/n7At1sFREOlKBPZByTHos GZodCevmMsCa6X7FAUQvvcTTBl/M56Zj3gcD3RBEFfTakgRpjN+C4MseJtRWG4Q8r4zg7M Rm+GnxZ6XbHyl+Mkra33uVmszjghxHfbB1L5EpJoopLwfttJ5fHYS+3+tpjqhw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a7aa3e9f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <71076@debbugs.gnu.org>; Mon, 20 May 2024 08:59:53 +0000 (UTC) Date: Mon, 20 May 2024 10:58:06 +0200 Message-ID: <398066933ddc6d5c46d0f0b3ded007580930acdd.1716193122.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1716193122.git.herman@rimm.ee> References: <cover.1716193122.git.herman@rimm.ee> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Herman Rimm <herman@rimm.ee> X-ACL-Warn: , Herman Rimm via Guix-patches <guix-patches@gnu.org> From: Herman Rimm via Guix-patches via <guix-patches@gnu.org> 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 |
Series |
Add matrix-conduit and ruma-0.10.
|
expand
|
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