git.iko.soy/typeable/nixpkgs
on master help sign in
licenses: Mark unclear GPL licenses explicitly deprecated

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 https://github.com/NixOS/nixpkgs/commit/18a5e8c36b2681f5fc4aecd79f4cc723365d2d94 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.

commit9d5bd8b835ddd62db5857b86fcda5af00c237bfa authorJan Tojnar <jtojnar@gmail.com> dateTue 22 Dec 2020, 19:25 (6 years ago) parent9232d41
1 file changed+50−10
lib/licenses.nix+50−10
lib/licenses.nix+50−10
@@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
817817 };
818818} // {
819819 # TODO: remove legacy aliases
820− agpl3 = lib.licenses.agpl3Only;
821− fdl11 = lib.licenses.fdl11Only;
822− fdl12 = lib.licenses.fdl12Only;
823− fdl13 = lib.licenses.fdl13Only;
824− gpl1 = lib.licenses.gpl1Only;
825− gpl2 = lib.licenses.gpl2Only;
826− gpl3 = lib.licenses.gpl3Only;
827− lgpl2 = lib.licenses.lgpl2Only;
828− lgpl21 = lib.licenses.lgpl21Only;
829− lgpl3 = lib.licenses.lgpl3Only;
820+ agpl3 = spdx {
821+ spdxId = "AGPL-3.0";
822+ fullName = "GNU Affero General Public License v3.0";
823+ deprecated = true;
824+ };
825+ fdl11 = spdx {
826+ spdxId = "GFDL-1.1";
827+ fullName = "GNU Free Documentation License v1.1";
828+ deprecated = true;
829+ };
830+ fdl12 = spdx {
831+ spdxId = "GFDL-1.2";
832+ fullName = "GNU Free Documentation License v1.2";
833+ deprecated = true;
834+ };
835+ fdl13 = spdx {
836+ spdxId = "GFDL-1.3";
837+ fullName = "GNU Free Documentation License v1.3";
838+ deprecated = true;
839+ };
840+ gpl1 = spdx {
841+ spdxId = "GPL-1.0";
842+ fullName = "GNU General Public License v1.0";
843+ deprecated = true;
844+ };
845+ gpl2 = spdx {
846+ spdxId = "GPL-2.0";
847+ fullName = "GNU General Public License v2.0";
848+ deprecated = true;
849+ };
850+ gpl3 = spdx {
851+ spdxId = "GPL-3.0";
852+ fullName = "GNU General Public License v3.0";
853+ deprecated = true;
854+ };
855+ lgpl2 = spdx {
856+ spdxId = "LGPL-2.0";
857+ fullName = "GNU Library General Public License v2";
858+ deprecated = true;
859+ };
860+ lgpl21 = spdx {
861+ spdxId = "LGPL-2.1";
862+ fullName = "GNU Lesser General Public License v2.1";
863+ deprecated = true;
864+ };
865+ lgpl3 = spdx {
866+ spdxId = "LGPL-3.0";
867+ fullName = "GNU Lesser General Public License v3.0";
868+ deprecated = true;
869+ };
830870}