From e19ad622ae6ba4c7dbd288042e49c4f3e7c20807 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Aug 2025 13:53:25 +0200 Subject: [PATCH] lib.licenses: replace gpl2UBDLPlus license with ubdlException --- lib/licenses.nix | 10 +++++----- pkgs/by-name/ip/ipxe/package.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 72eb6d228bd0..deb8dadfedfc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -650,11 +650,6 @@ lib.mapAttrs mkLicense ( fullName = "GNU General Public License v2.0 only"; }; - gpl2UBDLPlus = { - fullName = "GNU General Public License v3.0 or later (with UBDL exception)"; - url = "https://spdx.org/licenses/UBDL-exception.html"; - }; - gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; url = "https://www.mysql.com/about/legal/licensing/foss-exception"; @@ -1326,6 +1321,11 @@ lib.mapAttrs mkLicense ( url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"; }; + ubdlException = { + spdxId = "UBDL-exception"; + fullName = "Unmodified Binary Distribution exception"; + }; + ucd = { fullName = "Unicode Character Database License"; url = "https://fedoraproject.org/wiki/Licensing:UCD"; diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index f8e3876f45e1..43aeb7b4077f 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { bsd2 bsd3 gpl2Only - gpl2UBDLPlus + ubdlException isc mit mpl11