public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

licenses: Mark unclear GPL licenses explicitly deprecated

Browse Source 
We recently switched to more explicit GPL license names in line
with the SPDX change and GNU Foundation recommendations:
https://www.gnu.org/licenses/identify-licenses-clearly.html

This followed up older change to use the recommended SPDX ID
18a5e8c36b
but using the `-only` variant for these deprecated licenses too
makes it harder to check for them automatically.

Let’s switch to the appropriate SPDX ID again.
This commit is contained in:
Jan Tojnar 2020-12-22 19:25:33 +01:00
parent 9232d4168e
commit 9d5bd8b835
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/licenses.nix
View File

@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
}; };
} // { } // {
# TODO: remove legacy aliases # TODO: remove legacy aliases
agpl3 = lib.licenses.agpl3Only; agpl3 = spdx {
fdl11 = lib.licenses.fdl11Only; spdxId = "AGPL-3.0";
fdl12 = lib.licenses.fdl12Only; fullName = "GNU Affero General Public License v3.0";
fdl13 = lib.licenses.fdl13Only; deprecated = true;
gpl1 = lib.licenses.gpl1Only; };
gpl2 = lib.licenses.gpl2Only; fdl11 = spdx {
gpl3 = lib.licenses.gpl3Only; spdxId = "GFDL-1.1";
lgpl2 = lib.licenses.lgpl2Only; fullName = "GNU Free Documentation License v1.1";
lgpl21 = lib.licenses.lgpl21Only; deprecated = true;
lgpl3 = lib.licenses.lgpl3Only; };
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;
};
} }