| Message ID | 20200304085326.GA17022@zpidnp36 |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#39895] import: pypi: Add more licenses | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
On Wed, Mar 04, 2020 at 09:53:26AM +0100, Lars-Dominik Braun wrote: > Hi, > > the following patch adds a few more string to license conversions for the pypi > importer that I’ve encountered “in the wild”. > > Lars > > From 16fce0c5e7c67b08b910740310b2e86e203bc261 Mon Sep 17 00:00:00 2001 > From: Lars-Dominik Braun <ldb@leibniz-psychology.org> > 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 Thanks! I rewrote the commit message, added a copyright line for you, and pushed as c8abbe1468bc69b5f2b481aa11da62bc59168b26
From 16fce0c5e7c67b08b910740310b2e86e203bc261 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun <ldb@leibniz-psychology.org> 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))) (define (pypi-package? package) -- 2.20.1