From 4adea636ddf412f939236f72f88e578eb1d0f1c5 Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 12:47:31 +0200 Subject: [PATCH 1/6] humblebundle-downloader: simplify license No need to use a list for a singular license. --- pkgs/by-name/hu/humblebundle-downloader/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hu/humblebundle-downloader/package.nix b/pkgs/by-name/hu/humblebundle-downloader/package.nix index 4cc84a78f0af..7be31c6e5151 100644 --- a/pkgs/by-name/hu/humblebundle-downloader/package.nix +++ b/pkgs/by-name/hu/humblebundle-downloader/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { mainProgram = "hbd"; homepage = "https://github.com/xtream1101/humblebundle-downloader"; changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ jopejoe1 ]; }; }) From 4f849a074264aa9705e5a39a33ffccf757b24573 Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 12:48:56 +0200 Subject: [PATCH 2/6] itch-dl: simplify license No need to use a list for a singular license. --- pkgs/by-name/it/itch-dl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix index 73c1c8780216..bb217dc02101 100644 --- a/pkgs/by-name/it/itch-dl/package.nix +++ b/pkgs/by-name/it/itch-dl/package.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: { mainProgram = "itch-dl"; homepage = "https://github.com/DragoonAethis/itch-dl"; changelog = "https://github.com/DragoonAethis/itch-dl/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ jopejoe1 ]; }; }) From e44d4be358d038fae028322c8a46c18e7735c5e6 Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 12:51:11 +0200 Subject: [PATCH 3/6] pocketsphinx: make use of compound licenses --- pkgs/by-name/po/pocketsphinx/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix index 1fbb27762623..2f5e7f162956 100644 --- a/pkgs/by-name/po/pocketsphinx/package.nix +++ b/pkgs/by-name/po/pocketsphinx/package.nix @@ -66,11 +66,13 @@ stdenv.mkDerivation (finalAttrs: { description = "Small speech recognizer"; homepage = "https://github.com/cmusphinx/pocketsphinx"; changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS"; - license = with lib.licenses; [ - bsd2 - bsd3 - mit - ]; + license = + with lib.licenses; + AND [ + bsd2 + bsd3 + mit + ]; pkgConfigModules = [ "pocketsphinx" ]; mainProgram = "pocketsphinx"; maintainers = with lib.maintainers; [ jopejoe1 ]; From acc3d57d78526fcf07e8d312f7d2da42889ed5e7 Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 12:52:45 +0200 Subject: [PATCH 4/6] python3Packages.pocketsphinx: make use of compound licenses --- .../python-modules/pocketsphinx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pocketsphinx/default.nix b/pkgs/development/python-modules/pocketsphinx/default.nix index c532ea90bb5b..2d907d7e3e44 100644 --- a/pkgs/development/python-modules/pocketsphinx/default.nix +++ b/pkgs/development/python-modules/pocketsphinx/default.nix @@ -44,11 +44,13 @@ buildPythonPackage rec { description = "Small speech recognizer"; homepage = "https://github.com/cmusphinx/pocketsphinx"; changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS"; - license = with lib.licenses; [ - bsd2 - bsd3 - mit - ]; + license = + with lib.licenses; + AND [ + bsd2 + bsd3 + mit + ]; maintainers = with lib.maintainers; [ jopejoe1 ]; }; } From 213d0715dbfff5761a30f508370b3179843d2f72 Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 12:54:49 +0200 Subject: [PATCH 5/6] util-macros: make use of compound licenses --- pkgs/by-name/ut/util-macros/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix index f8572d979deb..f7c8c6d69ea9 100644 --- a/pkgs/by-name/ut/util-macros/package.nix +++ b/pkgs/by-name/ut/util-macros/package.nix @@ -34,10 +34,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "GNU autoconf macros shared across X.Org projects"; homepage = "https://gitlab.freedesktop.org/xorg/util/macros"; - license = with lib.licenses; [ - hpndSellVariant - mit - ]; + license = + with lib.licenses; + AND [ + hpndSellVariant + mit + ]; maintainers = with lib.maintainers; [ raboof jopejoe1 From ccf16a792a5ed2aa77d6b10be6f06228bd6b170d Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 21 Apr 2026 13:01:04 +0200 Subject: [PATCH 6/6] zvbi: make use of compound licenses and cleanup --- pkgs/by-name/zv/zvbi/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix index 8307fdba361d..50c58744efab 100644 --- a/pkgs/by-name/zv/zvbi/package.nix +++ b/pkgs/by-name/zv/zvbi/package.nix @@ -66,15 +66,20 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/zapping-vbi/zvbi"; changelog = "https://github.com/zapping-vbi/zvbi/blob/${finalAttrs.src.rev}/ChangeLog"; pkgConfigModules = [ "zvbi-0.2" ]; - license = with lib.licenses; [ - bsd2 - bsd3 - gpl2 - gpl2Plus - lgpl21Plus - lgpl2Plus - mit - ]; + license = + with lib.licenses; + AND [ + bsd2 + (OR [ + bsd3 + gpl2Plus + ]) + gpl2Only + gpl2Plus + lgpl21Plus + lgpl2Plus + mit + ]; maintainers = with lib.maintainers; [ jopejoe1 ]; }; })