branch master updated: import: pypi: Add more licenses

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c8abbe1  import: pypi: Add more licenses
c8abbe1 is described below

commit c8abbe1468bc69b5f2b481aa11da62bc59168b26
Author: Lars-Dominik Braun <address@hidden>
AuthorDate: Wed Mar 4 09:42:17 2020 +0100

    import: pypi: Add more licenses
    
    * guix/import/pypi.scm (string->license): Add the BSD 2-clause and MPL 2.0
    licenses, and add more strings for BSD 3-clause and Expat license.
    
    Signed-off-by: Leo Famulari <address@hidden>
---
 guix/import/pypi.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6897f42..1045015 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
 ;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
+;;; Copyright © 2020 Lars-Dominik Braun <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -439,10 +440,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)