From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:46018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Pn1-0001a0-8J for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Pn0-0004sG-71 for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Pn0-0004re-3U for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9Pn0-0007FV-0g for guix-patches@gnu.org; Wed, 04 Mar 2020 03:54:02 -0500 Subject: [bug#39895] [PATCH] import: pypi: Add more licenses Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:45605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9PmT-0000zL-Jg for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9PmS-0003tq-Gf for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:29 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9PmR-0003qx-SU for guix-patches@gnu.org; Wed, 04 Mar 2020 03:53:28 -0500 Received: by mail-wm1-x336.google.com with SMTP id i10so4208871wmd.1 for ; Wed, 04 Mar 2020 00:53:27 -0800 (PST) Received: from localhost (zpidlx9.uni-trier.de. [136.199.85.49]) by smtp.gmail.com with ESMTPSA id c26sm3003797wmb.8.2020.03.04.00.53.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 00:53:25 -0800 (PST) Date: Wed, 4 Mar 2020 09:53:26 +0100 From: Lars-Dominik Braun Message-ID: <20200304085326.GA17022@zpidnp36> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dc+cDN39EJAMEtIO" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39895@debbugs.gnu.org --dc+cDN39EJAMEtIO Content-Type: multipart/mixed; boundary="n8g4imXOkfNTN/H1" Content-Disposition: inline --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, the following patch adds a few more string to license conversions for the p= ypi importer that I=E2=80=99ve encountered =E2=80=9Cin the wild=E2=80=9D. Lars --n8g4imXOkfNTN/H1 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-import-pypi-Add-more-licenses.patch" Content-Transfer-Encoding: quoted-printable =46rom 16fce0c5e7c67b08b910740310b2e86e203bc261 Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Wed, 4 Mar 2020 09:42:17 +0100 Subject: [PATCH] import: pypi: Add more licenses * guix/import/pypi.scm (string->license): Add BSD 2-clause and MPL 2.0, add more strings for BSD 3-clause and MIT license --- guix/import/pypi.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6897f42be3..5a1f570515 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -439,10 +439,12 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION= , and LICENSE." (match str ("GNU LGPL" license:lgpl2.0) ("GPL" license:gpl3) - ((or "BSD" "BSD License") license:bsd-3) - ((or "MIT" "MIT license" "Expat license") license:expat) + ((or "BSD" "BSD-3" "BSD License") license:bsd-3) + ("BSD-2-Clause" license:bsd-2) + ((or "MIT" "MIT license" "MIT License" "Expat license") license:expat) ("Public domain" license:public-domain) ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0) + ("MPL 2.0" license:mpl2.0) (_ #f))) =20 (define (pypi-package? package) --=20 2.20.1 --n8g4imXOkfNTN/H1-- --dc+cDN39EJAMEtIO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl5fbIMACgkQQhN3ARo3 hEZqPAv/eJzuYeK3XCHyIhYjxcaMWaDp7hXOXHE7C/INzi8YvJeWT1IWeCbSXc5B OvT4VMTXiUkm7lDbXckJWUYcIQgoSlLyfvdJi62rsB1rO8vcGOz+oVKzFs4Vddhg GJvvVLXmEF4t86RG2ExoYD+Fz1TPWrTkfBHpn6barD/azzm5Trk8xDHDzW60XsU6 vopdk0Ijn3cBRf8pO8lXtV6C4l6dM8lUWSQqS8TrcsoiXw2Uk6PLdB3ybfOo//j+ WfLycnvZr4wD0K/mXrPL5th4+J6xshkp8lLeMV5bpP0w2bN6AUBCmJnXAqiM+joZ lGVNhRfzqmthAFbmBHUgKlZIPLNVg07OkSyPYJ3qtMQVdU4B1elspeUUqqOzbvJZ kyfKyyO7bbm2PQB84foIy+Uu/7tO2dZsn2Qf0+lz63b6oMiGFDbROTclACg6lp33 nItqxfsLbPYvaUTOfTBFlu9TAV2Gr9ZhDW/NJl2ovCsXZdTJn9MnoY5Hl3t6eUjl 3RxDIZ56 =CZZf -----END PGP SIGNATURE----- --dc+cDN39EJAMEtIO--