From patchwork Wed Mar 15 12:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 48016 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 4E3A716C76; Wed, 15 Mar 2023 12:52:18 +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=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 233D916961 for ; Wed, 15 Mar 2023 12:52:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQbz-0003RM-17; Wed, 15 Mar 2023 08:52:11 -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 1pcQbv-0003QD-I1 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:07 -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 1pcQbu-00039J-OW for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQbu-0001Za-KR for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 09/21] import: juliahub: Improve dependency management. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:52:06 +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.16788847175929 (code B ref 62202); Wed, 15 Mar 2023 12:52:06 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:51:57 +0000 Received: from localhost ([127.0.0.1]:39315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbl-0001XP-0H for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:57 -0400 Received: from 17.mo581.mail-out.ovh.net ([188.165.35.227]:45655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbe-0001Wo-JP for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:51 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.1.191]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 80A4F23528 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:51:49 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-74llp (unknown [10.110.103.37]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2D2091FE96; Wed, 15 Mar 2023 12:51:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-74llp with ESMTPSA id OuBlD2S/EWQnNhcA/ww3gA (envelope-from ); Wed, 15 Mar 2023 12:51:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S00495087c72-54ce-4829-a9d2-791bb8747380, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:18 +0100 Message-Id: <20230315125130.23041-9-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: 13791429434507322082 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeivddvtddvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth 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 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index b1eeb736a8..fc25ba1d42 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -168,22 +168,20 @@ (define* (juliahub-fetch name #:key (version #f)) json->juliahub-package)) (define (make-julia-sexp name source home-page synopsis description - dependencies test-dependencies-names licenses) + direct-dependencies test-dependencies-names licenses) "Return the `package' s-expression for a Julia package with the given NAME, -VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, +VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, TEST-DEPENDENCIES-NAMES and LICENSES." `(package (name ,(julia-name->guix-name name)) (version ,version) (source ,source) (build-system julia-build-system) - ,@(let ((direct-dependencies - (filter julia-dependency-direct? dependencies))) - (if (null? direct-dependencies) - '() - `((propagated-inputs - (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - direct-dependencies)))))) + ,@(if (null? direct-dependencies) + '() + `((propagated-inputs + (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) + direct-dependencies))))) ,@(if (null? test-dependencies-names) '() `((native-inputs @@ -211,9 +209,12 @@ (define* (juliahub->guix-package package-name `(tag-or-commit . ,(string-append "v" (juliahub-package-version package)))))) - (let* ((dependencies-names + (let* ((direct-dependencies + (filter juliahub-dependency-direct? + (juliahub-package-dependencies package))) + (dependencies-names (map juliahub-dependency-name - (juliahub-package-direct-dependencies package))) + direct-dependencies)) (licenses (map spdx-string->license (list (juliahub-package-license package)))) @@ -224,7 +225,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-homepage package) (juliahub-package-description package) (beautify-description (juliahub-package-readme package)) - (juliahub-package-direct-dependencies package) + direct-dependencies test-dependencies-names licenses) (append dependencies-names test-dependencies-names))))