From: Wilko Meyer <w@wmeyer.eu>
To: 67917@debbugs.gnu.org
Cc: Wilko Meyer <w@wmeyer.eu>
Subject: [bug#67917] [PATCH 1/2] import: cpan: Add 'license:' prefix to license matching.
Date: Wed, 20 Dec 2023 00:45:23 +0100 [thread overview]
Message-ID: <eca52b4c2c0d744d8c743ab9429fcc5f5af46dc0.1703028229.git.w@wmeyer.eu> (raw)
In-Reply-To: <cover.1703028229.git.w@wmeyer.eu>
* 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@tobias.gr>
;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
;;;
;;; 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
next prev parent reply other threads:[~2023-12-19 23:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 23:42 [bug#67917] [PATCH 0/2] guix import cpan improvements Wilko Meyer
2023-12-19 23:45 ` Wilko Meyer [this message]
2023-12-19 23:45 ` [bug#67917] [PATCH 2/2] import: cpan: Add 'define-public' to package definition Wilko Meyer
2023-12-23 10:13 ` [bug#67917] [PATCH 0/2] guix import cpan improvements Ludovic Courtès
2023-12-23 11:49 ` Wilko Meyer
2024-01-08 16:33 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eca52b4c2c0d744d8c743ab9429fcc5f5af46dc0.1703028229.git.w@wmeyer.eu \
--to=w@wmeyer.eu \
--cc=67917@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.