From patchwork Wed Mar 15 12:51:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 48026 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 08FC316CAB; Wed, 15 Mar 2023 12:53:36 +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 2AC8E16961 for ; Wed, 15 Mar 2023 12:53:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQdF-0004Kk-Qx; Wed, 15 Mar 2023 08:53:29 -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 1pcQcp-0003wE-Gi for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:04 -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 1pcQcp-0003Mj-8O for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQcp-0001dO-4E for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 17/21] import: juliahub: Fix license management. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:53:03 +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.16788847346158 (code B ref 62202); Wed, 15 Mar 2023 12:53:03 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:52:14 +0000 Received: from localhost ([127.0.0.1]:39352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQc1-0001bA-Tw for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:14 -0400 Received: from 1.mo576.mail-out.ovh.net ([178.33.251.173]:40269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQby-0001aS-Jr for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:11 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.156.164]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id AF74326629 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:52:09 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-lwwhg (unknown [10.110.208.62]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2CA4D1FE96; Wed, 15 Mar 2023 12:52:09 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-lwwhg with ESMTPSA id +3WlCHm/EWRRpAAAHUGJ8A (envelope-from ); Wed, 15 Mar 2023 12:52:09 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001b754a16a-1fbf-474b-af01-66a79434892f, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:26 +0100 Message-Id: <20230315125130.23041-17-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: 13797058935116980962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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, 5 insertions(+), 10 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 338f042441..e4b26bea34 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -248,10 +248,10 @@ (define* (juliahub-fetch name #:key (version #f)) (and=> (json-fetch url) json->juliahub-package))) (define (make-julia-sexp name source home-page synopsis description - direct-dependencies test-dependencies-names licenses) + direct-dependencies test-dependencies-names license) "Return the `package' s-expression for a Julia package with the given NAME, VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, -TEST-DEPENDENCIES-NAMES and LICENSES." +TEST-DEPENDENCIES-NAMES and LICENSE." `(package (name ,(julia-name->guix-name name)) (version ,version) @@ -270,10 +270,8 @@ (define (make-julia-sexp name source home-page synopsis description (synopsis ,synopsis) (description ,description) (home-page ,home-page) - (license ,(match licenses - (() #f) - ((license) (license->symbol license)) - (_ `(list ,@(map license->symbol licenses))))))) + (license + ,(if license (spdx-string->license license) #f)))) (define* (juliahub->guix-package package-name #:key version #:allow-other-keys) @@ -301,9 +299,6 @@ (define* (juliahub->guix-package package-name (dependencies-names (map juliahub-dependency-name direct-dependencies)) - (licenses - (map spdx-string->license - (list (juliahub-package-license package)))) (test-dependencies-names (if subdir (parse-test-dependencies @@ -319,7 +314,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-readme package)) direct-dependencies test-dependencies-names - licenses) + (juliahub-package-license package)) (append dependencies-names test-dependencies-names)))) (values #f '()))))