Unverified Commit b932dc51 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

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

parents 994080ec ccf16a79

pkgs/by-name/hu/humblebundle-downloader/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+7 −5
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ 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; [

    license =

      with lib.licenses;

      AND [

        bsd2

        bsd3

        mit

pkgs/by-name/ut/util-macros/package.nix

+6 −4
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ 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; [

    license =

      with lib.licenses;

      AND [

        hpndSellVariant

        mit

      ];

pkgs/by-name/zv/zvbi/package.nix

+14 −9
Original line number Diff line number Diff line
@@ -66,10 +66,15 @@ 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; [

    license =

      with lib.licenses;

      AND [

        bsd2

        (OR [

          bsd3

      gpl2

          gpl2Plus

        ])

        gpl2Only

        gpl2Plus

        lgpl21Plus

        lgpl2Plus