various: clean up licenses for packages i maintain (#512053)

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 ];
   };
 })

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 ];
   };
 })

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 ];

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

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 ];
   };
 })

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 ];
   };
 }