Message ID | cover.1703028229.git.w@wmeyer.eu |
---|---|
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 98A7527BBE2; Tue, 19 Dec 2023 23:44:23 +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 F015127BBE2 for <patchwork@mira.cbaines.net>; Tue, 19 Dec 2023 23:44:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1rFjkn-0002HJ-39; Tue, 19 Dec 2023 18:44: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 <Debian-debbugs@debbugs.gnu.org>) id 1rFjkl-0002HA-Ej for guix-patches@gnu.org; Tue, 19 Dec 2023 18:43: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 <Debian-debbugs@debbugs.gnu.org>) id 1rFjkl-0002nJ-6a for guix-patches@gnu.org; Tue, 19 Dec 2023 18:43:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rFjkn-0001Yn-RS for guix-patches@gnu.org; Tue, 19 Dec 2023 18:44:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67917] [PATCH 0/2] guix import cpan improvements Resent-From: Wilko Meyer <w@wmeyer.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 23:44:01 +0000 Resent-Message-ID: <handler.67917.B.17030293845910@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67917 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67917@debbugs.gnu.org Cc: Wilko Meyer <w@wmeyer.eu> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17030293845910 (code B ref -1); Tue, 19 Dec 2023 23:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 23:43:04 +0000 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@debbugs.gnu.org>) id 1rFjjr-0001XF-VN for submit@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@wmeyer.eu>) id 1rFjjp-0001Wi-5z for submit@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@wmeyer.eu>) id 1rFjjg-0002C8-GE for guix-patches@gnu.org; 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@wmeyer.eu>) id 1rFjje-0002N9-DG for guix-patches@gnu.org; Tue, 19 Dec 2023 18:42:52 -0500 From: Wilko Meyer <w@wmeyer.eu> 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= Date: Wed, 20 Dec 2023 00:42:07 +0100 Message-ID: <cover.1703028229.git.w@wmeyer.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=95.216.196.112; envelope-from=w@wmeyer.eu; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
guix import cpan improvements
|
|
Message
Wilko Meyer
Dec. 19, 2023, 11:42 p.m. UTC
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
Comments
Hi, Wilko Meyer <w@wmeyer.eu> 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’t belong here: right now, ‘define-public’ is added when using ‘-r’ by ‘package->definition’ 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’m not sure, but we should make sure importers are consistent as well. WDYT? Ludo’.
Hi Ludo, Thanks for reviewing this so quickly! Ludovic Courtès <ludo@gnu.org> writes: > I think this doesn’t belong here: right now, ‘define-public’ is added > when using ‘-r’ by ‘package->definition’ 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’m not sure, but we should make sure importers are consistent > as well. Agreed.
Hi! Wilko Meyer <w@wmeyer.eu> skribis: > Ludovic Courtès <ludo@gnu.org> writes: > >> I think this doesn’t belong here: right now, ‘define-public’ is added >> when using ‘-r’ by ‘package->definition’ 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’.