diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index c5db5289c5a4..eeecfa2f0ec4 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Daemon for controlling APC UPSes"; homepage = "http://www.apcupsd.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 590f6f315fe8..484d6cbaa5f2 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { homepage = "https://www.tinkerforge.com/"; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; maintainers = [ lib.maintainers.qknight ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; mainProgram = "brickd"; }; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 98a1bf7cc8c8..e3afc6c8956d 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "DNS Loadbalancer"; mainProgram = "dnsdist"; homepage = "https://dnsdist.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index d4c664802aa3..dfa4a3e61732 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.powerdns.com"; platforms = platforms.unix; broken = stdenv.isDarwin; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ mic92 disassembler nickcao ]; }; }) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 7dfd0ceb8c47..36d16fda4fb4 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://freeradius.org/"; description = "A modular, high performance free RADIUS suite"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sheenobu willibutz lheckemann ]; platforms = with platforms; linux; }; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 133fe17ec088..da9b76526fa1 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very secure FTP daemon"; mainProgram = "vsftpd"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index d346c1372997..04613fd6e170 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight Gopher server"; homepage = "https://gofish.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 1c083b8d2156..4ce384318161 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.nico.schottelius.org/software/gpm/"; description = "A daemon that provides mouse support on the Linux console"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.cygwin; maintainers = with maintainers; [ eelco ]; }; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index f97ae6269011..cd3937fe1fa6 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/openstreetmap/mod_tile"; description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ jglukasik ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 1474232bd624..5efd3b039c9f 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance web server"; homepage = "http://www.fefe.de/gatling/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index d92d5d51a4f8..55414800361c 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.hiawatha-webserver.org"; description = "An advanced and secure webserver"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" maintainers = []; }; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index bc155d353b9f..14346530571e 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { support. "; homepage = "https://lwan.ws/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index 812f5a0d00f5..e8552b4b57c3 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HTTP server for purely static content"; homepage = "http://linux.bytesex.org/misc/webfs.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ zimbatm ]; mainProgram = "webfsd"; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index de375bb51841..488c96a52123 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.icecast.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jcumming ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/servers/icecream/default.nix b/pkgs/servers/icecream/default.nix index e6691e29aa12..20c782e70238 100644 --- a/pkgs/servers/icecream/default.nix +++ b/pkgs/servers/icecream/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Distributed compiler with a central scheduler to share build load"; inherit (src.meta) homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index c027e143b503..7df6eac5fb0d 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple identd that just replies with a random string or customized userid"; mainProgram = "nullidentdmod"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "http://acidhub.click/NullidentdMod"; maintainers = with maintainers; [ das_j ]; platforms = platforms.linux; # Must be run by systemd diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 510834ed282f..4d3c03d90564 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Configurable Ident protocol server"; mainProgram = "oidentd"; homepage = "https://oidentd.janikrabe.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 37d5b299837d..387914e8a6ab 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IRCv3 server designed to be highly scalable"; homepage = "https://github.com/charybdis-ircd/charybdis"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index caff85394f2e..53afea069fea 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Next Generation IRC Daemon"; mainProgram = "ngircd"; homepage = "https://ngircd.barton.de"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix index fc0cdc43831d..297e16cc5218 100644 --- a/pkgs/servers/kwakd/default.nix +++ b/pkgs/servers/kwakd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A super small webserver that serves blank pages"; mainProgram = "kwakd"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 791106ca3b0f..9f7db0b916b6 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source survey application"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 95263e435f02..f223f163fdcb 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays. It is designed to be simple to configure, secure, and easily extendable. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers ; [ sargon ]; }; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 07b351bfb216..65fbe41b9101 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -19,7 +19,7 @@ in runCommand name { description = "A postfix policy server to provide greylisting"; homepage = "https://postgrey.schweikert.ch/"; platforms = postfix.meta.platforms; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } '' mkdir -p $out/bin diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index c31fadc8ecbd..65e6b83a693f 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; mainProgram = "postsrsd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 5d29f6fbb536..f431278de4d1 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source mailing list manager"; homepage = "https://www.sympa.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sorki mmilata ]; platforms = platforms.all; }; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 23bf58c98e59..e65e291b3df8 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { homepage = "https://github.com/AcalephStorage/consul-alerts"; # As per README platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index c4e2cc53291b..b4535c80877d 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -78,7 +78,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.phile314 ]; }; } diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 1ce82c13311c..d70ba0ea1991 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; homepage = "https://lcdproc.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 045fc8f89ac3..c1446b90c870 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { to kill our performance?' problems. ''; homepage = "https://munin-monitoring.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 4f39239bfe08..c8c4db1c401d 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A host, service and network monitoring program"; homepage = "https://www.nagios.org/"; changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${finalAttrs.version}/Changelog"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; mainProgram = "nagios"; maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index ccd77548c0c0..85192c0174d1 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -31,7 +31,7 @@ in python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index c293a4daa215..b30fd4b27577 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -44,7 +44,7 @@ let meta = with lib; { homepage = "https://labs.consol.de/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; inherit description; }; diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/pkgs/servers/monitoring/plugins/wmiplus/default.nix index 00474e12b9ac..dfc3080b6181 100644 --- a/pkgs/servers/monitoring/plugins/wmiplus/default.nix +++ b/pkgs/servers/monitoring/plugins/wmiplus/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A sensu/nagios plugin using WMI to query Windows hosts"; homepage = "http://edcint.co.nz/checkwmiplus"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 3f1d80ca4df9..091c499e0f0b 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -36,7 +36,7 @@ import ./versions.nix ({ version, hash, ... }: meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = "https://www.zabbix.com/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ mmahut psyanticy ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index b287ef56c76f..7f4a52228d5a 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -81,7 +81,7 @@ in meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (client-server proxy)"; homepage = "https://www.zabbix.com/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.mmahut ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 5abf6a93d55d..99942f600f9f 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -90,7 +90,7 @@ in meta = with lib; { description = "An enterprise-class open source distributed monitoring solution"; homepage = "https://www.zabbix.com/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ mmahut psyanticy ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index 7267e3046dd7..e9529ecb58c9 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -25,7 +25,7 @@ import ./versions.nix ({ version, hash, ... }: meta = with lib; { description = "An enterprise-class open source distributed monitoring solution (web frontend)"; homepage = "https://www.zabbix.com/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.mmahut ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index a44f96db7026..6adf73203daa 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source full text search server"; homepage = "http://sphinxsearch.com"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ederoyd46 valodim ]; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 53a2f47cf2ad..dcb5eb4e9990 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; mainProgram = "silcd"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3ff31ba1d3ab..5db93980fa51 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -139,7 +139,7 @@ let meta = with lib; { description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ] ++ teams.helsinki-systems.members; platforms = platforms.all; }; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 521e748198a3..e64b10bae6ae 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index e50b7d579db2..cdc1ad095919 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { changelog = "https://dev.mysql.com/doc/relnotes/connector-j/en/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/servers/sql/percona-server/lts.nix b/pkgs/servers/sql/percona-server/lts.nix index f8b13aa4180a..4531a2db7b7a 100644 --- a/pkgs/servers/sql/percona-server/lts.nix +++ b/pkgs/servers/sql/percona-server/lts.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { A free, fully compatible, enhanced, open source drop-in replacement for MySQL® that provides superior performance, scalability and instrumentation. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.flyingcircus.members; platforms = platforms.unix; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 227ea8357861..92ab0be32e1a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). ''; platforms = postgresql.meta.platforms; - license = lib.licenses.gpl2; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ danbst ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 6569439e351e..ee1669e5db18 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { description = "Geographic Objects for PostgreSQL"; homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ]; inherit (postgresql.meta) platforms; }; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index e862884a457b..bfed80373746 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thall snicket2100 ]; mainProgram = "ums"; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 92b0131ff411..d5ffb81196ff 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ abbradar schneefux globin ]; platforms = lib.platforms.unix; mainProgram = "uwsgi"; diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 00cbbfd0ad24..658fed9de369 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple to use and highly versatile Open Source wiki software that doesn't require a database"; - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "https://www.dokuwiki.org"; platforms = platforms.all; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 4f6563db90b7..264c3243d216 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; homepage = "https://engelsystem.de"; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "migrate"; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/wordpress/generic.nix b/pkgs/servers/web-apps/wordpress/generic.nix index d2d97dab35d9..637aed1d19e3 100644 --- a/pkgs/servers/web-apps/wordpress/generic.nix +++ b/pkgs/servers/web-apps/wordpress/generic.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Plus ]; maintainers = [ maintainers.basvandijk ]; platforms = platforms.all; }; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 821465ec3a52..37830973fbe9 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open-source XMPP application server written in Erlang"; mainProgram = "ejabberdctl"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ];