diff options
author | Jussi Kuokkanen <jussi.kuokkanen@protonmail.com> | 2024-05-26 15:42:05 +0300 |
---|---|---|
committer | Jussi Kuokkanen <jussi.kuokkanen@protonmail.com> | 2024-07-03 14:24:14 +0300 |
commit | 9b4703cf1442e32c8d8cafac6b0118083bdc4951 (patch) | |
tree | 933c310fd204638908497894e051ea0562a46e02 | |
parent | 4c2e57d0362c6774513bd19423ee8a6fb967ae41 (diff) |
pkgs/misc: remove licenses.gpl2
28 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 4b1e373ca69d..ab981d1f38c0 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -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" ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 1a3b4ebfbef6..75f5122cfd03 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -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 ]; }; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index cce75b26d71e..c0f4e1854379 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -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 ]; }; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index 828b4bb831b6..de1d397f7b58 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -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 ]; }; diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 97dcbde2b8b5..c3186cafa264 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -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 ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 767597548991..c629a4918901 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ lib.maintainers.yochai ]; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4e6f37112087..aead095635b3 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; - license = with licenses; gpl2; + license = with licenses; gpl2Plus; platforms = with platforms; linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index f30f9abae334..abf25ae69850 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.xeji ]; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 2cad0ceba55b..590c5c849c35 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.Enzime ]; }; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index d3ae34a80ae5..fae7414d3618 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; homepage = "http://splix.ap2c.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index c1654782db26..127910f97aac 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index e84cc3b0e3f8..5631a975e2e9 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 8004af7686e1..e2d5b8ec6a82 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; isGutenprint = true; }; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index e7bfbe34ee7f..9331760ef66b 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index e0cf96bd63aa..2215c5d1d29e 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej rnhmjoj ]; }; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 4e7375a26916..428bb9685f47 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus lgpl21 ]; pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix index 02b162c88098..78e854980791 100644 --- a/pkgs/misc/meson-tools/default.nix +++ b/pkgs/misc/meson-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/afaerber/meson-tools"; description = "Tools for Amlogic Meson ARM platforms"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index fbb1a2b725a5..1c53f6d664f2 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/"; description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.adisbladis ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 3b6a85764bfa..dcbcfcf432c8 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "Tool from Rockchip to communicate with Rockusb devices"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.lopsided98 ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index f1ba5eb0f1e2..ef141c784d8d 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { It relies on LightDM for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index caae1a4ba2c0..993ec8447c3a 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure suspend/hibernate-friendly alternative to `vlock -an`"; mainProgram = "physlock"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 3ec89194df87..f8e0479b36c2 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index c156373f1481..4596f707f344 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Virtual console locking program"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.linux; mainProgram = "vlock"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 90265afc4284..c7934125a7ae 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "xautolock"; }; }) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index eba0b568b92a..d99c9fd7fcff 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; homepage = "http://sillycycle.com/xlockmore.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 3b785dfc5664..1560af6d9967 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 95fadc40da5f..8a81b47d2574 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -132,7 +132,7 @@ let meta = with lib; { homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bartsch dezgeg lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 3190cfb380d8..9ff961454bf1 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; |