From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gNgaKK+/EWQhGQAASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 13:53:03 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eGIgKK+/EWRUoAAA9RJhRA (envelope-from ) for ; Wed, 15 Mar 2023 13:53:03 +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 4D3FE39715 for ; Wed, 15 Mar 2023 13:53:03 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQbz-0003Rd-Cj; 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-0003Q9-GU 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-00039I-Cf 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-0001ZT-8F for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 08/21] import: juliahub: Simplify juliahub 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.16788847175918 (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]:39313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbk-0001X9-0D for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:56 -0400 Received: from 20.mo581.mail-out.ovh.net ([46.105.49.208]:39895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbc-0001WJ-Px for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:49 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.16.251]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id B5B2323417 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:51:47 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-7krfw (unknown [10.110.171.145]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 599201FEB0; Wed, 15 Mar 2023 12:51:46 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-7krfw with ESMTPSA id +4VFGmK/EWTEsAAAVuhi0A (envelope-from ); Wed, 15 Mar 2023 12:51:46 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:17 +0100 Message-Id: <20230315125130.23041-8-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 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13790866484996268770 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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-Country: US X-Migadu-Flow: FLOW_IN 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=1678884783; a=rsa-sha256; cv=none; b=qrTk9ixvCnmdlukc2df8a9w0HmIWpxekEQDHj/363AT2Jdhu/FDN5A8Dc6cwq4RgV5PdRz gHIVheQ4L99LFNiBUy2TrcOUPsflDPHQQhK0+1OAhDOVpok6/dq0ktB1RDKEGNaGldSgDH jOLBHATOeYWFbkDW1RQmV2EFcs0GUDf5Onp0F3fx/wxHEDlr20bsNEcNA9gRp1TFt81wE1 JnZWw8Nxug1TtZG6GjfVuABfSRFuEoCSMnyG26yTU1mhJV/gsei8phnem4f0Cus9EgSdfW uTJJoQ2SpM/kqMtyPj0nPnFqJpfHKm9cHSnDp/QzjtjAgoscYG14DnT715GIXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678884783; 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=RsF2DGZ1TCGNcs4EIU1A7z/yo4i4mf9HBX6MJ1/3Nks=; b=nQB0MBQYN5fYGAzi23gowJZ25dELXWeuduoWa4/O8rfI+H28uaSJqO2dr3BC3Nwmbanonn yvNM/h2fE9g41sR4iiU47c5h/Xqhnby61EzKk7mIrEFw7BagtliAT5YgUzfPeHVvzSkTh0 U9psBxmDaxCbmx1Q4MaiiPmlCQiyU5e+RS8xICrAv0C9+SF24ayytSV7LFkuk7nsOplRaa Loc9t42pjNkzrshwl0942vxIu3UjIsMYSdbZLYxUeTQxqE+i5KuX6HXyE52xArLjV0fSxs r6hf7jQOaS3RVM0uTM05WLgg50dLrMWNEoXa9l4KgfDEEtlSQBYkftlM/GWXGg== X-Migadu-Spam-Score: -1.73 X-Spam-Score: -1.73 X-Migadu-Queue-Id: 4D3FE39715 X-Migadu-Scanner: scn1.migadu.com 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 X-TUID: ziHGiN1AV6QR --- guix/import/juliahub.scm | 42 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index af08f3d698..b1eeb736a8 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -100,26 +100,13 @@ (define (juliahub-slug-version name) (latest-version (string-drop uri 6))) `(,slug ,latest-version))) -(define (json->juliahub-direct-dependencies vector) +(define (json->juliahub-dependencies vector) (if (vector? vector) (filter-map (lambda (el) (let ((dep (json->juliahub-dependency el))) - (if (and (juliahub-dependency-direct? dep) - (not (member (juliahub-dependency-name dep) - %julia-stdlibs))) - dep - #f))) - (vector->list vector)))) - -(define (json->juliahub-indirect-dependencies vector) - (if (vector? vector) - (filter-map - (lambda (el) - (let ((dep (json->juliahub-dependency el))) - (if (and (not (juliahub-dependency-direct? dep)) - (not (member (juliahub-dependency-name dep) - %julia-stdlibs))) + (if (not (member (juliahub-dependency-name dep) + %julia-stdlibs)) dep #f))) (vector->list vector)))) @@ -157,12 +144,9 @@ (define-json-mapping make-juliahub-package juliahub-package? (readme juliahub-package-readme) ;string (version juliahub-package-version) ;string (description juliahub-package-description) ;string - (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 + (dependencies + juliahub-package-dependencies "deps" + json->juliahub-dependencies) ;list of (url juliahub-package-url) ;string (uuid juliahub-package-uuid) ;string (license juliahub-package-license)) ;string @@ -184,7 +168,7 @@ (define* (juliahub-fetch name #:key (version #f)) json->juliahub-package)) (define (make-julia-sexp name source home-page synopsis description - direct-dependencies test-dependencies-names licenses) + 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, TEST-DEPENDENCIES-NAMES and LICENSES." @@ -193,11 +177,13 @@ (define (make-julia-sexp name source home-page synopsis description (version ,version) (source ,source) (build-system julia-build-system) - ,@(if (null? direct-dependencies) - '() - `((propagated-inputs - (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - direct-dependencies))))) + ,@(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? test-dependencies-names) '() `((native-inputs -- 2.39.2