From patchwork Wed Mar 15 12:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 48024 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A7DDF16CAB; Wed, 15 Mar 2023 12:53:05 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 3362616961 for ; Wed, 15 Mar 2023 12:53:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQby-0003RD-Jm; Wed, 15 Mar 2023 08:52:10 -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 1pcQbt-0003Pd-G2 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcQbt-000390-3X for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQbs-0001Z1-VI for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 05/21] import: juliahub: Add indirect dependencies. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16788847095867 (code B ref 62202); Wed, 15 Mar 2023 12:52:04 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:51:49 +0000 Received: from localhost ([127.0.0.1]:39303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbc-0001WS-P3 for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:49 -0400 Received: from 15.mo583.mail-out.ovh.net ([178.33.107.29]:35657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbZ-0001VX-5h for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:46 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.156.62]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 1C97E25D68 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:51:42 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ljxbb (unknown [10.110.103.232]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B51C91FE62; Wed, 15 Mar 2023 12:51:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-ljxbb with ESMTPSA id bBwSK16/EWQX7B8AwsBWZw (envelope-from ); Wed, 15 Mar 2023 12:51:42 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004b2172859-b997-41fb-a03f-501c056b6cc2, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:14 +0100 Message-Id: <20230315125130.23041-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315125130.23041-1-ngraves@ngraves.fr> References: <20230315125130.23041-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13789459111543497442 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeivddvtddvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 --- guix/import/juliahub.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 4c3ceed109..fb361a0044 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -67,6 +67,16 @@ (define (json->juliahub-direct-dependencies vector) #f))) (vector->list vector)))) +(define (json->juliahub-indirect-dependencies vector) + (if (vector? vector) + (filter-map + (lambda (el) + (let ((dep (json->juliahub-dependency el))) + (if (not (juliahub-dependency-direct? dep)) + dep + #f))) + (vector->list vector)))) + (define (ini-list->extra-dependencies lst) (match lst (('(extras) ooo ...) @@ -103,6 +113,9 @@ (define-json-mapping make-juliahub-package juliahub-package? (direct-dependencies juliahub-package-direct-dependencies "deps" json->juliahub-direct-dependencies) ;list of + (indirect-dependencies + juliahub-package-indirect-dependencies "deps" + json->juliahub-indirect-dependencies) ;list of (url juliahub-package-url) ;string (uuid juliahub-package-uuid) ;string (license juliahub-package-license)) ;string @@ -181,7 +194,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-direct-dependencies package) test-dependencies-names licenses) - (append dependencies-names test-dependencies)))) + (append dependencies-names test-dependencies-names)))) (values #f '())))) (define* (import-release package #:key (version #f))