Message ID | 5e275b0faafb6897f995d2c37d39984fca5eb9e1.1695724304.git.ngraves@ngraves.fr |
---|---|
State | New |
Headers |
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 7C9EA27BBE9; Tue, 26 Sep 2023 11:33:32 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 6716E27BBEB for <patchwork@mira.cbaines.net>; Tue, 26 Sep 2023 11:33:31 +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 1ql5N6-0002Jz-Pr; Tue, 26 Sep 2023 06:32:52 -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 1ql5N5-0002J5-C8 for guix-patches@gnu.org; Tue, 26 Sep 2023 06:32:51 -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 1ql5N5-0000oN-3X for guix-patches@gnu.org; Tue, 26 Sep 2023 06:32:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ql5NI-00007P-08 for guix-patches@gnu.org; Tue, 26 Sep 2023 06:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42338] [PATCH v3 5/7] guix: import: composer: Fix json->require. Resent-From: Nicolas Graves <ngraves@ngraves.fr> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2023 10:33:03 +0000 Resent-Message-ID: <handler.42338.B42338.1695724348361@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42338@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 42338-submit@debbugs.gnu.org id=B42338.1695724348361 (code B ref 42338); Tue, 26 Sep 2023 10:33:03 +0000 Received: (at 42338) by debbugs.gnu.org; 26 Sep 2023 10:32:28 +0000 Received: from localhost ([127.0.0.1]:47357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ql5Mi-00005X-6m for submit@debbugs.gnu.org; Tue, 26 Sep 2023 06:32:28 -0400 Received: from 4.mo550.mail-out.ovh.net ([46.105.76.26]:40375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@ngraves.fr>) id 1ql5Ma-0008WN-VL for 42338@debbugs.gnu.org; Tue, 26 Sep 2023 06:32:21 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.20.107]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id AEBFE28B73 for <42338@debbugs.gnu.org>; Tue, 26 Sep 2023 10:32:06 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-t95hk (unknown [10.110.103.232]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 555931FEDF; Tue, 26 Sep 2023 10:32:06 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-t95hk with ESMTPSA id daO4DyazEmXnCw4AeioZ3w (envelope-from <ngraves@ngraves.fr>); Tue, 26 Sep 2023 10:32:06 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S004a5be8d66-0766-4999-8689-73ea4ca22628, 673A0E1412D75BE9E6E9083740E1979C5D801E24) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 26 Sep 2023 12:31:42 +0200 Message-ID: <5e275b0faafb6897f995d2c37d39984fca5eb9e1.1695724304.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <6abfbb4d4d57642fea6bae5835ff0d365de7e24a.1695724304.git.ngraves@ngraves.fr> References: <6abfbb4d4d57642fea6bae5835ff0d365de7e24a.1695724304.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12909005384570561250 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvjedrtddtgddtudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepgedvfeefkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves <ngraves@ngraves.fr> X-ACL-Warn: , Nicolas Graves via Guix-patches <guix-patches@gnu.org> From: Nicolas Graves 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 |
[bug#42338,v3,1/7] guix: import: Add composer importer.
|
|
Commit Message
Nicolas Graves
Sept. 26, 2023, 10:31 a.m. UTC
--- guix/import/composer.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 177dc63092..3acbbecf82 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -88,7 +88,8 @@ (define (json->require dict) ((((? (cut string-contains <> "/") name) . _) require ...) (loop (cons name result) require)) - ((_ require ...) (loop result require)))) + ((_ require ...) (loop result require)) + (_ result))) '())) (define-json-mapping <composer-source> make-composer-source composer-source?