diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-01 23:49:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 23:49:44 +0100 |
commit | 2a5b2df11d245c119576e9e6140511336368de71 (patch) | |
tree | 692ab73b7081ba4fb8be76fdc0c0a84eeace80c4 /lib | |
parent | 7cd1e0bdd13884865bed01dc15b0220a6d8baa2a (diff) | |
parent | 9d5bd8b835ddd62db5857b86fcda5af00c237bfa (diff) |
Merge pull request #107417 from jtojnar/deprecate-unclear-gpl-licenses
licenses: Mark unclear GPL licenses explicitly deprecated
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 60 |
1 files changed, 50 insertions, 10 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 64f10a7f25277..ebeb1377339b7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; } // { # TODO: remove legacy aliases - agpl3 = lib.licenses.agpl3Only; - fdl11 = lib.licenses.fdl11Only; - fdl12 = lib.licenses.fdl12Only; - fdl13 = lib.licenses.fdl13Only; - gpl1 = lib.licenses.gpl1Only; - gpl2 = lib.licenses.gpl2Only; - gpl3 = lib.licenses.gpl3Only; - lgpl2 = lib.licenses.lgpl2Only; - lgpl21 = lib.licenses.lgpl21Only; - lgpl3 = lib.licenses.lgpl3Only; + agpl3 = spdx { + spdxId = "AGPL-3.0"; + fullName = "GNU Affero General Public License v3.0"; + deprecated = true; + }; + fdl11 = spdx { + spdxId = "GFDL-1.1"; + fullName = "GNU Free Documentation License v1.1"; + deprecated = true; + }; + fdl12 = spdx { + spdxId = "GFDL-1.2"; + fullName = "GNU Free Documentation License v1.2"; + deprecated = true; + }; + fdl13 = spdx { + spdxId = "GFDL-1.3"; + fullName = "GNU Free Documentation License v1.3"; + deprecated = true; + }; + gpl1 = spdx { + spdxId = "GPL-1.0"; + fullName = "GNU General Public License v1.0"; + deprecated = true; + }; + gpl2 = spdx { + spdxId = "GPL-2.0"; + fullName = "GNU General Public License v2.0"; + deprecated = true; + }; + gpl3 = spdx { + spdxId = "GPL-3.0"; + fullName = "GNU General Public License v3.0"; + deprecated = true; + }; + lgpl2 = spdx { + spdxId = "LGPL-2.0"; + fullName = "GNU Library General Public License v2"; + deprecated = true; + }; + lgpl21 = spdx { + spdxId = "LGPL-2.1"; + fullName = "GNU Lesser General Public License v2.1"; + deprecated = true; + }; + lgpl3 = spdx { + spdxId = "LGPL-3.0"; + fullName = "GNU Lesser General Public License v3.0"; + deprecated = true; + }; } |