From d8ead6d05e5c0eb962f8b5e1bcdd2c7a1a0dfa5d Mon Sep 17 00:00:00 2001 From: daroche Date: Mon, 3 Aug 2026 18:33:28 +0200 Subject: [PATCH 1/4] lib.licenses: add FSFAP --- lib/licenses/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 7e2f779cc49b..facab88c2908 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -925,6 +925,11 @@ lib.mapAttrs mkLicense ( redistributable = true; }; + fsfap = { + spdxId = "FSFAP"; + fullName = "FSF All Permissive License"; + }; + hl3 = { fullName = "Hippocratic License v3.0"; url = "https://firstdonoharm.dev/version/3/0/core.txt"; From 993de5d254be92e75eff2e904877c149e5402713 Mon Sep 17 00:00:00 2001 From: daroche Date: Mon, 3 Aug 2026 18:42:23 +0200 Subject: [PATCH 2/4] karp: fix license --- pkgs/by-name/ka/karp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/karp/package.nix b/pkgs/by-name/ka/karp/package.nix index 1a3af7a0087f..aa14648060a0 100644 --- a/pkgs/by-name/ka/karp/package.nix +++ b/pkgs/by-name/ka/karp/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { bsd3 cc-by-sa-40 cc0 - # FSFAP + fsfap gpl2Only gpl3Only lgpl2Plus From 6c0f6c030e347015e8004f60a36db12b727b844e Mon Sep 17 00:00:00 2001 From: daroche Date: Mon, 3 Aug 2026 18:42:53 +0200 Subject: [PATCH 3/4] klevernotes: fix license --- pkgs/kde/misc/klevernotes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 51c2718ed61b..178e549fb347 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -27,7 +27,7 @@ mkKdeDerivation rec { bsd3 cc-by-sa-40 cc0 - # TODO: add FSFAP license + fsfap gpl2Plus gpl3Only gpl3Plus From cd895fa9822fe4bdfe1f7651c01cbea098397485 Mon Sep 17 00:00:00 2001 From: daroche Date: Tue, 4 Aug 2026 09:10:43 +0200 Subject: [PATCH 4/4] mk-kde-derivation: reference lib.licenses.fsfap --- pkgs/kde/lib/mk-kde-derivation.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index a43a4548a391..1c53a4a45af3 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -35,11 +35,6 @@ let # https://invent.kde.org/kdevelop/kdevelop/-/blob/master/LICENSES/LicenseRef-MIT-KDevelop-Ideal.txt "LicenseRef-MIT-KDevelop-Ideal" = lib.licenses.mit; - "FSFAP" = { - spdxId = "FSFAP"; - fullName = "FSF All Permissive License"; - }; - "FSFULLR" = { spdxId = "FSFULLR"; fullName = "FSF Unlimited License (with License Retention)";