| Message ID | 20231102151725.31362-6-ngraves@ngraves.fr |
|---|---|
| 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 508D827BBE9; Thu, 2 Nov 2023 15:18:43 +0000 (GMT) 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 A053227BBE2 for <patchwork@mira.cbaines.net>; Thu, 2 Nov 2023 15:18:41 +0000 (GMT) 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 1qyZSp-00006C-5t; Thu, 02 Nov 2023 11:18:31 -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 1qyZSm-0008WB-Ql for guix-patches@gnu.org; Thu, 02 Nov 2023 11:18:28 -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 1qyZSm-0003pl-GZ for guix-patches@gnu.org; Thu, 02 Nov 2023 11:18:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qyZTL-0006br-FQ for guix-patches@gnu.org; Thu, 02 Nov 2023 11:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42338] [PATCH v5 5/9] 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: Thu, 02 Nov 2023 15:19:03 +0000 Resent-Message-ID: <handler.42338.B42338.169893830025272@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.169893830025272 (code B ref 42338); Thu, 02 Nov 2023 15:19:03 +0000 Received: (at 42338) by debbugs.gnu.org; 2 Nov 2023 15:18:20 +0000 Received: from localhost ([127.0.0.1]:55780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qyZSe-0006ZQ-8h for submit@debbugs.gnu.org; Thu, 02 Nov 2023 11:18:20 -0400 Received: from 3.mo582.mail-out.ovh.net ([178.33.253.26]:48231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@ngraves.fr>) id 1qyZSa-0006Yt-JE for 42338@debbugs.gnu.org; Thu, 02 Nov 2023 11:18:17 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.156.215]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id CD4EC22DCE for <42338@debbugs.gnu.org>; Thu, 2 Nov 2023 15:17:40 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-cfcvv (unknown [10.110.171.34]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 85E051FE9C; Thu, 2 Nov 2023 15:17:40 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-cfcvv with ESMTPSA id R4GJHJS9Q2WFEQEA0wFIyQ (envelope-from <ngraves@ngraves.fr>); Thu, 02 Nov 2023 15:17:40 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006a2988ee5-162b-46ba-8cf6-7d026d76c949, 1761E107A7246F2314AE904A186E6A889A3776EC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 87.88.157.103 Date: Thu, 2 Nov 2023 16:16:52 +0100 Message-ID: <20231102151725.31362-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102151725.31362-1-ngraves@ngraves.fr> References: <20231102151725.31362-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13660543571319317218 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddtiedgjeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekjedrkeekrdduheejrddutdefpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeegvdeffeekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth 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 |
Composer build-system
|
expand
|
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?