GNU bug report logs - #67917
[PATCH 0/2] guix import cpan improvements

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Wilko Meyer <w@HIDDEN>; Keywords: patch; dated Tue, 19 Dec 2023 23:44:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 67917 <at> debbugs.gnu.org:


Received: (at 67917) by debbugs.gnu.org; 8 Jan 2024 16:33:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 08 11:33:46 2024
Received: from localhost ([127.0.0.1]:37369 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rMsZN-00012i-N3
	for submit <at> debbugs.gnu.org; Mon, 08 Jan 2024 11:33:45 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:39806)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1rMsZL-00012T-B6
 for 67917 <at> debbugs.gnu.org; Mon, 08 Jan 2024 11:33:44 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1rMsZ9-0007mj-NX; Mon, 08 Jan 2024 11:33:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=ASxF9f56+TD9tGLsAbEKwBmvmGybmmj4daBGYCs7ylA=; b=Tb5jbkmmJwR0klrS+ARb
 sVItJ+X+txNMNV8oAc7X6ksGuiXoPAjVpWZDht1+8n5JBbhuulR920UNmZG8crHoYHcYK5n7rIgyF
 MwgHaDVegPVG/MUD20pws8kRWsvR2PYhohL1EE5hqDRFDunOlG0fGQvqJiR1JPOv6VHyFWcYaBW+f
 uTT8a8sDXgx9qyZDOxOuDldwP0rCUeKwyMgX4ao+eoCYXF+8n13vt+SMNaY0VCxB458huPSUoE1Ud
 Da3d5kLELDZi7w3k1iLpzGtIUZZOMJYrVkF6/t6HjbiWemTp6ksqCSWKtweX9DXssCDMFKvhH7+de
 vPeg/7P56HBaJQ==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Wilko Meyer <w@HIDDEN>
