From patchwork Tue Dec 19 23:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 57864 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 6A84C27BBEA; Tue, 19 Dec 2023 23:47:12 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 D7D1527BBE2 for ; Tue, 19 Dec 2023 23:47:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFjni-0002XH-Nx; Tue, 19 Dec 2023 18:47:02 -0500 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 1rFjng-0002X2-Iy for guix-patches@gnu.org; Tue, 19 Dec 2023 18:47:00 -0500 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 1rFjng-0003OB-3e for guix-patches@gnu.org; Tue, 19 Dec 2023 18:47:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFjni-0004Fv-TF for guix-patches@gnu.org; Tue, 19 Dec 2023 18:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67917] [PATCH 1/2] import: cpan: Add 'license:' prefix to license matching. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 23:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67917 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67917@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 67917-submit@debbugs.gnu.org id=B67917.170302958316303 (code B ref 67917); Tue, 19 Dec 2023 23:47:02 +0000 Received: (at 67917) by debbugs.gnu.org; 19 Dec 2023 23:46:23 +0000 Received: from localhost ([127.0.0.1]:37958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn4-0004Eo-VH for submit@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:23 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:37324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn1-000495-FT for 67917@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:20 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1703029570; bh=eucKGWwMLWp6TQ/Th8D/9Q1e0LkrPhd4w+cwGvMg5j0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Oj425fpi6i3pumQCV4ufgxQH65z+EemHt0aPlVY+umxkpYo0LuAxXVhkojCkbpDuM /mLWZTsvsttsaUVI7E1kK5twEH/VLb7aMSXc4qmvF9bAneUpNDdtTCpyYPbGNW5pKK x4Jjld/dSXTyXpw7RAvvCTc6zpLkB2GeuKygp5AA= Date: Wed, 20 Dec 2023 00:45:23 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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: , 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/cpan.scm (string->license): Add 'license:' prefix. Change-Id: If28622edd49a85fac9d6ee83ea595ef419e180b7 --- guix/import/cpan.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index b87736eef6c..7dd89c02dc7 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,29 +104,29 @@ (define string->license (match-lambda ;; List of valid values from https://metacpan.org/pod/CPAN::Meta::Spec. ;; Some licenses are excluded based on their absense from (guix licenses). - ("agpl_3" 'agpl3) + ("agpl_3" 'license:agpl3) ;; apache_1_1 - ("apache_2_0" 'asl2.0) + ("apache_2_0" 'license:asl2.0) ;; artistic_1 - ("artistic_2" 'artistic2.0) - ("bsd" 'bsd-3) - ("freebsd" 'bsd-2) + ("artistic_2" 'license:artistic2.0) + ("bsd" 'license:bsd-3) + ("freebsd" 'license:bsd-2) ;; gfdl_1_2 - ("gfdl_1_3" 'fdl1.3+) - ("gpl_1" 'gpl1) - ("gpl_2" 'gpl2) - ("gpl_3" 'gpl3) - ("lgpl_2_1" 'lgpl2.1) - ("lgpl_3_0" 'lgpl3) - ("mit" 'x11) + ("gfdl_1_3" 'license:fdl1.3+) + ("gpl_1" 'license:gpl1) + ("gpl_2" 'license:gpl2) + ("gpl_3" 'license:gpl3) + ("lgpl_2_1" 'license:lgpl2.1) + ("lgpl_3_0" 'license:lgpl3) + ("mit" 'license:x11) ;; mozilla_1_0 - ("mozilla_1_1" 'mpl1.1) - ("openssl" 'openssl) - ("perl_5" 'perl-license) ;GPL1+ and Artistic 1 - ("qpl_1_0" 'qpl) + ("mozilla_1_1" 'license:mpl1.1) + ("openssl" 'license:openssl) + ("perl_5" 'license:perl-license) ;GPL1+ and Artistic 1 + ("qpl_1_0" 'license:qpl) ;; ssleay ;; sun - ("zlib" 'zlib) + ("zlib" 'license:zlib) (#(x) (string->license x)) (#(lst ...) `(list ,@(map string->license lst))) (_ #f))) From patchwork Tue Dec 19 23:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 57865 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 ABBDB27BBE9; Tue, 19 Dec 2023 23:47: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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 162E827BBE2 for ; Tue, 19 Dec 2023 23:47:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFjnh-0002XC-FV; Tue, 19 Dec 2023 18:47:01 -0500 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 1rFjnf-0002Ws-VA for guix-patches@gnu.org; Tue, 19 Dec 2023 18:46:59 -0500 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 1rFjnf-0003Ny-Mx for guix-patches@gnu.org; Tue, 19 Dec 2023 18:46:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFjni-0004Fn-DW for guix-patches@gnu.org; Tue, 19 Dec 2023 18:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67917] [PATCH 2/2] import: cpan: Add 'define-public' to package definition. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 23:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67917 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67917@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 67917-submit@debbugs.gnu.org id=B67917.170302958316297 (code B ref 67917); Tue, 19 Dec 2023 23:47:02 +0000 Received: (at 67917) by debbugs.gnu.org; 19 Dec 2023 23:46:23 +0000 Received: from localhost ([127.0.0.1]:37956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn4-0004Em-IR for submit@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:22 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:37338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn1-00049W-VQ for 67917@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:20 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1703029571; bh=zrZjWk1npHlysVvU9lUPE+Nr+Y0qI0Anrio60I3s4rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S81yqVIv9yRyJN2UsY2BEyeMMQzpt1ifYsUluJj8/1JWPud5GalLxNihcKmxGDQLQ SXWPsDsaidzmgic62Y8VZwGE6B+2DQVQcjoaFpP0ONwQuwwLeMKgNPfMWaMm6D6qf5 +i3JsJo5uU17T9aj4ETvCgqd+iFq9c654AauxbJM= Date: Wed, 20 Dec 2023 00:45:24 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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: , 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/cpan.scm (string->license): Add 'define-public' to package definition. Change-Id: I9a0bcb53b40ab8f68579e99c0b8a86bbe9905db2 --- guix/import/cpan.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 7dd89c02dc7..d5ac8e0cb90 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -288,26 +288,27 @@ (define (cpan-module->sexp release) (let ((tarball (with-store store (download-to-store store source-url))) (inputs (cpan-module-inputs release))) - `(package - (name ,(cpan-name->downstream-name name)) - (version ,version) - (source (origin - (method url-fetch) - (uri (string-append ,@(factorize-uri source-url version))) - (sha256 - (base32 - ,(bytevector->nix-base32-string (file-sha256 tarball)))))) - (build-system perl-build-system) - ,@(maybe-inputs 'native-inputs - (filter (upstream-input-type-predicate 'native) - inputs)) - ,@(maybe-inputs 'propagated-inputs - (filter (upstream-input-type-predicate 'propagated) - inputs)) - (home-page ,(cpan-home name)) - (synopsis ,(cpan-release-abstract release)) - (description fill-in-yourself!) - (license ,(string->license (cpan-release-license release)))))) + `(define-public ,(string->symbol (cpan-name->downstream-name name)) + (package + (name ,(cpan-name->downstream-name name)) + (version ,version) + (source (origin + (method url-fetch) + (uri (string-append ,@(factorize-uri source-url version))) + (sha256 + (base32 + ,(bytevector->nix-base32-string (file-sha256 tarball)))))) + (build-system perl-build-system) + ,@(maybe-inputs 'native-inputs + (filter (upstream-input-type-predicate 'native) + inputs)) + ,@(maybe-inputs 'propagated-inputs + (filter (upstream-input-type-predicate 'propagated) + inputs)) + (home-page ,(cpan-home name)) + (synopsis ,(cpan-release-abstract release)) + (description fill-in-yourself!) + (license ,(string->license (cpan-release-license release))))))) (define (cpan->guix-package module-name) "Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the