From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WKrvK3uzEmVE/AAAauVa8A:P1 (envelope-from ) for ; Tue, 26 Sep 2023 12:33:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WKrvK3uzEmVE/AAAauVa8A (envelope-from ) for ; Tue, 26 Sep 2023 12:33:31 +0200 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 78C2D3FA28 for ; Tue, 26 Sep 2023 12:33:31 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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=1695724411; 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-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; bh=Sicl8ZgVvZ/mjn7TbIhNdoNJHh9PhPXMW2gSytKo/t0=; b=IgvuB5ZVo0FGOJf7mmbrzfDLL1LuC9Dxb1uKEnzj5eCbOnotrgvhRH7eecddirdAjoMLMG 19SJR+oX6meX2KYNDk/tvhtc7fmq7yN1osYQ/BAorawgLfduWK0nNDRvcCpGFCn0CROj+U EFKnIMouFBUDo++ZJifx6xaoFssuJeWFdS8LTEyfi6SOxShdmuz5geUnsxd6m4evSveLXK ysv1lRwTMBgVrL4S5JU7K36TLSgRnemiFHKk751jn7WPxe9VZYtWL1oOZAerIn+KTf+T3u rq1GQ0ONuw0nZ5G8iIrlSn++vom2ZzZCAenR9q1vmzkU4Yra2+TBbC+ofdQQKw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=1695724411; a=rsa-sha256; cv=none; b=muvFslmB3i1nE2Em1YYqFvRRWNoxkqncEKQeUPogIYrwyM1PuZW1GqS3UtYuJHs1dpLEkn 9uioAvaGnoG1JL4D5BJbzli9WiQmZhUy0JGHhEeJ3SpChbBwyjvElPovDP+7IXwruOMqbI SF2ySNwrggdAvW4qN8kG+oFyX7CGC7GHFOXUUTtKZlxhEMfiwV8wdKU0lHeLQTnFLDkCw6 CLwTPdKzJJvUzkuXEvDtFN9WOR7YmyJ5uxZo+Jg4nADeraAUkRkkqmDRna4BaSJZx/LIAM 1YqRBb70oScIrcEamDpOQwOYU+CZK+xHDmDYL1CLAbt+A1ZokQrkqovusnUjyw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2023 10:33:03 +0000 Resent-Message-ID: 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 ) 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 ) 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 ); Tue, 26 Sep 2023 10:32:06 +0000 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.20 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 78C2D3FA28 X-Spam-Score: -6.20 X-TUID: qVJrpqqCtLJC --- 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 make-composer-source composer-source? -- 2.41.0