From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id OHJeC4G9Q2WOVQEAauVa8A:P1 (envelope-from ) for ; Thu, 02 Nov 2023 16:17:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OHJeC4G9Q2WOVQEAauVa8A (envelope-from ) for ; Thu, 02 Nov 2023 16:17:21 +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 D6273649F4 for ; Thu, 2 Nov 2023 16:17:20 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698938240; a=rsa-sha256; cv=none; b=cMMI6NzE7k3hpjtdUQZ2W6E8TJ9tMgCsVm79f/9hGXJF63/yYqprrTVutRGRgAbZz3/2LT kK7fzHzJOyHXTJ0Li5i1HihwDQl7pAQ+Jl24oQY7wNgVpNPvvYeOeHG4o9w2Rc/xJzr7bq dCmEOoizHF61bPvo5oYca/giKkZaXmpWEQSyab5nDonvU7Paulcw64mIp6IteJ4otMTXX2 mdcRLCSe++XQnne/XPt6FGLQTmUHmBc92+SoRBfWOrdg5dnuPfu4/ko17nWZhyoDYOhiqt QTt8SU6vsETNJNFvr8L+/PtVAjSUpT6OevCSf5P0fCodkKPLo+mgQhrwNMeO4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698938240; 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=DeVmLMZVINN0/TRNd7LWTMJgZR3ZlUxXN/H1PY1mp0oKlAygR/nu1XRkvl4DsSpy+O8AZ9 xwKuThm2JtRSkXxL3VLFuOLwMZPeXaeCEJN7LOyxcz6LndCT0sNLiXq982HU2aOnFGU3Af so/8xk1sq9YYl2fXiuVlTn6RmmToEjptFCXuYhtHpmIaDALRJnu3sNhaIO3iSRbpOSatPg 0sStx99XWhy3a6AmEqlPHbPjLfH+quzV1QIkY75Hq7+wT5i+IPTmzcv8SjsDoYlkHJb3J9 f87pCS8kxN+qM5+/ItLJs/CiJtWSawsbHGFW+m62U13jI8KD/yLI9+wplyqpPg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyZR0-0007Z5-FS; Thu, 02 Nov 2023 11:16:38 -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 1qyZQr-0007X3-WE for guix-patches@gnu.org; Thu, 02 Nov 2023 11:16:30 -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 1qyZQr-0002Ng-2b for guix-patches@gnu.org; Thu, 02 Nov 2023 11:16:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyZRQ-0006Vf-08 for guix-patches@gnu.org; Thu, 02 Nov 2023 11:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42338] [PATCH 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:17: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.169893817724876 (code B ref 42338); Thu, 02 Nov 2023 15:17:03 +0000 Received: (at 42338) by debbugs.gnu.org; 2 Nov 2023 15:16:17 +0000 Received: from localhost ([127.0.0.1]:55740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyZQf-0006T3-0e for submit@debbugs.gnu.org; Thu, 02 Nov 2023 11:16:17 -0400 Received: from 11.mo584.mail-out.ovh.net ([46.105.34.195]:59591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyZQa-0006S0-IB for 42338@debbugs.gnu.org; Thu, 02 Nov 2023 11:16:13 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.156.215]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 54B40254F4 for <42338@debbugs.gnu.org>; Thu, 2 Nov 2023 15:15:36 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-j6nvq (unknown [10.110.115.83]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E519D1FE4B; Thu, 2 Nov 2023 15:15:35 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-j6nvq with ESMTPSA id 9jqNMxe9Q2W9CwEACb9Dmg (envelope-from ); Thu, 02 Nov 2023 15:15:35 +0000 X-OVh-ClientIp: 87.88.157.103 Date: Thu, 2 Nov 2023 16:04:25 +0100 Message-ID: <20231102151523.30581-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102151523.30581-1-ngraves@ngraves.fr> References: <20231102151523.30581-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13625640672733356770 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddtiedgjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekjedrkeekrdduheejrddutdefpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeegvdeffeekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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-Queue-Id: D6273649F4 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.11 X-Spam-Score: -6.11 X-TUID: WjK+cbCpfzeD --- 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