Subject: Re: [bug#67917] [PATCH 0/2] guix import cpan improvements
In-Reply-To: <874jg9w1ae.fsf@HIDDEN> (Wilko Meyer's message of "Sat, 23 Dec
 2023 12:49:07 +0100")
References: <cover.1703028229.git.w@HIDDEN> <87o7eh6xbp.fsf@HIDDEN>
 <874jg9w1ae.fsf@HIDDEN>
X-URL: http://www.fdn.fr/~lcourtes/
X-Revolutionary-Date: Nonidi 19 =?utf-8?Q?Niv=C3=B4se?= an 232 de la
 =?utf-8?Q?R=C3=A9volution=2C?= jour du Marbre
X-PGP-Key-ID: 0x090B11993D9AEBB5
X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc
X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4  0CFB 090B 1199 3D9A EBB5
X-OS: x86_64-pc-linux-gnu
Date: Mon, 08 Jan 2024 17:33:20 +0100
Message-ID: <87v8834wfj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 67917
Cc: 67917 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi!

Wilko Meyer <w@HIDDEN> skribis:

> Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
>
>> I think this doesn=E2=80=99t belong here: right now, =E2=80=98define-pub=
lic=E2=80=99 is added
>> when using =E2=80=98-r=E2=80=99 by =E2=80=98package->definition=E2=80=99=
 in (guix import utils).  This
>> is shared by most importers so we cannot just change it in a single
>> importer.
>
> This currently seems to be inconsistent among importers. crate and go
> always add define-public independent of using '-r', while e.g. egg, gnu,
> elpa etc. do not do that. I'll prepare a v2 of this patch series without
> this change, as the cpan importer should stay at its default behaviour.

Indeed.

> Speaking of '-r', the cpan importer doesn't offer recursively importing
> packages. I could add this functionality to the cpan importer in v2 of
> this patch series, WDYT?

Would be nice!

Ludo=E2=80=99.
Information forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.

Message received at 67917 <at> debbugs.gnu.org:


Received: (at 67917) by debbugs.gnu.org; 23 Dec 2023 12:29:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 23 07:29:09 2023
Received: from localhost ([127.0.0.1]:48812 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rH17t-0002s3-3V
	for submit <at> debbugs.gnu.org; Sat, 23 Dec 2023 07:29:09 -0500
Received: from mail.wmeyer.eu ([95.216.196.112]:55254)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <w@HIDDEN>) id 1rH17q-0002rW-GU
 for 67917 <at> debbugs.gnu.org; Sat, 23 Dec 2023 07:29:07 -0500
References: <cover.1703028229.git.w@HIDDEN> <87o7eh6xbp.fsf@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail;
 t=1703334534; bh=uIW80ZbE7QGd41fSaZmfcHXm4VNh2IwxEUhwIQWxbeA=;
 h=References:From:To:Cc:Subject:Date:In-reply-to;
 b=Grnbswe/mYQwxgek9SiBOn2H1vYMzteRmbrIYZOZHEy3CDRD+RXVyGZPcrfx0+7rS
 yywbR5EBG5SirXAeYwg8ogp3/lUSS1POcEb5c9eilAH2hgOSZRXcD0OWwynTuBctna
 nlHcwY8QoinYyZEJDdLw2hr/tI3zyppytppVkxHs=
From: Wilko Meyer <w@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#67917] [PATCH 0/2] guix import cpan improvements
Date: Sat, 23 Dec 2023 12:49:07 +0100
In-reply-to: <87o7eh6xbp.fsf@HIDDEN>
Message-ID: <874jg9w1ae.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67917
Cc: Wilko Meyer <w@HIDDEN>, 67917 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


Hi Ludo,

Thanks for reviewing this so quickly!

Ludovic Court=C3=A8s <ludo@HIDDEN> writes:

> I think this doesn=E2=80=99t belong here: right now, =E2=80=98define-publ=
ic=E2=80=99 is added
> when using =E2=80=98-r=E2=80=99 by =E2=80=98package->definition=E2=80=99 =
in (guix import utils).  This
> is shared by most importers so we cannot just change it in a single
> importer.

This currently seems to be inconsistent among importers. crate and go
always add define-public independent of using '-r', while e.g. egg, gnu,
elpa etc. do not do that. I'll prepare a v2 of this patch series without
this change, as the cpan importer should stay at its default behaviour.

Speaking of '-r', the cpan importer doesn't offer recursively importing
packages. I could add this functionality to the cpan importer in v2 of
this patch series, WDYT?

> This one I=E2=80=99m not sure, but we should make sure importers are cons=
istent
> as well.

Agreed.

--=20
Kind regards,

Wilko Meyer
w@HIDDEN
Information forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.

Message received at 67917 <at> debbugs.gnu.org:


Received: (at 67917) by debbugs.gnu.org; 23 Dec 2023 10:13:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 23 05:13:45 2023
Received: from localhost ([127.0.0.1]:48641 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rGz0r-0000km-Ea
	for submit <at> debbugs.gnu.org; Sat, 23 Dec 2023 05:13:45 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:50562)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1rGz0p-0000kZ-12
 for 67917 <at> debbugs.gnu.org; Sat, 23 Dec 2023 05:13:43 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1rGz0e-0000Q0-GV; Sat, 23 Dec 2023 05:13:32 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=YdOx+xjipAvAZhJgb22OMI3/3se90SBx6F1FYeoRadk=; b=kJAhDvffBEctKVcqS3zx
 EaTXX4eULVD9VmWu3MaHvS+YJlsWbt+kBwqzs9O8nW903bEH1podmWVcPZxX7f3mzkQYoADGHIIt1
 M0HIr4UC9aWXIeS9s8wG1RUWyhtIk3EnbG3hyMjhn2UZiY3nxl0KWDBx8X2bPJXovjZx0N87spiBc
 qTaFQVoPCfYBFjrdeGq+16STqpPh+HEMni028pEPjb3+VMNJ553wXHarri6g0In7rWNsIqaQY3SkI
 6oCuJ3T6Tg1EkZJoYWcTsFBwCBlmBTMuRyGGma3Xjv6de7IuqHsahYHVpdwLiN0GBgXtOKA3UpLp3
 8ZrG4m2kJDibYQ==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Wilko Meyer <w@HIDDEN>
Subject: Re: [bug#67917] [PATCH 0/2] guix import cpan improvements
In-Reply-To: <cover.1703028229.git.w@HIDDEN> (Wilko Meyer's message of
 "Wed, 20 Dec 2023 00:42:07 +0100")
References: <cover.1703028229.git.w@HIDDEN>
Date: Sat, 23 Dec 2023 11:13:30 +0100
Message-ID: <87o7eh6xbp.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 67917
Cc: 67917 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi,

Wilko Meyer <w@HIDDEN> skribis:

> While packaging perl-devel-repl[0] I noticed, that the 'guix import
> cpan' output:
>
> - doesn't use 'define-public' to declare the package variable

I think this doesn=E2=80=99t belong here: right now, =E2=80=98define-public=
=E2=80=99 is added
when using =E2=80=98-r=E2=80=99 by =E2=80=98package->definition=E2=80=99 in=
 (guix import utils).  This
is shared by most importers so we cannot just change it in a single
importer.

> - doesn't prefix licenses with license: while (if I understand this part
>   of our imports in perl.scm right) we import from the licenses module
>   with a license: prefix:
>
>   #:use-module ((guix licenses) #:prefix license:)

This one I=E2=80=99m not sure, but we should make sure importers are consis=
tent
as well.

WDYT?

Ludo=E2=80=99.
Information forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.

Message received at 67917 <at> debbugs.gnu.org:


Received: (at 67917) by debbugs.gnu.org; 19 Dec 2023 23:46:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 19 18:46:23 2023
Received: from localhost ([127.0.0.1]:37958 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rFjn4-0004Eo-VH
	for submit <at> 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 <w@HIDDEN>) id 1rFjn1-000495-FT
 for 67917 <at> debbugs.gnu.org; Tue, 19 Dec 2023 18:46:20 -0500
From: Wilko Meyer <w@HIDDEN>
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=
To: 67917 <at> debbugs.gnu.org
Subject: [PATCH 1/2] import: cpan: Add 'license:' prefix to license matching.
Date: Wed, 20 Dec 2023 00:45:23 +0100
Message-ID: <eca52b4c2c0d744d8c743ab9429fcc5f5af46dc0.1703028229.git.w@HIDDEN>
In-Reply-To: <cover.1703028229.git.w@HIDDEN>
References: <cover.1703028229.git.w@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67917
Cc: Wilko Meyer <w@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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 <me@HIDDEN>
 ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2023 Wilko Meyer <w@HIDDEN>
 ;;;
 ;;; 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)))
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.

