From edd17409366c6044668aa6ea663a1c6c6eee615f Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 12 May 2026 11:44:04 +0200 Subject: [PATCH] lib.licenses: add new `spdxIds` These licenses gained a `spdxId` since they were added to nixpkgs --- lib/licenses/licenses.nix | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 87b841d8bd7a..1fa17d1bc312 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -204,8 +204,8 @@ lib.mapAttrs mkLicense ( }; bola11 = { - url = "https://blitiri.com.ar/p/bola/"; - fullName = "Buena Onda License Agreement 1.1"; + spdxId = "BOLA-1.1"; + fullName = "Buena Onda License Agreement v1.1"; }; boost = { @@ -326,8 +326,8 @@ lib.mapAttrs mkLicense ( }; capec = { - fullName = "Common Attack Pattern Enumeration and Classification"; - url = "https://capec.mitre.org/about/termsofuse.html"; + fullName = "Common Attack Pattern Enumeration and Classification License"; + spdxId = "CAPEC-tou"; }; clArtistic = { @@ -760,14 +760,7 @@ lib.mapAttrs mkLicense ( hpndSellVariantSafetyClause = { fullName = "HPND - sell variant with safety critical systems clause"; - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo/-/blob/68a5b6d98ae34749cca889f4373b4043d00bfe6a/src/voodoo_dga.c#L12-33"; - # TODO: if the license gets accepted to spdx then - # add spdxId - # else - # remove license - # && replace reference with whatever this license is supposed to be then - # https://github.com/spdx/license-list-XML/issues/2922 - # spdxId = "HPND-sell-variant-safety-clause"; + spdxId = "HPND-sell-variant-critical-systems"; }; hpndDec = { @@ -1251,8 +1244,8 @@ lib.mapAttrs mkLicense ( }; paratype = { - fullName = "ParaType Free Font Licensing Agreement"; - url = "https://web.archive.org/web/20161209023955/http://www.paratype.ru/public/pt_openlicense_eng.asp"; + spdxId = "ParaType-Free-Font-1.3"; + fullName = "ParaType Free Font Licensing Agreement v1.3"; }; parity70 = { @@ -1331,7 +1324,8 @@ lib.mapAttrs mkLicense ( # Gentoo seems to treat it as a license: # https://gitweb.gentoo.org/repo/gentoo.git/tree/licenses/SGMLUG?id=7d999af4a47bf55e53e54713d98d145f935935c1 sgmlug = { - fullName = "SGML UG SGML Parser Materials license"; + spdxId = "SGMLUG-PM"; + fullName = "SGMLUG Parser Materials License"; }; sissl11 = { @@ -1428,11 +1422,8 @@ lib.mapAttrs mkLicense ( }; tekHvcLicense = { + spdxId = "TekHVC"; fullName = "TekHVC License"; - url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/7f8305c779ac6948d7261764f5ffb8ae9aa975b1/COPYING#L138-171"; - # TODO: add spdxId when it gets accepted to spdx - # https://tools.spdx.org/app/license_requests/458 - # https://github.com/spdx/license-list-XML/issues/2757 }; torque11 = { @@ -1453,8 +1444,8 @@ lib.mapAttrs mkLicense ( }; tost = { + spdxId = "Pixar"; fullName = "Tomorrow Open Source Technology License 1.0"; - url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"; }; ubdlException = {