Subject: [PATCH 1/2] import: cpan: Add 'license:' prefix to license matching.

From: Wilko Meyer <[email-masked]>
Date: Wed, 20 Dec 2023 00:45:23 +0100

* 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 <[email-masked]>
 ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2022 Hartmut Goebel <[email-masked]>
+;;; Copyright © 2023 Wilko Meyer <[email-masked]>
 ;;;
 ;;; 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