diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-06 00:17:50 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-06 00:17:50 +0100 |
| commit | b6f946f039afad6cbc7027d52685072f7fbb8d35 (patch) | |
| tree | 9dc33d1ef9d307f1e3ed8a825902ff69bbe288f9 /guix/import/pypi.scm | |
| parent | e32aea5472007507e62933b27a4db9a50810e5dc (diff) | |
| parent | bc8b2ffdac3f55414629ace5b1a0db32e9656c0a (diff) | |
| download | patches-b6f946f039afad6cbc7027d52685072f7fbb8d35.tar patches-b6f946f039afad6cbc7027d52685072f7fbb8d35.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/import/pypi.scm')
| -rw-r--r-- | guix/import/pypi.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6897f42be3..10450155a0 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; ;;; 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) |