all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Lars-Dominik Braun <ldb@leibniz-psychology.org>
To: 39895@debbugs.gnu.org
Subject: [bug#39895] [PATCH] import: pypi: Add more licenses
Date: Wed, 4 Mar 2020 09:53:26 +0100	[thread overview]
Message-ID: <20200304085326.GA17022@zpidnp36> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 150 bytes --]

Hi,

the following patch adds a few more string to license conversions for the pypi
importer that I’ve encountered “in the wild”.

Lars


[-- Attachment #1.2: 0001-import-pypi-Add-more-licenses.patch --]
[-- Type: text/x-diff, Size: 1248 bytes --]

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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

             reply	other threads:[~2020-03-04  8:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-04  8:53 Lars-Dominik Braun [this message]
2020-03-04 19:57 ` bug#39895: [PATCH] import: pypi: Add more licenses Leo Famulari

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=20200304085326.GA17022@zpidnp36 \
    --to=ldb@leibniz-psychology.org \
    --cc=39895@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.