Message received at 67917 <at> debbugs.gnu.org:


Received: (at 67917) by debbugs.gnu.org; 19 Dec 2023 23:46:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 19 18:46:23 2023
Received: from localhost ([127.0.0.1]:37956 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rFjn4-0004Em-IR
	for submit <at> 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 <w@HIDDEN>) id 1rFjn1-00049W-VQ
 for 67917 <at> debbugs.gnu.org; Tue, 19 Dec 2023 18:46:20 -0500
From: Wilko Meyer <w@HIDDEN>
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=
To: 67917 <at> debbugs.gnu.org
Subject: [PATCH 2/2] import: cpan: Add 'define-public' to package definition.
Date: Wed, 20 Dec 2023 00:45:24 +0100
Message-ID: <e2c91c0940a08d0741c9d327e8ceb850a36fcb88.1703028229.git.w@HIDDEN>
In-Reply-To: <cover.1703028229.git.w@HIDDEN>
References: <cover.1703028229.git.w@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67917
Cc: Wilko Meyer <w@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 23:43:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 19 18:43:04 2023
Received: from localhost ([127.0.0.1]:37950 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rFjjr-0001XF-VN
	for submit <at> debbugs.gnu.org; Tue, 19 Dec 2023 18:43:04 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58732)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <w@HIDDEN>) id 1rFjjp-0001Wi-5z
 for submit <at> debbugs.gnu.org; Tue, 19 Dec 2023 18:43: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 <w@HIDDEN>) id 1rFjjg-0002C8-GE
 for guix-patches@HIDDEN; Tue, 19 Dec 2023 18:42:52 -0500
Received: from mail.wmeyer.eu ([95.216.196.112])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <w@HIDDEN>) id 1rFjje-0002N9-DG
 for guix-patches@HIDDEN; Tue, 19 Dec 2023 18:42:52 -0500
From: Wilko Meyer <w@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail;
 t=1703029366; bh=+tSd41fMN2n884rJ2msfQhJxFjCcWQ8oZBRohRFUmbA=;
 h=From:To:Cc:Subject:Date;
 b=cn1BmgcDAHRMh7oqELPL8Uct/A3dOGlkFumEg2IfotDi6TSSF1a/OhmpLaTMxXFpG
 DyyklGH8IlRw7yQKA8+AHxbcVuwJkjwLzBvA9JjyYtLDu5iqS+vGFunFobTKUh+eoq
 Sw9TRehnKMsOhM5JQ5/ik5TMoPQLGpSzSBqY2lzM=
To: guix-patches@HIDDEN
Subject: [PATCH 0/2] guix import cpan improvements
Date: Wed, 20 Dec 2023 00:42:07 +0100
Message-ID: <cover.1703028229.git.w@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=95.216.196.112; envelope-from=w@HIDDEN;
 helo=mail.wmeyer.eu
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Wilko Meyer <w@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

Hi Guix,

While packaging perl-devel-repl[0] I noticed, that the 'guix import
cpan' output:

- doesn't use 'define-public' to declare the package variable
- doesn't prefix licenses with license: while (if I understand this part
  of our imports in perl.scm right) we import from the licenses module
  with a license: prefix:

  #:use-module ((guix licenses) #:prefix license:)

so I added the prefix where applicable and took care of adding
(define-public package-name ... ) to the sexp.

the diffstat is pretty huge compared to the actual changes as I had to
reindend parts of the package sexp. Let me know, if there's anything I
can improve/that requires improvement in this patch series.

Kind regards,

Wilko Meyer

[0]: https://issues.guix.gnu.org/67879

Wilko Meyer (2):
  import: cpan: Add 'license:' prefix to license matching.
  import: cpan: Add 'define-public' to package definition.

 guix/import/cpan.scm | 76 +++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 37 deletions(-)


base-commit: d987b75618a62c95c030e7ca53e0972e700c4f06
prerequisite-patch-id: 3eb8883867495d9f3b48dc56486e12784f94e935
-- 
2.41.0
Acknowledgement sent to Wilko Meyer <w@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#67917; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sat, 20 Jan 2024 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.