Unverified Commit bf80b178 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #314843 from Lurkki14/gpl2-pkgs-misc 

pkgs/misc: remove licenses.gpl2
parents bb9d961d 9b4703cf

pkgs/misc/barebox/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ let 
    meta = with lib; {

      homepage = "https://www.barebox.org";

      description = "Swiss Army Knive for bare metal";

      license = licenses.gpl2;

      license = licenses.gpl2Only;

      maintainers = with maintainers; [ emantor ];

    } // extraMeta;

  } // removeAttrs args [ "extraMeta" ];

pkgs/misc/cups/cups-pk-helper.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "PolicyKit helper to configure cups with fine-grained privileges";

    homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/";

    license = licenses.gpl2;

    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    maintainers = [ maintainers.bjornfor ];

  };

pkgs/misc/cups/drivers/brlaser/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec { 
           Lenovo M7605D

      '';

    homepage = "https://github.com/pdewacht/brlaser";

    license = licenses.gpl2;

    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ StijnDW ];

  };

pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ in rec { 
      description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";

      homepage = "http://www.brother.com/";

      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

      license = lib.licenses.gpl2;

      license = lib.licenses.gpl2Plus;

      platforms = [ "x86_64-linux" "i686-linux" ];

      maintainers = [ lib.maintainers.steveej ];

    };

pkgs/misc/cups/drivers/dymo/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "CUPS Linux drivers and SDK for DYMO printers";

    homepage = "https://www.dymo.com/";

    license = lib.licenses.gpl2;

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ makefu ];

  };

}