[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/22: import/utils: Recognise GPL-3.0-or-later and friends.
From: |
guix-commits |
Subject: |
05/22: import/utils: Recognise GPL-3.0-or-later and friends. |
Date: |
Fri, 20 Aug 2021 07:42:59 -0400 (EDT) |
leoprikler pushed a commit to branch master
in repository guix.
commit d08455934c937fdd781e51da9a3f211bbdd8192d
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 10 17:07:19 2021 +0200
import/utils: Recognise GPL-3.0-or-later and friends.
* guix/import/utils.scm (spdx-string->license): Recognise
GPL-N-only and GPL-N-or-later. Likewise for LGPL and AGPL.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
---
guix/import/utils.scm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index d817318..d1b8076 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -133,8 +133,14 @@ of the string VERSION is replaced by the symbol 'version."
;; Please update guix/licenses.scm when modifying
;; this list to avoid mismatches.
(match str
+ ;; "GPL-N+" has been deprecated in favour of "GPL-N-or-later".
+ ;; "GPL-N" has been deprecated in favour of "GPL-N-only"
+ ;; or "GPL-N-or-later" as appropriate. Likewise for LGPL
+ ;; and AGPL
("AGPL-1.0" 'license:agpl1)
("AGPL-3.0" 'license:agpl3)
+ ("AGPL-3.0-only" 'license:agpl3)
+ ("AGPL-3.0-or-later" 'license:agpl3+)
("Apache-1.1" 'license:asl1.1)
("Apache-2.0" 'license:asl2.0)
("BSL-1.0" 'license:boost1.0)
@@ -161,11 +167,17 @@ of the string VERSION is replaced by the symbol 'version."
("GFDL-1.3" 'license:fdl1.3+)
("Giftware" 'license:giftware)
("GPL-1.0" 'license:gpl1)
+ ("GPL-1.0-only" 'license:gpl1)
("GPL-1.0+" 'license:gpl1+)
+ ("GPL-1.0-or-later" 'license:gpl1+)
("GPL-2.0" 'license:gpl2)
+ ("GPL-2.0-only" 'license:gpl2)
("GPL-2.0+" 'license:gpl2+)
+ ("GPL-2.0-or-later" 'license:gpl2+)
("GPL-3.0" 'license:gpl3)
+ ("GPL-3.0-only" 'license:gpl3)
("GPL-3.0+" 'license:gpl3+)
+ ("GPL-3.0-or-later" 'license:gpl3+)
("ISC" 'license:isc)
("IJG" 'license:ijg)
("Imlib2" 'license:imlib2)
@@ -173,11 +185,17 @@ of the string VERSION is replaced by the symbol 'version."
("IPL-1.0" 'license:ibmpl1.0)
("LAL-1.3" 'license:lal1.3)
("LGPL-2.0" 'license:lgpl2.0)
+ ("LGPL-2.0-only" 'license:lgpl2.0)
("LGPL-2.0+" 'license:lgpl2.0+)
+ ("LGPL-2.0-or-later" 'license:lgpl2.0+)
("LGPL-2.1" 'license:lgpl2.1)
+ ("LGPL-2.1-only" 'license:lgpl2.1)
("LGPL-2.1+" 'license:lgpl2.1+)
+ ("LGPL-2.1-or-later" 'license:lgpl2.1+)
("LGPL-3.0" 'license:lgpl3)
+ ("LGPL-3.0-only" 'license:lgpl3)
("LGPL-3.0+" 'license:lgpl3+)
+ ("LGPL-3.0-or-later" 'license:lgpl3+)
("MPL-1.0" 'license:mpl1.0)
("MPL-1.1" 'license:mpl1.1)
("MPL-2.0" 'license:mpl2.0)
- branch master updated (2795231 -> b7d1698), guix-commits, 2021/08/20
- 03/22: gnu: minetest: New package module., guix-commits, 2021/08/20
- 02/22: gnu: minetest: Search for mods in MINETEST_MOD_PATH., guix-commits, 2021/08/20
- 01/22: gnu: minetest: Respect --without-tests., guix-commits, 2021/08/20
- 07/22: gnu: Add minetest-mesecons., guix-commits, 2021/08/20
- 05/22: import/utils: Recognise GPL-3.0-or-later and friends.,
guix-commits <=
- 06/22: guix: Add ContentDB importer., guix-commits, 2021/08/20
- 08/22: gnu: Add minetest-basic-materials., guix-commits, 2021/08/20
- 09/22: gnu: Add minetest-unifieddyes., guix-commits, 2021/08/20
- 04/22: build-system: Add 'minetest-mod-build-system'., guix-commits, 2021/08/20
- 19/22: gnu: Add minetest-mobs-animal., guix-commits, 2021/08/20
- 20/22: gnu: Add minetest-homedecor-modpack., guix-commits, 2021/08/20
- 17/22: gnu: Add minetest-worldedit., guix-commits, 2021/08/20
- 21/22: gnu: minetest-mineclone: move to minetest.scm., guix-commits, 2021/08/20
- 11/22: gnu: Add minetest-coloredwood., guix-commits, 2021/08/20
- 12/22: gnu: Add minetest-ethereal., guix-commits, 2021/08/20