From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id rJCBANK9Q2URGwAAG6o9tA:P1 (envelope-from ) for ; Thu, 02 Nov 2023 16:18:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id rJCBANK9Q2URGwAAG6o9tA (envelope-from ) for ; Thu, 02 Nov 2023 16:18:42 +0100 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 B6AC167B06 for ; Thu, 2 Nov 2023 16:18:41 +0100 (CET) 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=1698938321; 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=G+234kMHbfCL5++ZiYmwn5HLbeTelM5KDD3vydssZvBryCXFG2yDuaQSuAkgDWP3E5Rx6m ZD0pySEAtIY5tQpaat+iXvYD+YjW89vmZOByovLdGw7UDnM+E+3YNpTRlwAYZf59ko931P yIQoWKy1m/7PRfM+mQ2hEAlY5MIIUBi7JQD4sxcmHi1EtoyXPqaXvR2y0x1gIVjcMmeHZI z8OAcBR4kVoIJPjev6W5gmVgICMkcd4AArfs1tYH7woyeSHGxORXGbst4bwfbgIFqI2ARu Rk2CNaOd/tHVT40v909JGEFfeNzeCQh3mKhwpd/gSJIQBCME5a6hngYN/LkElQ== 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=1698938321; a=rsa-sha256; cv=none; b=HWbKyg8xvGYjMQxNQ5CkoMBvg6CJFHGyREa6y2UrvKKVgyu6CX5C45kTTXrLizGGBx7Cw2 tYZha0i7I9ZVpDcORnJcKySjsZGNftWYNeSD+cJ6e2qdoGeaRifvLsIT72Q0B9NkNgdN3T Lryv5lW68+HXrPtcAIbQHjg0g9GIJRVduFVTxaciBY+fn5MiMtsXUl+B7Oo/KG7JGeZZbI MRe7cqpUx6DPVCSX4OdWOfz1581cmmclwEfLR2uNwRd5j68Mg6L4KNNra8XAqu2PYCt/1C eIwofyJYIoAwCuXZoWslk9fiqVpMFGlGN7XtXFbBf+QF2DKZOu7yzxkPlb1LaQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 15:19: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.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 ) 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 ) 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 ); Thu, 02 Nov 2023 15:17:40 +0000 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: 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.11 X-Spam-Score: -6.11 X-Migadu-Queue-Id: B6AC167B06 X-Migadu-Scanner: mx13.migadu.com X-TUID: 4huk4S04PgTf --- 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