From 7b564cd76f86c2fa23bfdde864c29b35de8c75f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Jun 2022 11:52:16 +0200 Subject: [PATCH 01/95] waf-tester: init at 0.6.10 --- pkgs/tools/security/waf-tester/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/waf-tester/default.nix diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/tools/security/waf-tester/default.nix new file mode 100644 index 000000000000..3ef1dbb47e19 --- /dev/null +++ b/pkgs/tools/security/waf-tester/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, waf-tester +}: + +buildGoModule rec { + pname = "waf-tester"; + version = "0.6.10"; + + src = fetchFromGitHub { + owner = "jreisinger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-fl0gcpcJr7yckfNcnt1C+i2iGdD2oiCq7gJIkiz2v7E="; + }; + + vendorSha256 = "sha256-qVzgZX4HVXZ3qgYAu3a46vcGl4Pk2D1Zx/giEmPEG88="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = waf-tester; + command = "waf-tester -version"; + version = "waf-tester ${version}, commit none, built at unknown by unknown"; + }; + + meta = with lib; { + description = "Tool to test Web Application Firewalls (WAFs)"; + homepage = "https://github.com/jreisinger/waf-tester"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a5f96617499..9c4062450525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11759,6 +11759,8 @@ with pkgs; waf = callPackage ../development/tools/build-managers/waf { }; wafHook = callPackage ../development/tools/build-managers/wafHook { }; + waf-tester = callPackage ../tools/security/waf-tester { }; + wagyu = callPackage ../tools/misc/wagyu { inherit (darwin.apple_sdk.frameworks) Security; }; From 9c2384106f3eb0f7cebbaef3e3d9aa69f4411b48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 08:07:45 +0000 Subject: [PATCH 02/95] checkSSLCert: 2.27.0 -> 2.32.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 5d06d2e4b24a..8d655465569b 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.27.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-R70disK654wKbrrs5QKy1reNDnjZgkXTlR/dAhikI6s="; + sha256 = "sha256-CoWoV9Vv9j0VmkRw7bQFArkKZA2Qq+7ae3ujogsUWso="; }; nativeBuildInputs = [ From 232e431db44e3ae0d3d3fab45040b25b63feb83e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:32:59 +0200 Subject: [PATCH 03/95] checkSSLCert: set maintainer --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 8d655465569b..8f0a16d0039f 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-CoWoV9Vv9j0VmkRw7bQFArkKZA2Qq+7ae3ujogsUWso="; + hash = "sha256-CoWoV9Vv9j0VmkRw7bQFArkKZA2Qq+7ae3ujogsUWso="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Nagios plugin to check the CA and validity of an X.509 certificate"; homepage = "https://github.com/matteocorti/check_ssl_cert"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; platforms = platforms.all; }; } From 2cf54b92dd8a4c75517ad213044f5ca161148be8 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 27 Jun 2022 22:54:31 +0200 Subject: [PATCH 04/95] linuxPackages.rtl8821ce: unstable-2021-11-19 -> unstable-2022-06-01 This unbreaks the build for kernel 5.18 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 7a6171841f95..f841ba471a42 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -8,21 +8,15 @@ stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2021-11-19"; + version = "${kernel.version}-unstable-2022-06-01"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "ca204c60724d23ab10244f920d4e50759ed1affb"; - sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97"; + rev = "be733dc86781c68571650b395dd0fa6b53c0a039"; + sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM="; }; - # Fixes the build on kernel >= 5.17. Can be removed once https://github.com/tomaspinho/rtl8821ce/pull/267 is merged - patches = [(fetchpatch { - url = "https://github.com/tomaspinho/rtl8821ce/commit/7b9e55df64b10fed785f22df9f36ed4a30b59d0e.patch"; - sha256 = "sha256-mpAWOG1aXsklGuDbrRB9Vd36mgeCdctKQaWuuoqEEp0="; - })]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; @@ -47,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.isAarch64 || kernel.kernelAtLeast "5.18"; + broken = stdenv.isAarch64; maintainers = with maintainers; [ hhm ivar ]; }; } From 3ec2a1dab0474fef15a996de04b91d5376919006 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 09:09:46 +0200 Subject: [PATCH 05/95] python310Packages.policyuniverse: 1.5.0.20220523 -> 1.5.0.20220613 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 739b586d0360..11835f3ca309 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.0.20220523"; + version = "1.5.0.20220613"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; + hash = "sha256-xmsfuQd1BkOhmH60GbIRKuP5xSfAE0KVJfn6uYnJotc="; }; # Tests are not shipped and there are no GitHub tags From fad486b298e992ea3380a4282d097170a198fe7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 09:12:27 +0200 Subject: [PATCH 06/95] python310Packages.pysigma: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/pysigma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index e0ae16b805fe..26308cb18e8a 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-39wp12YDM0Wnl+8tNS6XsoYF+5xM7uQRpUtlo3A2PYE="; + hash = "sha256-qOGde74wImDYxNzGlZJfRLBHyRg6U/cgxbWDKIg90/U="; }; nativeBuildInputs = [ From ae4623b2961cef70dfc449b68e51d32a812908d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 17:22:23 +0200 Subject: [PATCH 07/95] python310Packages.niapy: init at 2.0.2 --- .../python-modules/niapy/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/niapy/default.nix diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix new file mode 100644 index 000000000000..b83091cc1dad --- /dev/null +++ b/pkgs/development/python-modules/niapy/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, openpyxl +, pandas +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "niapy"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "NiaOrg"; + repo = "NiaPy"; + rev = version; + hash = "sha256-b/0TEO27fPuoPzkNBCwgUqBG+8htOR2ipFikpqjYdnM="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + openpyxl + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "niapy" + ]; + + meta = with lib; { + description = "Micro framework for building nature-inspired algorithms"; + homepage = "https://niapy.org/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a652fa48d6d..fdf47d2490d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5807,6 +5807,8 @@ in { enablePython = true; # ... and its Python bindings })).python; + niapy = callPackage ../development/python-modules/niapy { }; + nibabel = callPackage ../development/python-modules/nibabel { }; nidaqmx = callPackage ../development/python-modules/nidaqmx { }; From da4f4e183c1dde9c8481d4719df2c518ea9fa34a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 18:51:16 +0200 Subject: [PATCH 08/95] python310Packages.klein: 21.8.0 -> unstable-2022-06-26 --- .../python-modules/klein/default.nix | 59 +++++++++++++++---- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 33e6171737ff..84f69812cc29 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -1,30 +1,65 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python -, attrs, enum34, hyperlink, incremental, six, twisted, typing, tubes, werkzeug, zope_interface -, hypothesis, treq +{ lib +, stdenv +, attrs +, buildPythonPackage +, fetchFromGitHub +, hyperlink +, hypothesis +, incremental +, python +, pythonOlder +, treq +, tubes +, twisted +, typing-extensions +, werkzeug +, zope_interface }: buildPythonPackage rec { pname = "klein"; - version = "21.8.0"; + version = "unstable-2022-06-26"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1mpydmz90d0n9dwa7mr6pgj5v0kczfs05ykssrasdq368dssw7ch"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "twisted"; + repo = pname; + rev = "d8c2b92a3c77aa64c596696fb6f07172ecf94a74"; + hash = "sha256-RDZqavkteUbARV78OctZtLIrE4RoYDVAanjwE5i/ZeM="; }; - propagatedBuildInputs = [ attrs enum34 hyperlink incremental six twisted typing tubes werkzeug zope_interface ]; + propagatedBuildInputs = [ + attrs + hyperlink + incremental + twisted + tubes + werkzeug + zope_interface + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; - checkInputs = [ hypothesis treq ]; + checkInputs = [ + hypothesis + treq + ]; checkPhase = '' ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES klein ''; + pythonImportsCheck = [ + "klein" + ]; + meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Klein Web Micro-Framework"; - homepage = "https://github.com/twisted/klein"; - license = licenses.mit; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; maintainers = with maintainers; [ exarkun ]; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } From 2b50639f43b52134385da802d188f52846936223 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:04 +0200 Subject: [PATCH 09/95] linux: 4.14.284 -> 4.14.285 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a18ac3ac5edb..6cd476fcda61 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.284"; + version = "4.14.285"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq"; + sha256 = "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs"; }; } // (args.argsOverride or {})) From 34fe04da8e4ee12c72e7481fa3ac6506657f826b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:14 +0200 Subject: [PATCH 10/95] linux: 4.19.248 -> 4.19.249 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4d322c8ed6d3..24d0df8223fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.248"; + version = "4.19.249"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4"; + sha256 = "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf"; }; } // (args.argsOverride or {})) From 21c39a09698ce94f0be180027520c3b5169fb68d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:23 +0200 Subject: [PATCH 11/95] linux: 4.9.319 -> 4.9.320 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3c6aed36f398..d13b1a81e45d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.319"; + version = "4.9.320"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp"; + sha256 = "16wq86i8ch488372v94r88xr9anda477d46xq43wkpmbj912gn9h"; }; } // (args.argsOverride or {})) From 48f604ef690b2845ff20c0ac63134cfecff5724b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:34 +0200 Subject: [PATCH 12/95] linux: 5.10.124 -> 5.10.126 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 9f4dcb001af5..87ac3427f7a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.124"; + version = "5.10.126"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc"; + sha256 = "0qsg5mxvq11xdbssz3qsmd794c8nydq297jwmgfwbzwkx1ll61ci"; }; } // (args.argsOverride or {})) From 17996e10f9cccb35fc16e86d8f9dd2c12fc78130 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:46 +0200 Subject: [PATCH 13/95] linux: 5.15.49 -> 5.15.50 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 2b96065d84fe..1fb189b1ef9f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.49"; + version = "5.15.50"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j"; + sha256 = "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam"; }; } // (args.argsOverride or { })) From a13afa2d90d98c3005032e5e7df9002b31134339 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:58 +0200 Subject: [PATCH 14/95] linux: 5.18.6 -> 5.18.7 --- pkgs/os-specific/linux/kernel/linux-5.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index a5b50a6269e4..ae2406b03723 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.6"; + version = "5.18.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f"; + sha256 = "0nsj44p1wn7ysckhv4a99ncj0a9xxhvi54v63w1047sspxjd18m1"; }; } // (args.argsOverride or { })) From dfc38c7baa9ed3d107921f444de6a76f1a3c5cbd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:15:09 +0200 Subject: [PATCH 15/95] linux: 5.4.200 -> 5.4.201 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2f7a5f372cfe..cd79e9680b11 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.200"; + version = "5.4.201"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga"; + sha256 = "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1"; }; } // (args.argsOverride or {})) From 299b49b53941cccf42aaf32e3bd2e1d75d71f847 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:21 +0200 Subject: [PATCH 16/95] linux/hardened/patches/4.14: 4.14.284-hardened1 -> 4.14.285-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fb8c448f7fb8..78400e69de44 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.284-hardened1.patch", - "sha256": "0hj6hmkv3ikgps0jrwl5jgg9pdw6mxi3iblr20r4yp8anxcrvaws", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.284-hardened1/linux-hardened-4.14.284-hardened1.patch" + "name": "linux-hardened-4.14.285-hardened1.patch", + "sha256": "1s7dzzb9aj4xbabddq5jcbd2aci3zxqwryjnmzrhzrdw6j8wszwx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.285-hardened1/linux-hardened-4.14.285-hardened1.patch" }, - "sha256": "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq", - "version": "4.14.284" + "sha256": "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs", + "version": "4.14.285" }, "4.19": { "patch": { From 14479c95a203204f6b82d956ebb657ba7ef3ca28 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:32 +0200 Subject: [PATCH 17/95] linux/hardened/patches/4.19: 4.19.248-hardened1 -> 4.19.249-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 78400e69de44..adfe6dbb44f5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.248-hardened1.patch", - "sha256": "09bnw0f8rd5hf4k4w4n4sb3ggsw48nkxsrnxd9b8vn6jyqhv9n3s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.248-hardened1/linux-hardened-4.19.248-hardened1.patch" + "name": "linux-hardened-4.19.249-hardened1.patch", + "sha256": "0n2q0vwqxvzkkxn4mdaiqyx7ry8k4cr3hx3czcr3wbqvwh2bbnbz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.249-hardened1/linux-hardened-4.19.249-hardened1.patch" }, - "sha256": "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4", - "version": "4.19.248" + "sha256": "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf", + "version": "4.19.249" }, "5.10": { "patch": { From 3cf33ad016f3aeba8aba13cf68228ada4798924b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:44 +0200 Subject: [PATCH 18/95] linux/hardened/patches/5.10: 5.10.124-hardened1 -> 5.10.125-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index adfe6dbb44f5..2e3767e75ad0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.124-hardened1.patch", - "sha256": "1fjwi5al5i0qb7a7viljb755ylqj3m5qp10835a3q91ad6zkjjnf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.124-hardened1/linux-hardened-5.10.124-hardened1.patch" + "name": "linux-hardened-5.10.125-hardened1.patch", + "sha256": "04hdgzx7yqv26i74k6yzdh3k4dzyvcmxn9y93whdw0jyal34nj5w", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.125-hardened1/linux-hardened-5.10.125-hardened1.patch" }, - "sha256": "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc", - "version": "5.10.124" + "sha256": "0q4garkqdkr2280ygz44053cbmzv59yfd0lsn7q67h1j4nh6wddr", + "version": "5.10.125" }, "5.15": { "patch": { From d7973cd50258a26105c42111894d53192f5f4705 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:57 +0200 Subject: [PATCH 19/95] linux/hardened/patches/5.15: 5.15.49-hardened1 -> 5.15.50-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2e3767e75ad0..19f4bc3f32f7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.49-hardened1.patch", - "sha256": "0p14bhqk0a4xzr11cc6gqc0ncc1a3cmvwyvisbsp7b74ax9w5qbm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.49-hardened1/linux-hardened-5.15.49-hardened1.patch" + "name": "linux-hardened-5.15.50-hardened1.patch", + "sha256": "0vridxhn9s21d3r877ndnm7zg5iyqpm9lm319ccw47fwyydwwh4y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.50-hardened1/linux-hardened-5.15.50-hardened1.patch" }, - "sha256": "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j", - "version": "5.15.49" + "sha256": "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam", + "version": "5.15.50" }, "5.18": { "patch": { From 57d38001ad6b0c64ee9c83d5d24ec1464fc343ce Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:17:10 +0200 Subject: [PATCH 20/95] linux/hardened/patches/5.18: 5.18.6-hardened1 -> 5.18.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 19f4bc3f32f7..4ca1f2f369ff 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.6-hardened1.patch", - "sha256": "0y0s50z4qrkcd0s7rlsk8nw1xibwy2i5vigm6526ch77d61g231m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.6-hardened1/linux-hardened-5.18.6-hardened1.patch" + "name": "linux-hardened-5.18.7-hardened1.patch", + "sha256": "085skg598k5q0kgk5zb2ns6m0a6j5bpdi0aa5r8iidln1pqw2894", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.7-hardened1/linux-hardened-5.18.7-hardened1.patch" }, - "sha256": "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f", - "version": "5.18.6" + "sha256": "0nsj44p1wn7ysckhv4a99ncj0a9xxhvi54v63w1047sspxjd18m1", + "version": "5.18.7" }, "5.4": { "patch": { From 7d58f625e2bf0306255174aa0319f280b32f88b0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:17:22 +0200 Subject: [PATCH 21/95] linux/hardened/patches/5.4: 5.4.200-hardened1 -> 5.4.201-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4ca1f2f369ff..079ea453bbf4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.200-hardened1.patch", - "sha256": "1mpcvgri079v8js8y2angwmksyk07vhyi2b5b24bxxdbm1s5a58s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.200-hardened1/linux-hardened-5.4.200-hardened1.patch" + "name": "linux-hardened-5.4.201-hardened1.patch", + "sha256": "1l0qgkwsp12wn2k78m04bpb88qknckbwn6610xj9jxvhq0n0qg4l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.201-hardened1/linux-hardened-5.4.201-hardened1.patch" }, - "sha256": "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga", - "version": "5.4.200" + "sha256": "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1", + "version": "5.4.201" } } From 0934342ba2c3a62614f8f7f8fdb46943239994c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jun 2022 17:25:55 +0000 Subject: [PATCH 22/95] python310Packages.flask-jwt-extended: 4.4.1 -> 4.4.2 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index ac7cf59f9f6f..4beac84ccefc 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.4.1"; + version = "4.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-CYh/o3K91Omrtg2KcVWpZr8Rt0mZVUQQsgl1gCrsJ34="; + hash = "sha256-9YK7qYD89yirclDbtvvcqNTgdOJOspFbARhDdv//mMc="; }; propagatedBuildInputs = [ From d1e0dfd0f2bf80c5025a344da3ac1127cd24f213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 20:05:18 +0200 Subject: [PATCH 23/95] python310Packages.mkdocs-autorefs: init 0.4.1 --- .../mkdocs-autorefs/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-autorefs/default.nix diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix new file mode 100644 index 000000000000..ea1dffdf0db0 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, markdown +, mkdocs +, pytestCheckHook +, pdm-pep517 +, pythonOlder +}: + +buildPythonApplication rec { + pname = "mkdocs-autorefs"; + version = "0.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = "autorefs"; + rev = version; + sha256 = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + markdown + mkdocs + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "mkdocs_autorefs" + ]; + + meta = with lib; { + description = "Automatically link across pages in MkDocs"; + homepage = "https://github.com/mkdocstrings/autorefs/"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a652fa48d6d..0acea21f3157 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5438,6 +5438,7 @@ in { mizani = callPackage ../development/python-modules/mizani { }; mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; From d1261fa63545d08f8529f61657ac306cc2f3012e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 20:16:30 +0200 Subject: [PATCH 24/95] python310Packages.mkdocstrings: init at 0.19.0 --- .../python-modules/mkdocstrings/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocstrings/default.nix diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix new file mode 100644 index 000000000000..b151727a8fbd --- /dev/null +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, jinja2 +, markdown +, markupsafe +, mkdocs +, mkdocs-autorefs +, pymdown-extensions +, pytestCheckHook +, pdm-pep517 +, pythonOlder +}: + +buildPythonApplication rec { + pname = "mkdocstrings"; + version = "0.19.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = pname; + rev = version; + sha256 = "sha256-7OF1CrRnE4MYHuYD/pasnZpLe9lrbieGp4agnWAaKVo="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + jinja2 + markdown + markupsafe + mkdocs + mkdocs-autorefs + pymdown-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "mkdocstrings" + ]; + + disabledTestPaths = [ + # Circular dependencies + "tests/test_extension.py" + ]; + + meta = with lib; { + description = "Automatic documentation from sources for MkDocs"; + homepage = "https://github.com/mkdocstrings/mkdocstrings"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0acea21f3157..40042ed70529 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5447,6 +5447,7 @@ in { mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { }; mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { }; + mkdocstrings = callPackage ../development/python-modules/mkdocstrings { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; From c27f94cd89167708a56eb8c90e89db05290bcbbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jun 2022 18:18:21 +0000 Subject: [PATCH 25/95] python310Packages.globus-sdk: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index af46b9c675ff..96f98c2e55c2 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.9.0"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-Cz4BvtdncHnl53L+5U2gsm9wTNNmAj8ZXjGOk70yKlo="; + hash = "sha256-zHuhhvAAxQnu0GpdbZoLXTwMQPJT4hQHtVr7R1yoNWg="; }; propagatedBuildInputs = [ From 75bb471664b7f2a9be6cf2ef4c1add21549550bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 20:25:09 +0200 Subject: [PATCH 26/95] python310Packages.griffe: init at 0.21.0 --- .../python-modules/griffe/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/griffe/default.nix diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix new file mode 100644 index 000000000000..e13143f88e61 --- /dev/null +++ b/pkgs/development/python-modules/griffe/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiofiles +, buildPythonApplication +, cached-property +, fetchFromGitHub +, git +, pdm-pep517 +, pytestCheckHook +, pythonOlder +}: + +buildPythonApplication rec { + pname = "griffe"; + version = "0.21.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = pname; + rev = version; + hash = "sha256-yhhEcPwh1AjMtDlPZVDR69WX/728wuKqdJdc+yv/o4c="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + passthru.optional-dependencies = { + async = [ + aiofiles + ]; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "griffe" + ]; + + meta = with lib; { + description = "Signatures for entire Python programs"; + homepage = "https://github.com/mkdocstrings/griffe"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40042ed70529..20b881d9aff8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3787,6 +3787,8 @@ in { gridnet = callPackage ../development/python-modules/gridnet { }; + griffe = callPackage ../development/python-modules/griffe { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; From 9381f909cba395de926686c96d165c745769259b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 20:35:59 +0200 Subject: [PATCH 27/95] python310Packages.mkdocstrings-python: init at 0.7.1 --- .../mkdocstrings-python/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocstrings-python/default.nix diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix new file mode 100644 index 000000000000..4e10c4287d8c --- /dev/null +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, griffe +, mkdocs-material +, mkdocstrings +, pdm-pep517 +, pytestCheckHook +, pythonOlder +}: + +buildPythonApplication rec { + pname = "mkdocstrings-python"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = "python"; + rev = version; + hash = "sha256-cZk6Eu6Jp3tSPAb0HplR/I0pX2YIFhOaAsI3YRS0LVw="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + griffe + mkdocstrings + ]; + + checkInputs = [ + mkdocs-material + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "mkdocstrings_handlers" + ]; + + meta = with lib; { + description = "Python handler for mkdocstrings"; + homepage = "https://github.com/mkdocstrings/python"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20b881d9aff8..0de222401ba5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5449,8 +5449,11 @@ in { mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { }; mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { }; + mkdocstrings = callPackage ../development/python-modules/mkdocstrings { }; + mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; From f66f2a44cf18f02874e7860a4c6b1b66af1bfc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Jun 2022 21:34:40 +0200 Subject: [PATCH 28/95] ncpamixer: 1.3.3.1 -> unstable-2021-10-17 --- pkgs/applications/audio/ncpamixer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 7663d1745d2f..f929d9b6f1f7 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3.1"; + version = "unstable-2021-10-17"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; - rev = version; - sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; + rev = "4faf8c27d4de55ddc244f372cbf5b2319d0634f7"; + sha256 = "sha256-ElbxdAaXAY0pj0oo2IcxGT+K+7M5XdCgom0XbJ9BxW4="; }; nativeBuildInputs = [ cmake pkg-config ]; From 5dc633e7d089154f5d3b3dc2990679b617be1219 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:57:01 +0200 Subject: [PATCH 29/95] ghidra: fix meta.maintainers --- pkgs/tools/security/ghidra/build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 17889f3214fe..3e7197f543d2 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -176,7 +176,7 @@ in stdenv.mkDerivation rec { binaryBytecode # deps ]; license = licenses.asl20; - maintainers = [ "roblabla" ]; + maintainers = with maintainers; [ roblabla ]; }; } From b22ac820c5092d0ec81d7a1f83aa96f943cbc479 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:30:16 +0200 Subject: [PATCH 30/95] maintainers/fix-maintainers.pl: init --- maintainers/scripts/fix-maintainers.pl | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 maintainers/scripts/fix-maintainers.pl diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl new file mode 100755 index 000000000000..81f6450c5faf --- /dev/null +++ b/maintainers/scripts/fix-maintainers.pl @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i perl -p perl -p perlPackages.LWP -p perlPackages.LWPProtocolHttps -p perlPackages.LWPUserAgent -p perlPackages.JSON -p perlPackages.PathTiny +use LWP::UserAgent; +use JSON; +use Path::Tiny; +use strict; +use warnings; + +my $maintainers_list_nix = "../maintainer-list.nix"; +my $maintainers_json = from_json(`nix-instantiate --json --eval --expr 'builtins.fromJSON (builtins.toJSON (import $maintainers_list_nix))'`); + +STDOUT->autoflush(1); + +my $ua = LWP::UserAgent->new(); + +keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop +while(my($k, $v) = each %$maintainers_json) { + my $current_user = %$v{'github'}; + if (!defined $current_user) { + print "$k has no github handle\n"; + next; + } + my $github_id = %$v{'githubId'}; + if (!defined $github_id) { + print "$k has no githubId\n"; + next; + } + my $url = 'https://api.github.com/user/' . $github_id; + my $resp = $ua->get( + $url, + "Authorization" => "Token $ENV{GH_TOKEN}" + ); + + if ($resp->header("X-RateLimit-Remaining") == 0) { + my $ratelimit_reset = $resp->header("X-RateLimit-Reset"); + print "Request limit exceeded, waiting until " . scalar localtime $ratelimit_reset . "\n"; + sleep($ratelimit_reset - time() + 5); + } + if ($resp->code != 200) { + print $current_user . " likely deleted their github account\n"; + next; + } + my $resp_json = from_json($resp->content); + my $api_user = %$resp_json{"login"}; + if ($current_user ne $api_user) { + print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + my $file = path($maintainers_list_nix); + my $data = $file->slurp_utf8; + $data =~ s/github = "$current_user";$/github = "$api_user";/m; + $file->spew_utf8($data); + } +} From d7b32a0fc41d0ea2e7c3f6a602d417476c8d3c63 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:30:35 +0200 Subject: [PATCH 31/95] maintainers/maintainer-list: fix changed handles --- maintainers/maintainer-list.nix | 300 ++++++++++++++++---------------- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bff3019a09d2..c29bec8d3685 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -207,7 +207,7 @@ }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; - github = "abigailbuccaneer"; + github = "AbigailBuccaneer"; githubId = 908758; name = "Abigail Bunyan"; }; @@ -329,7 +329,7 @@ }; aethelz = { email = "aethelz@protonmail.com"; - github = "aethelz"; + github = "eugenezastrogin"; githubId = 10677343; name = "Eugene"; }; @@ -523,7 +523,7 @@ alexnortung = { name = "alexnortung"; email = "alex_nortung@live.dk"; - github = "alexnortung"; + github = "Alexnortung"; githubId = 1552267; }; alexshpilkin = { @@ -556,7 +556,7 @@ }; alibabzo = { email = "alistair.bill@gmail.com"; - github = "alibabzo"; + github = "alistairbill"; githubId = 2822871; name = "Alistair Bill"; }; @@ -617,7 +617,7 @@ }; alva = { email = "alva@skogen.is"; - github = "fjallarefur"; + github = "illfygli"; githubId = 42881386; name = "Alva"; keys = [{ @@ -641,7 +641,7 @@ }; amar1729 = { email = "amar.paul16@gmail.com"; - github = "amar1729"; + github = "Amar1729"; githubId = 15623522; name = "Amar Paul"; }; @@ -707,7 +707,7 @@ }; amorsillo = { email = "andrew.morsillo@gmail.com"; - github = "AndrewMorsillo"; + github = "evelant"; githubId = 858965; name = "Andrew Morsillo"; }; @@ -1035,13 +1035,13 @@ }; arnoutkroeze = { email = "nixpkgs@arnoutkroeze.nl"; - github = "arnoutkroeze"; + github = "ArnoutKroeze"; githubId = 37151054; name = "Arnout Kroeze"; }; arobyn = { email = "shados@shados.net"; - github = "shados"; + github = "Shados"; githubId = 338268; name = "Alexei Robyn"; }; @@ -1174,7 +1174,7 @@ }; atnnn = { email = "etienne@atnnn.com"; - github = "atnnn"; + github = "AtnNn"; githubId = 706854; name = "Etienne Laurin"; }; @@ -1216,7 +1216,7 @@ }; avaq = { email = "nixpkgs@account.avaq.it"; - github = "avaq"; + github = "Avaq"; githubId = 1217745; name = "Aldwin Vlasblom"; }; @@ -1274,7 +1274,7 @@ artturin = { email = "artturin@artturin.com"; matrix = "@artturin:matrix.org"; - github = "artturin"; + github = "Artturin"; githubId = 56650223; name = "Artturi N"; }; @@ -1290,7 +1290,7 @@ }; ayazhafiz = { email = "ayaz.hafiz.1@gmail.com"; - github = "ayazhafiz"; + github = "hafiz"; githubId = 262763; name = "Ayaz Hafiz"; }; @@ -1370,7 +1370,7 @@ }; bandresen = { email = "bandresen@gmail.com"; - github = "bandresen"; + github = "bennyandresen"; githubId = 80325; name = "Benjamin Andresen"; }; @@ -1782,7 +1782,7 @@ }; brainrape = { email = "martonboros@gmail.com"; - github = "brainrape"; + github = "brainrake"; githubId = 302429; name = "Marton Boros"; }; @@ -1904,7 +1904,7 @@ }; builditluc = { email = "builditluc@icloud.com"; - github = "builditluc"; + github = "Builditluc"; githubId = 37375448; name = "Buildit"; }; @@ -1991,7 +1991,7 @@ }; cameronnemo = { email = "cnemo@tutanota.com"; - github = "cameronnemo"; + github = "CameronNemo"; githubId = 3212452; name = "Cameron Nemo"; }; @@ -2263,7 +2263,7 @@ }; chrisjefferson = { email = "chris@bubblescope.net"; - github = "chrisjefferson"; + github = "ChrisJefferson"; githubId = 811527; name = "Christopher Jefferson"; }; @@ -2343,7 +2343,7 @@ }; citadelcore = { email = "alex@arctarus.co.uk"; - github = "citadelcore"; + github = "CitadelCore"; githubId = 5567402; name = "Alex Zero"; keys = [{ @@ -2432,7 +2432,7 @@ }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; - github = "cmcdragonkai"; + github = "CMCDragonkai"; githubId = 640797; name = "Roger Qiu"; }; @@ -2560,7 +2560,7 @@ congee = { email = "changshengwu@pm.me"; matrix = "@congeec:matrix.org"; - github = "congee"; + github = "Congee"; name = "Changsheng Wu"; githubId = 2083950; }; @@ -2632,7 +2632,7 @@ }; creator54 = { email = "hi.creator54@gmail.com"; - github = "creator54"; + github = "Creator54"; githubId = 34543609; name = "creator54"; }; @@ -2982,7 +2982,7 @@ dearrude = { name = "Ebrahim Nejati"; email = "dearrude@tfwno.gf"; - github = "dearrude"; + github = "DearRude"; githubId = 30749142; keys = [{ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; @@ -3162,7 +3162,7 @@ }; diegolelis = { email = "diego.o.lelis@gmail.com"; - github = "diegolelis"; + github = "DiegoLelis"; githubId = 8404455; name = "Diego Lelis"; }; @@ -3174,7 +3174,7 @@ }; diffumist = { email = "git@diffumist.me"; - github = "diffumist"; + github = "Diffumist"; githubId = 32810399; name = "Diffumist"; }; @@ -3216,7 +3216,7 @@ }; dizfer = { email = "david@izquierdofernandez.com"; - github = "dizfer"; + github = "DIzFer"; githubId = 8852888; name = "David Izquierdo"; }; @@ -3490,7 +3490,7 @@ }; e-user = { email = "nixos@sodosopa.io"; - github = "e-user"; + github = "outergod"; githubId = 93086; name = "Alexander Kahl"; }; @@ -3578,7 +3578,7 @@ }; emantor = { email = "rouven+nixos@czerwinskis.de"; - github = "emantor"; + github = "Emantor"; githubId = 934284; name = "Rouven Czerwinski"; }; @@ -3663,7 +3663,7 @@ ekleog = { email = "leo@gaspard.io"; matrix = "@leo:gaspard.ninja"; - github = "ekleog"; + github = "Ekleog"; githubId = 411447; name = "Leo Gaspard"; }; @@ -3879,7 +3879,7 @@ ericson2314 = { email = "John.Ericson@Obsidian.Systems"; matrix = "@ericson2314:matrix.org"; - github = "ericson2314"; + github = "Ericson2314"; githubId = 1055245; name = "John Ericson"; }; @@ -3918,7 +3918,7 @@ }; ersin = { email = "me@ersinakinci.com"; - github = "earksiinni"; + github = "DesertDevErsin"; githubId = 5427394; name = "Ersin Akinci"; }; @@ -4043,7 +4043,7 @@ }; exfalso = { email = "0slemi0@gmail.com"; - github = "exfalso"; + github = "exFalso"; githubId = 1042674; name = "Andras Slemmer"; }; @@ -4169,7 +4169,7 @@ }; fedx-sudo = { email = "fedx-sudo@pm.me"; - github = "Fedx-sudo"; + github = "FedX-sudo"; githubId = 66258975; name = "Fedx sudo"; matrix = "fedx:matrix.org"; @@ -4348,13 +4348,13 @@ }; forkk = { email = "forkk@forkk.net"; - github = "forkk"; + github = "Forkk"; githubId = 1300078; name = "Andrew Okin"; }; fornever = { email = "friedrich@fornever.me"; - github = "fornever"; + github = "ForNeVeR"; githubId = 92793; name = "Friedrich von Never"; }; @@ -4389,13 +4389,13 @@ }; freax13 = { email = "erbse.13@gmx.de"; - github = "freax13"; + github = "Freax13"; githubId = 14952658; name = "Tom Dohrmann"; }; fredeb = { email = "im@fredeb.dev"; - github = "fredeeb"; + github = "FredeEB"; githubId = 7551358; name = "Frede Emil"; }; @@ -4413,7 +4413,7 @@ }; fridh = { email = "fridh@fridh.nl"; - github = "fridh"; + github = "FRidh"; githubId = 2129135; name = "Frederik Rietdijk"; }; @@ -4483,7 +4483,7 @@ }; fuuzetsu = { email = "fuuzetsu@fuuzetsu.co.uk"; - github = "fuuzetsu"; + github = "Fuuzetsu"; githubId = 893115; name = "Mateusz Kowalczyk"; }; @@ -4495,7 +4495,7 @@ }; fuzen = { email = "me@fuzen.cafe"; - github = "fuzen-py"; + github = "Fuzen-py"; githubId = 17859309; name = "Fuzen"; }; @@ -4517,7 +4517,7 @@ }; Gabriel439 = { email = "Gabriel439@gmail.com"; - github = "Gabriel439"; + github = "Gabriella439"; githubId = 1313787; name = "Gabriel Gonzalez"; }; @@ -4544,7 +4544,7 @@ }; galagora = { email = "lightningstrikeiv@gmail.com"; - github = "galagora"; + github = "Galagora"; githubId = 45048741; name = "Alwanga Oyango"; }; @@ -4635,7 +4635,7 @@ ggpeti = { email = "ggpeti@gmail.com"; matrix = "@ggpeti:ggpeti.com"; - github = "ggpeti"; + github = "ggPeti"; githubId = 3217744; name = "Peter Ferenczy"; }; @@ -4689,7 +4689,7 @@ }; glenns = { email = "glenn.searby@gmail.com"; - github = "glenns"; + github = "GlennS"; githubId = 615606; name = "Glenn Searby"; }; @@ -4756,7 +4756,7 @@ govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; - github = "govanify"; + github = "GovanifY"; githubId = 6375438; keys = [{ fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; @@ -4945,7 +4945,7 @@ }; hanemile = { email = "mail@emile.space"; - github = "hanemile"; + github = "HanEmile"; githubId = 22756350; name = "Emile Hansmaennel"; }; @@ -4957,7 +4957,7 @@ }; HaoZeke = { email = "r95g10@gmail.com"; - github = "haozeke"; + github = "HaoZeke"; githubId = 4336207; name = "Rohit Goswami"; keys = [{ @@ -5000,7 +5000,7 @@ }; havvy = { email = "ryan.havvy@gmail.com"; - github = "havvy"; + github = "Havvy"; githubId = 731722; name = "Ryan Scheel"; }; @@ -5052,7 +5052,7 @@ }; heel = { email = "parizhskiy@gmail.com"; - github = "heel"; + github = "HeeL"; githubId = 287769; name = "Sergii Paryzhskyi"; }; @@ -5179,7 +5179,7 @@ hleboulanger = { email = "hleboulanger@protonmail.com"; name = "Harold Leboulanger"; - github = "thbkrhsw"; + github = "thbkrshw"; githubId = 33122; }; hlolli = { @@ -5190,7 +5190,7 @@ }; hugoreeves = { email = "hugo@hugoreeves.com"; - github = "hugoreeves"; + github = "HugoReeves"; githubId = 20039091; name = "Hugo Reeves"; keys = [{ @@ -5236,7 +5236,7 @@ hoverbear = { email = "operator+nix@hoverbear.org"; matrix = "@hoverbear:matrix.org"; - github = "hoverbear"; + github = "Hoverbear"; githubId = 130903; name = "Ana Hobden"; }; @@ -5333,7 +5333,7 @@ iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; matrix = "@iammrinal0:nixos.dev"; - github = "iammrinal0"; + github = "iAmMrinal0"; githubId = 890062; name = "Mrinal"; }; @@ -5470,7 +5470,7 @@ }; imgabe = { email = "gabrielpmonte@hotmail.com"; - github = "imgabe"; + github = "ImGabe"; githubId = 24387926; name = "Gabriel Pereira"; }; @@ -5546,7 +5546,7 @@ isgy = { name = "isgy"; email = "isgy@teiyg.com"; - github = "isgy"; + github = "tgys"; githubId = 13622947; keys = [{ fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; @@ -5625,7 +5625,7 @@ }; izorkin = { email = "Izorkin@gmail.com"; - github = "izorkin"; + github = "Izorkin"; githubId = 26877687; name = "Yurii Izorkin"; }; @@ -5833,7 +5833,7 @@ }; jdanek = { email = "jdanek@redhat.com"; - github = "jdanekrh"; + github = "jirkadanek"; githubId = 17877663; keys = [{ fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; @@ -5884,7 +5884,7 @@ }; jefflabonte = { email = "grimsleepless@protonmail.com"; - github = "jefflabonte"; + github = "JeffLabonte"; githubId = 9425955; name = "Jean-François Labonté"; }; @@ -5908,7 +5908,7 @@ }; jeschli = { email = "jeschli@gmail.com"; - github = "Jeschli"; + github = "0mbi"; githubId = 10786794; name = "Markus Hihn"; }; @@ -6136,7 +6136,7 @@ }; joelancaster = { email = "joe.a.lancas@gmail.com"; - github = "joelancaster"; + github = "JoeLancaster"; githubId = 16760945; name = "Joe Lancaster"; }; @@ -6183,7 +6183,7 @@ }; johnazoidberg = { email = "git@danielschaefer.me"; - github = "johnazoidberg"; + github = "JohnAZoidberg"; githubId = 5307138; name = "Daniel Schäfer"; }; @@ -6195,7 +6195,7 @@ }; johnmh = { email = "johnmh@openblox.org"; - github = "johnmh"; + github = "JohnMH"; githubId = 2576152; name = "John M. Harris, Jr."; }; @@ -6548,7 +6548,7 @@ kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; - github = "kaction"; + github = "KAction"; githubId = 44864956; keys = [{ fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; @@ -6556,7 +6556,7 @@ }; kaiha = { email = "kai.harries@gmail.com"; - github = "kaiha"; + github = "KaiHa"; githubId = 6544084; name = "Kai Harries"; }; @@ -6658,7 +6658,7 @@ }; kentjames = { email = "jameschristopherkent@gmail.com"; - github = "kentjames"; + github = "KentJames"; githubId = 2029444; name = "James Kent"; }; @@ -6702,7 +6702,7 @@ }; kho-dialga = { email = "ivandashenyou@gmail.com"; - github = "kho-dialga"; + github = "Kho-Dialga"; githubId = 55767703; name = "Iván Brito"; }; @@ -6850,7 +6850,7 @@ email = "me@kloenk.dev"; matrix = "@kloenk:petabyte.dev"; name = "Finn Behrens"; - github = "kloenk"; + github = "Kloenk"; githubId = 12898828; keys = [{ fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; @@ -6943,7 +6943,7 @@ }; kovirobi = { email = "kovirobi@gmail.com"; - github = "kovirobi"; + github = "KoviRobi"; githubId = 1903418; name = "Kovacsics Robert"; }; @@ -6997,7 +6997,7 @@ }; kristian-brucaj = { email = "kbrucaj@gmail.com"; - github = "kristian-brucaj"; + github = "Kristian-Brucaj"; githubId = 8893110; name = "Kristian Brucaj"; }; @@ -7051,7 +7051,7 @@ }; kyleondy = { email = "kyle@ondy.org"; - github = "kyleondy"; + github = "KyleOndy"; githubId = 1640900; name = "Kyle Ondy"; keys = [{ @@ -7226,7 +7226,7 @@ }; leemachin = { email = "me@mrl.ee"; - github = "leemachin"; + github = "leemeichin"; githubId = 736291; name = "Lee Machin"; }; @@ -7249,7 +7249,7 @@ leixb = { email = "abone9999+nixpkgs@gmail.com"; matrix = "@leix_b:matrix.org"; - github = "LeixB"; + github = "Leixb"; githubId = 17183803; name = "Aleix Boné"; keys = [{ @@ -7480,7 +7480,7 @@ }; lnl7 = { email = "daiderd@gmail.com"; - github = "lnl7"; + github = "LnL7"; githubId = 689294; name = "Daiderd Jordan"; }; @@ -7544,7 +7544,7 @@ }; louisdk1 = { email = "louis@louis.dk"; - github = "louisdk1"; + github = "LouisDK1"; githubId = 4969294; name = "Louis Tim Larsen"; }; @@ -7723,7 +7723,7 @@ }; lynty = { email = "ltdong93+nix@gmail.com"; - github = "lynty"; + github = "Lynty"; githubId = 39707188; name = "Lynn Dong"; }; @@ -7750,7 +7750,7 @@ ma27 = { email = "maximilian@mbosch.me"; matrix = "@ma27:nicht-so.sexy"; - github = "ma27"; + github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; }; @@ -7866,7 +7866,7 @@ }; marcweber = { email = "marco-oweber@gmx.de"; - github = "marcweber"; + github = "MarcWeber"; githubId = 34086; name = "Marc Weber"; }; @@ -7975,7 +7975,7 @@ }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; - github = "mathnerd314"; + github = "Mathnerd314"; githubId = 322214; name = "Mathnerd314"; }; @@ -8258,7 +8258,7 @@ }; melkor333 = { email = "samuel@ton-kunst.ch"; - github = "melkor333"; + github = "Melkor333"; githubId = 6412377; name = "Samuel Ruprecht"; }; @@ -8335,7 +8335,7 @@ mic92 = { email = "joerg@thalheim.io"; matrix = "@mic92:nixos.dev"; - github = "mic92"; + github = "Mic92"; githubId = 96200; name = "Jörg Thalheim"; keys = [{ @@ -8436,7 +8436,7 @@ }; milesbreslin = { email = "milesbreslin@gmail.com"; - github = "milesbreslin"; + github = "MilesBreslin"; githubId = 38543128; name = "Miles Breslin"; }; @@ -8513,7 +8513,7 @@ }; misterio77 = { email = "eu@misterio.me"; - github = "misterio77"; + github = "Misterio77"; githubId = 5727578; matrix = "@misterio:matrix.org"; name = "Gabriel Fontes"; @@ -8602,7 +8602,7 @@ }; mmesch = { email = "mmesch@noreply.github.com"; - github = "mmesch"; + github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; }; @@ -8678,7 +8678,7 @@ }; moredread = { email = "code@apb.name"; - github = "moredread"; + github = "Moredread"; githubId = 100848; name = "André-Patrick Bubel"; keys = [{ @@ -8705,13 +8705,13 @@ }; mothsart = { email = "jerem.ferry@gmail.com"; - github = "mothsart"; + github = "mothsART"; githubId = 10601196; name = "Jérémie Ferry"; }; mounium = { email = "muoniurn@gmail.com"; - github = "mounium"; + github = "Mounium"; githubId = 20026143; name = "Katona László"; }; @@ -8937,7 +8937,7 @@ }; myrl = { email = "myrl.0xf@gmail.com"; - github = "myrl"; + github = "Myrl"; githubId = 9636071; name = "Myrl Hex"; }; @@ -8949,7 +8949,7 @@ }; nadrieril = { email = "nadrieril@gmail.com"; - github = "nadrieril"; + github = "Nadrieril"; githubId = 6783654; name = "Nadrieril Feneanar"; }; @@ -9090,7 +9090,7 @@ }; nequissimus = { email = "tim@nequissimus.com"; - github = "nequissimus"; + github = "NeQuissimus"; githubId = 628342; name = "Tim Steinbach"; }; @@ -9187,7 +9187,7 @@ }; nickhu = { email = "me@nickhu.co.uk"; - github = "nickhu"; + github = "NickHu"; githubId = 450276; name = "Nick Hu"; }; @@ -9245,7 +9245,7 @@ ninjatrappeur = { email = "felix@alternativebit.fr"; matrix = "@ninjatrappeur:matrix.org"; - github = "ninjatrappeur"; + github = "NinjaTrappeur"; githubId = 1219785; name = "Félix Baylac-Jacqué"; }; @@ -9281,7 +9281,7 @@ }; nkpvk = { email = "niko.pavlinek@gmail.com"; - github = "nkpvk"; + github = "npavlinek"; githubId = 16385648; name = "Niko Pavlinek"; }; @@ -9376,7 +9376,7 @@ }; notthemessiah = { email = "brian.cohen.88@gmail.com"; - github = "notthemessiah"; + github = "NOTtheMessiah"; githubId = 2946283; name = "Brian Cohen"; }; @@ -9574,7 +9574,7 @@ }; omnipotententity = { email = "omnipotententity@gmail.com"; - github = "omnipotententity"; + github = "OmnipotentEntity"; githubId = 1538622; name = "Michael Reilly"; }; @@ -9640,7 +9640,7 @@ }; oro = { email = "marco@orovecchia.at"; - github = "oro"; + github = "Oro"; githubId = 357005; name = "Marco Orovecchia"; }; @@ -9703,7 +9703,7 @@ }; pablovsky = { email = "dealberapablo07@gmail.com"; - github = "pablo1107"; + github = "Pablo1107"; githubId = 17091659; name = "Pablo Andres Dealbera"; }; @@ -9753,7 +9753,7 @@ }; panaeon = { email = "vitalii.voloshyn@gmail.com"; - github = "panaeon"; + github = "PanAeon"; githubId = 686076; name = "Vitalii Voloshyn"; }; @@ -9772,7 +9772,7 @@ papojari = { email = "papojari-git.ovoid@aleeas.com"; matrix = "@papojari:artemislena.eu"; - github = "papojari"; + github = "auroraanna"; githubId = 81317317; name = "papojari"; }; @@ -9784,7 +9784,7 @@ }; parasrah = { email = "nixos@parasrah.com"; - github = "parasrah"; + github = "Parasrah"; githubId = 14935550; name = "Brad Pfannmuller"; }; @@ -9835,7 +9835,7 @@ }; payas = { email = "relekarpayas@gmail.com"; - github = "payasrelekar"; + github = "bhankas"; githubId = 24254289; name = "Payas Relekar"; }; @@ -10024,7 +10024,7 @@ }; pierrer = { email = "pierrer@pi3r.be"; - github = "pierrer"; + github = "PierreR"; githubId = 93115; name = "Pierre Radermecker"; }; @@ -10082,7 +10082,7 @@ }; pkmx = { email = "pkmx.tw@gmail.com"; - github = "pkmx"; + github = "PkmX"; githubId = 610615; name = "Chih-Mao Chen"; }; @@ -10166,7 +10166,7 @@ }; pneumaticat = { email = "kevin@potatofrom.space"; - github = "pneumaticat"; + github = "kliu128"; githubId = 11365056; name = "Kevin Liu"; }; @@ -10235,7 +10235,7 @@ }; pombeirp = { email = "nix@endgr.33mail.com"; - github = "PombeirP"; + github = "pedropombeiro"; githubId = 138074; name = "Pedro Pombeiro"; }; @@ -10324,7 +10324,7 @@ }; progval = { email = "progval+nix@progval.net"; - github = "ProgVal"; + github = "progval"; githubId = 406946; name = "Valentin Lorentz"; }; @@ -10443,7 +10443,7 @@ }; peelz = { email = "peelz.dev+nixpkgs@gmail.com"; - github = "louistakepillz"; + github = "notpeelz"; githubId = 920910; name = "peelz"; }; @@ -10473,7 +10473,7 @@ }; queezle = { email = "git@queezle.net"; - github = "qzle"; + github = "queezle42"; githubId = 1024891; name = "Jens Nolte"; }; @@ -10545,13 +10545,13 @@ ralith = { email = "ben.e.saunders@gmail.com"; matrix = "@ralith:ralith.com"; - github = "ralith"; + github = "Ralith"; githubId = 104558; name = "Benjamin Saunders"; }; ramkromberg = { email = "ramkromberg@mail.com"; - github = "ramkromberg"; + github = "RamKromberg"; githubId = 14829269; name = "Ram Kromberg"; }; @@ -10597,7 +10597,7 @@ }; razvan = { email = "razvan.panda@gmail.com"; - github = "razvan-panda"; + github = "razvan-flavius-panda"; githubId = 1758708; name = "Răzvan Flavius Panda"; }; @@ -10685,7 +10685,7 @@ }; regnat = { email = "regnat@regnat.ovh"; - github = "regnat"; + github = "thufschmitt"; githubId = 7226587; name = "Théophane Hufschmitt"; }; @@ -10784,7 +10784,7 @@ }; rhoriguchi = { email = "ryan.horiguchi@gmail.com"; - github = "rhoriguchi "; + github = "rhoriguchi"; githubId = 6047658; name = "Ryan Horiguchi"; }; @@ -11005,7 +11005,7 @@ }; ronanmacf = { email = "macfhlar@tcd.ie"; - github = "ronanmacf"; + github = "RonanMacF"; githubId = 25930627; name = "Ronan Mac Fhlannchadha"; }; @@ -11202,7 +11202,7 @@ }; rytone = { email = "max@ryt.one"; - github = "rytone"; + github = "rastertail"; githubId = 8082305; name = "Maxwell Beck"; keys = [{ @@ -11423,7 +11423,7 @@ scoder12 = { name = "Spencer Pogorzelski"; email = "34356756+Scoder12@users.noreply.github.com"; - github = "scoder12"; + github = "Scoder12"; githubId = 34356756; }; scolobb = { @@ -11441,7 +11441,7 @@ Scriptkiddi = { email = "nixos@scriptkiddi.de"; matrix = "@fritz.otlinghaus:helsinki-systems.de"; - github = "scriptkiddi"; + github = "Scriptkiddi"; githubId = 3598650; name = "Fritz Otlinghaus"; }; @@ -11490,7 +11490,7 @@ }; sebtm = { email = "mail@sebastian-sellmeier.de"; - github = "sebtm"; + github = "SebTM"; githubId = 17243347; name = "Sebastian Sellmeier"; }; @@ -11562,7 +11562,7 @@ }; sfrijters = { email = "sfrijters@gmail.com"; - github = "sfrijters"; + github = "SFrijters"; githubId = 918365; name = "Stefan Frijters"; }; @@ -11619,13 +11619,13 @@ }; shawndellysse = { email = "sdellysse@gmail.com"; - github = "shawndellysse"; + github = "sdellysse"; githubId = 293035; name = "Shawn Dellysse"; }; shawn8901 = { email = "shawn8901@googlemail.com"; - github = "shawn8901"; + github = "Shawn8901"; githubId = 12239057; name = "Shawn8901"; }; @@ -11755,7 +11755,7 @@ simarra = { name = "simarra"; email = "loic.martel@protonmail.com"; - github = "simarra"; + github = "Simarra"; githubId = 14372987; }; simoneruffini = { @@ -11806,7 +11806,7 @@ }; sirseruju = { email = "sir.seruju@yandex.ru"; - github = "sirseruju"; + github = "SirSeruju"; githubId = 74881555; name = "Fofanov Sergey"; }; @@ -11875,7 +11875,7 @@ }; smakarov = { email = "setser200018@gmail.com"; - github = "setser"; + github = "SeTSeR"; githubId = 12733495; name = "Sergey Makarov"; keys = [{ @@ -11918,7 +11918,7 @@ }; sna = { email = "abouzahra.9@wright.edu"; - github = "s-na"; + github = "S-NA"; githubId = 20214715; name = "S. Nordin Abouzahra"; }; @@ -11948,7 +11948,7 @@ }; sohalt = { email = "nixos@sohalt.net"; - github = "sohalt"; + github = "Sohalt"; githubId = 2157287; name = "sohalt"; }; @@ -12062,7 +12062,7 @@ }; srgom = { email = "srgom@users.noreply.github.com"; - github = "srgom"; + github = "SRGOM"; githubId = 8103619; name = "SRGOM"; }; @@ -12081,14 +12081,14 @@ }; sstef = { email = "stephane@nix.frozenid.net"; - github = "fkstef"; + github = "haskelious"; githubId = 8668915; name = "Stephane Schitter"; }; staccato = { name = "staccato"; email = "moveq@riseup.net"; - github = "staccato"; + github = "braaandon"; githubId = 86573128; }; stackshadow = { @@ -12191,13 +12191,13 @@ }; stevebob = { email = "stephen@sherra.tt"; - github = "stevebob"; + github = "gridbugs"; githubId = 417118; name = "Stephen Sherratt"; }; steveej = { email = "mail@stefanjunker.de"; - github = "steveej"; + github = "steveeJ"; githubId = 1181362; name = "Stefan Junker"; }; @@ -12404,7 +12404,7 @@ }; szczyp = { email = "qb@szczyp.com"; - github = "szczyp"; + github = "Szczyp"; githubId = 203195; name = "Szczyp"; }; @@ -12557,7 +12557,7 @@ }; tchekda = { email = "contact@tchekda.fr"; - github = "tchekda"; + github = "Tchekda"; githubId = 23559888; keys = [{ fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; @@ -12729,7 +12729,7 @@ name = "The Hedgehog"; email = "hedgehog@mrhedgehog.xyz"; matrix = "@mrhedgehog:jupiterbroadcasting.com"; - github = "ModdedGamers"; + github = "theHedgehog0"; githubId = 35778371; keys = [{ fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; @@ -12749,7 +12749,7 @@ }; thesola10 = { email = "me@thesola.io"; - github = "thesola10"; + github = "Thesola10"; githubId = 7287268; keys = [{ fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; @@ -12994,7 +12994,7 @@ }; tomsmeets = { email = "tom.tsmeets@gmail.com"; - github = "tomsmeets"; + github = "TomSmeets"; githubId = 6740669; name = "Tom Smeets"; }; @@ -13038,7 +13038,7 @@ }; travisdavis-ops = { email = "travisdavismedia@gmail.com"; - github = "travisdavis-ops"; + github = "TravisDavis-ops"; githubId = 52011418; name = "Travis Davis"; }; @@ -13159,7 +13159,7 @@ }; tvorog = { email = "marszaripov@gmail.com"; - github = "tvorog"; + github = "TvoroG"; githubId = 1325161; name = "Marsel Zaripov"; }; @@ -13319,7 +13319,7 @@ valodim = { email = "look@my.amazin.horse"; matrix = "@Valodim:stratum0.org"; - github = "valodim"; + github = "Valodim"; githubId = 27813; name = "Vincent Breitmoser"; }; @@ -13569,7 +13569,7 @@ }; vskilet = { email = "victor@sene.ovh"; - github = "vskilet"; + github = "Vskilet"; githubId = 7677567; name = "Victor SENE"; }; @@ -13703,7 +13703,7 @@ }; willibutz = { email = "willibutz@posteo.de"; - github = "willibutz"; + github = "WilliButz"; githubId = 20464732; name = "Willi Butz"; }; @@ -13801,7 +13801,7 @@ }; wolfangaukang = { email = "clone.gleeful135+nixpkgs@anonaddy.me"; - github = "wolfangaukang"; + github = "WolfangAukang"; githubId = 8378365; name = "P. R. d. O."; }; @@ -13868,7 +13868,7 @@ }; wyvie = { email = "elijahrum@gmail.com"; - github = "wyvie"; + github = "alicerum"; githubId = 3992240; name = "Elijah Rum"; }; @@ -13942,7 +13942,7 @@ }; xnwdd = { email = "nwdd+nixos@no.team"; - github = "xnwdd"; + github = "xNWDD"; githubId = 3028542; name = "Guillermo NWDD"; }; @@ -13973,7 +13973,7 @@ xyenon = { name = "XYenon"; email = "i@xyenon.bid"; - github = "xyenon"; + github = "XYenon"; githubId = 20698483; }; xzfc = { @@ -14058,7 +14058,7 @@ yorickvp = { email = "yorickvanpelt@gmail.com"; matrix = "@yorickvp:matrix.org"; - github = "yorickvp"; + github = "yorickvP"; githubId = 647076; name = "Yorick van Pelt"; }; @@ -14195,7 +14195,7 @@ }; zauberpony = { email = "elmar@athmer.org"; - github = "zauberpony"; + github = "elmarx"; githubId = 250877; name = "Elmar Athmer"; }; @@ -14218,7 +14218,7 @@ }; zeratax = { email = "mail@zera.tax"; - github = "ZerataX"; + github = "zeratax"; githubId = 5024958; name = "Jona Abdinghoff"; keys = [{ @@ -14342,7 +14342,7 @@ }; rakesh4g = { email = "rakeshgupta4u@gmail.com"; - github = "rakesh4g"; + github = "Rakesh4G"; githubId = 50867187; name = "Rakesh Gupta"; }; @@ -14372,7 +14372,7 @@ }; matthewcroughan = { email = "matt@croughan.sh"; - github = "matthewcroughan"; + github = "MatthewCroughan"; githubId = 26458780; name = "Matthew Croughan"; }; @@ -14538,7 +14538,7 @@ name = "Josh Hoffer"; email = "jhoffer@sansorgan.es"; matrix = "@princemachiavelli:matrix.org"; - github = "princemachiavelli"; + github = "Princemachiavelli"; githubId = 2730968; keys = [{ fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; From cfdec3d079e912e9a6dab4de9aa6cb6411bad70c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:44:01 +0200 Subject: [PATCH 32/95] maintainers: add missing github details to karolchmist --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c29bec8d3685..36164466faf3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6614,6 +6614,8 @@ }; karolchmist = { email = "info+nix@chmist.com"; + github = "karolchmist"; + githubId = 1927188; name = "karolchmist"; }; kayhide = { From 238ac9597cf194772035ba16e0da57d3d33dbfff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:45:38 +0200 Subject: [PATCH 33/95] maintainers: add missing github handle for nessdoor --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36164466faf3..61e2a9f26231 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9105,6 +9105,7 @@ nessdoor = { name = "Tomas Antonio Lopez"; email = "entropy.overseer@protonmail.com"; + github = "nessdoor"; githubId = 25993494; }; netcrns = { From a4795d32f700ba60afd5749bac6453f519e5963b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:52:17 +0200 Subject: [PATCH 34/95] maintainers: add missing github details to ivan-tkatchev --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61e2a9f26231..4f702e1f3082 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5579,6 +5579,8 @@ }; ivan-tkatchev = { email = "tkatchev@gmail.com"; + github = "ivan-tkatchev"; + githubId = 650601; name = "Ivan Tkatchev"; }; ivanbrennan = { From 251ef9400d201a8cf53c624cb495a6ae257ae70a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:02:37 +0200 Subject: [PATCH 35/95] maintainers: add missing github handle for lux --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4f702e1f3082..cc6dc750b53a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7703,6 +7703,7 @@ }; lux = { email = "lux@lux.name"; + github = "luxferresum"; githubId = 1208273; matrix = "@lux:ontheblueplanet.com"; name = "Lux"; From 079ba6bd0c3546c63d86f90e8f16a5fed083df87 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:05:41 +0200 Subject: [PATCH 36/95] maintainers: add missing github details to vq --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc6dc750b53a..9448db905b4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13559,6 +13559,8 @@ }; vq = { email = "vq@erq.se"; + github = "vq"; + githubId = 230381; name = "Daniel Nilsson"; }; vrinek = { From 0f55ab1bbc027d66c6aa3c21b3aae41bfd3e6c36 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:07:24 +0200 Subject: [PATCH 37/95] maintainers: add missing github details to delta --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9448db905b4e..5942a614755f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3020,6 +3020,8 @@ }; delta = { email = "d4delta@outlook.fr"; + github = "D4Delta"; + githubId = 12224254; name = "Delta"; }; deltadelta = { From 026ffc38bd134294ed01ffaa5fb7b6cfabe04371 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:45:17 +0200 Subject: [PATCH 38/95] maintainers: remove mehandes github account deleted --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5942a614755f..bc56e9a814b5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8239,12 +8239,6 @@ githubId = 1788114; name = "Meghea Iulian"; }; - mehandes = { - email = "niewskici@gmail.com"; - github = "mehandes"; - githubId = 32581276; - name = "Matt Deming"; - }; meisternu = { email = "meister@krutt.org"; github = "meisternu"; From a0718341e60829bee5c41e51796f4786bc98df81 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:49:35 +0200 Subject: [PATCH 39/95] maintainers: remove volth github account deleted --- maintainers/maintainer-list.nix | 6 ------ nixos/modules/hardware/raid/hpsa.nix | 2 +- nixos/tests/xrdp.nix | 2 +- pkgs/applications/editors/fte/default.nix | 2 +- pkgs/applications/file-managers/mucommander/default.nix | 2 +- pkgs/applications/misc/far2l/default.nix | 2 +- .../networking/browsers/captive-browser/default.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/networking/p2p/tixati/default.nix | 2 +- pkgs/applications/networking/p2p/vuze/default.nix | 2 +- pkgs/applications/networking/remote/xrdp/default.nix | 2 +- pkgs/applications/virtualization/virt-top/default.nix | 2 +- pkgs/data/fonts/babelstone-han/default.nix | 2 +- pkgs/data/fonts/liberastika/default.nix | 2 +- pkgs/data/fonts/libertine/default.nix | 2 +- pkgs/desktops/xfce/art/xfwm4-themes/default.nix | 2 +- .../xfce/panel-plugins/xfce4-namebar-plugin/default.nix | 2 +- .../xfce/panel-plugins/xfce4-windowck-plugin/default.nix | 2 +- .../compilers/graalvm/community-edition/mkGraal.nix | 1 - pkgs/development/libraries/half/default.nix | 2 +- pkgs/development/ocaml-modules/benchmark/default.nix | 2 +- pkgs/development/ocaml-modules/curses/default.nix | 2 +- pkgs/development/ocaml-modules/merlin-extend/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-gettext/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 2 +- .../ocaml-modules/ppx_tools_versioned/default.nix | 2 +- pkgs/development/ocaml-modules/ptmap/default.nix | 2 +- pkgs/development/ocaml-modules/rope/default.nix | 2 +- pkgs/development/tools/nailgun/default.nix | 2 +- pkgs/development/tools/ocaml/obuild/default.nix | 2 +- pkgs/servers/sql/postgresql/ext/plv8.nix | 2 +- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 2 +- pkgs/tools/graphics/pngquant/default.nix | 2 +- pkgs/tools/networking/freebind/default.nix | 2 +- pkgs/tools/networking/miredo/default.nix | 2 +- pkgs/tools/networking/reaver-wps-t6x/default.nix | 2 +- pkgs/tools/networking/reaver-wps/default.nix | 2 +- pkgs/tools/networking/xnbd/default.nix | 2 +- pkgs/tools/security/certstrap/default.nix | 2 +- pkgs/tools/security/mkp224o/default.nix | 2 +- 40 files changed, 38 insertions(+), 45 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc56e9a814b5..3a786753b54a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13541,12 +13541,6 @@ githubId = 5604643; name = "Mikhail Volkhov"; }; - volth = { - email = "jaroslavas@volth.com"; - github = "volth"; - githubId = 508305; - name = "Jaroslavas Pocepko"; - }; vonfry = { email = "nixos@vonfry.name"; github = "Vonfry"; diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix index fa6f0b8fc84a..120348a74bfb 100644 --- a/nixos/modules/hardware/raid/hpsa.nix +++ b/nixos/modules/hardware/raid/hpsa.nix @@ -40,7 +40,7 @@ let homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; }; in { diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index 0e1d521c5ace..f277d4b79525 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "xrdp"; meta = with pkgs.lib.maintainers; { - maintainers = [ volth ]; + maintainers = [ ]; }; nodes = { diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index 05841bb1bac2..b4b5e74887c1 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A free text editor for developers"; homepage = "http://fte.sourceforge.net/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 681e2d3eb4e6..a91bb273f3e6 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation { homepage = "http://www.mucommander.com/"; description = "Cross-platform file manager"; license = licenses.gpl3; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 05918b6af39c..f7637534de04 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time - maintainers = with maintainers; [ volth hypersw ]; + maintainers = with maintainers; [ hypersw ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index d764f74b614c..035be9585ddd 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -16,6 +16,6 @@ buildGoPackage rec { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; - maintainers = with maintainers; [ volth ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 5226c9ea3d53..ff5d0403f4a5 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -78,7 +78,7 @@ let so delivering a highly-availabile service on top of a cluster of computers, each of which may be prone to failures. ''; - maintainers = with maintainers; [ volth illustris ]; + maintainers = with maintainers; [ illustris ]; platforms = attrNames sha256; }; }; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index bafbb443458a..ed88546129fb 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index fe8743ee1cd1..6dc00cba9ee0 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://www.vuze.com"; license = licenses.unfree; platforms = platforms.all; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index b8677a2683c0..feb8252c7eda 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -98,7 +98,7 @@ let description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.linux; }; }; diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 8ff90a4150db..54c0bea35922 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A top-like utility for showing stats of virtualized domains"; homepage = "https://people.redhat.com/~rjones/virt-top/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 7f2898db9f1a..e78f00a49756 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -19,6 +19,6 @@ in fetchzip { license = licenses.free; platforms = platforms.all; - maintainers = with maintainers; [ volth emily ]; + maintainers = with maintainers; [ emily ]; }; } diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 26420ab9e6ed..5435a601d147 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -26,6 +26,6 @@ in fetchzip rec { license = licenses.gpl2; platforms = platforms.all; hydraPlatforms = []; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 2120c5965e2f..b3c8fd048b52 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Linux Libertine Fonts"; homepage = "http://linuxlibertine.sf.net"; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; license = licenses.ofl; }; } diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 3665263ede05..aae86985b301 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Themes for Xfce"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ volth ] ++ teams.xfce.members; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index e7f20a0ec7a8..e6f5df643210 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ volth ] ++ teams.xfce.members; + maintainers = with maintainers; [ ] ++ teams.xfce.members; # Does not build with vala 0.48 or later # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 5e5e6c8aa694..7c8cf8e26d9a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ volth ] ++ teams.xfce.members; + maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 02fd986731b1..86de8aae2ef0 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -321,7 +321,6 @@ let license = with licenses; [ upl gpl2Classpath bsd3 ]; maintainers = with maintainers; [ bandresen - volth hlolli glittershark babariviere diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix index c0d11e9ce773..557ed1ffe90e 100644 --- a/pkgs/development/libraries/half/default.nix +++ b/pkgs/development/libraries/half/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "C++ library for half precision floating point arithmetics"; platforms = platforms.all; license = licenses.mit; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index f2a98516c757..0f5722a44acf 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; description = "Benchmark running times of code"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ volth ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index b9006012ae51..e72f4ce0e8b3 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mbacarella/curses"; license = licenses.lgpl21Plus; changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES"; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index 9cb35f34c1c2..b295c0eda0f7 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -19,6 +19,6 @@ buildDunePackage rec { homepage = "https://github.com/let-def/merlin-extend"; description = "SDK to extend Merlin"; license = licenses.mit; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index fa8857f36b35..26f932ff8d7c 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { description = "OCaml Bindings to gettext"; homepage = "https://github.com/gildor478/ocaml-gettext"; license = licenses.lgpl21; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; mainProgram = "ocaml-gettext"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index f4a9e55cc127..c321ca2bcb47 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "OCaml bindings for libvirt"; homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 5200c13d89fd..59ac187a6718 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -19,6 +19,6 @@ buildDunePackage rec { homepage = "https://github.com/let-def/ppx_tools_versioned"; description = "Tools for authors of syntactic tools (such as ppx rewriters)"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index fd59368f82df..a3c0eb55f968 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -25,6 +25,6 @@ buildDunePackage rec { homepage = "https://www.lri.fr/~filliatr/software.en.html"; description = "Maps over integers implemented as Patricia trees"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ volth ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 483aefef12d4..302237c3fe7f 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation ({ inherit (ocaml.meta) platforms; description = ''Ropes ("heavyweight strings") in OCaml''; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ volth ]; + maintainers = with lib.maintainers; [ ]; }; } // param.extra) diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 22041fa545db..d5799b599a2a 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 318e9f517dcf..8a4dce342231 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = ocaml.meta.platforms or [ ]; description = "Simple package build system for OCaml"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ volth ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index eaf9c389e926..ca0dcea84358 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -80,7 +80,7 @@ let self = stdenv.mkDerivation rec { meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; - maintainers = with maintainers; [ volth marsam ]; + maintainers = with maintainers; [ marsam ]; platforms = [ "x86_64-linux" ]; license = licenses.postgresql; }; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index cccafd67f3e6..219efeea1340 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; changelog = "https://github.com/timescale/timescaledb/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ volth marsam ]; + maintainers = with maintainers; [ marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; broken = versionOlder postgresql.version "12"; diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 267f2ae217c1..5faab72d8fbc 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/kornelski/pngquant/raw/${version}/CHANGELOG"; platforms = platforms.unix; license = with licenses; [ gpl3Plus hpnd bsd2 ]; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index 5ba462f15b24..57d5f1136a3a 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/blechschmidt/freebind"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 94565db2076f..d47485f22b1e 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Teredo IPv6 Tunneling Daemon"; homepage = "https://www.remlab.net/miredo/"; license = licenses.gpl2; - maintainers = [ maintainers.volth ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 147eb2c3bf24..4f2c564db597 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/t6x/reaver-wps-fork-t6x"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nico202 volth ]; + maintainers = with maintainers; [ nico202 ]; }; } diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 9e240b98138a..9fe7d88f12c3 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://code.google.com/archive/p/reaver-wps/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nico202 volth ]; + maintainers = with maintainers; [ nico202 ]; }; } diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 348d557da76d..52f332a0e8f8 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.volth ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index 9edd8b3884f8..6bcdf1dbc457 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/square/certstrap"; changelog = "https://github.com/square/certstrap/releases/tag/${src.rev}"; license = licenses.asl20; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 6f836271c0ab..4b9beecb3541 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/"; license = licenses.cc0; platforms = platforms.unix; - maintainers = with maintainers; [ volth ]; + maintainers = with maintainers; [ ]; }; } From eec156df9c7e1941564bedd625e0f7d176d3ac78 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:50:22 +0200 Subject: [PATCH 40/95] maintainers: remove muflax github account deleted --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/compilers/ccl/default.nix | 2 +- pkgs/tools/admin/awscli/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 2 +- pkgs/tools/networking/par2cmdline/default.nix | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3a786753b54a..ae02d6bb1bea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8883,12 +8883,6 @@ githubId = 220262; name = "Ion Mudreac"; }; - muflax = { - email = "mail@muflax.com"; - github = "muflax"; - githubId = 69918; - name = "Stefan Dorn"; - }; multun = { email = "victor.collod@epita.fr"; github = "multun"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index cd8433444963..a17088e015da 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Clozure Common Lisp"; homepage = "https://ccl.clozure.com/"; - maintainers = with maintainers; [ raskin muflax tohl ]; + maintainers = with maintainers; [ raskin tohl ]; platforms = attrNames options; # assembler failures during build, x86_64-darwin broken since 2020-10-14 broken = (stdenv.isDarwin && stdenv.isx86_64); diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 1319a8b42709..4fcd39a8c46f 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -90,6 +90,6 @@ with py.pkgs; buildPythonApplication rec { homepage = "https://aws.amazon.com/cli/"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; - maintainers = with maintainers; [ muflax ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 3908b4984c4d..072166f7a5b0 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation { ''; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ muflax ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 73e12e128567..8ccf5d54ebbf 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { any kind of file. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.muflax ]; + maintainers = [ ]; platforms = platforms.all; }; } From 99466ee39ebc0696e7fa79f0eaddee71819892eb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:51:46 +0200 Subject: [PATCH 41/95] maintainers: remove petabyteboy github account deleted --- maintainers/maintainer-list.nix | 7 ------- maintainers/team-list.nix | 1 - pkgs/applications/audio/giada/default.nix | 2 +- pkgs/applications/misc/tipp10/default.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/development/compilers/jetbrains-jdk/default.nix | 2 +- pkgs/development/libraries/ubus/default.nix | 2 +- pkgs/development/libraries/uci/default.nix | 2 +- pkgs/development/python-modules/adblock/default.nix | 2 +- .../development/python-modules/django-cacheops/default.nix | 2 +- pkgs/development/python-modules/pixelmatch/default.nix | 2 +- pkgs/development/python-modules/pylxd/default.nix | 2 +- pkgs/development/python-modules/pyshark/default.nix | 2 +- pkgs/games/mindustry/default.nix | 2 +- pkgs/games/xonotic/default.nix | 2 +- pkgs/os-specific/linux/unscd/default.nix | 2 +- pkgs/servers/gortr/default.nix | 2 +- pkgs/servers/mastodon/default.nix | 2 +- pkgs/servers/monitoring/prometheus/jitsi-exporter.nix | 2 +- pkgs/servers/pleroma/default.nix | 2 +- pkgs/tools/graphics/viu/default.nix | 2 +- pkgs/tools/misc/claws/default.nix | 2 +- pkgs/tools/misc/coreboot-utils/default.nix | 2 +- pkgs/tools/misc/duf/default.nix | 2 +- pkgs/tools/networking/netifd/default.nix | 2 +- pkgs/tools/networking/tinyfecvpn/default.nix | 2 +- 26 files changed, 24 insertions(+), 32 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ae02d6bb1bea..eb7003063067 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9901,13 +9901,6 @@ githubId = 152312; name = "Periklis Tsirakidis"; }; - petabyteboy = { - email = "milan@petabyte.dev"; - matrix = "@milan:petabyte.dev"; - github = "petabyteboy"; - githubId = 3250809; - name = "Milan Pässler"; - }; petercommand = { email = "petercommand@gmail.com"; github = "petercommand"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 413a6f9b1d7a..f78246b50e8b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -325,7 +325,6 @@ with lib.maintainers; { jitsi = { members = [ cleeyv - petabyteboy ryantm yuka ]; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 4b7b760db355..15eccc46943f 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 37aafb7827ef..76ea8fb7fc0e 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { description = "Learn and train typing with the ten-finger system"; homepage = "https://gitlab.com/tipp10/tipp10"; license = licenses.gpl2Only; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fefa884c2a62..1604188773d1 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -40,7 +40,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; + maintainers = with maintainers; [ infinisil felixsinger ]; platforms = platforms.linux; }; }); diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index bfff07aabcb2..b49898e9292a 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -26,7 +26,7 @@ openjdk11.overrideAttrs (oldAttrs: rec { ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk11.meta) license platforms mainProgram; - maintainers = with maintainers; [ edwtjo petabyteboy ]; + maintainers = with maintainers; [ edwtjo ]; }; passthru = oldAttrs.passthru // { home = "${jetbrains.jdk}/lib/openjdk"; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 4bbec39291a9..49aebdd7dca2 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index 49aba6cd1831..c3e61e8d22a0 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 3655c7456e58..3c97f2ff802c 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Brave's adblocking library"; homepage = "https://github.com/ArniDagur/python-adblock/"; - maintainers = with maintainers; [ petabyteboy dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; license = with licenses; [ asl20 /* or */ mit ]; }; } diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 6c938870251f..bdb10688924d 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "A slick ORM cache with automatic granular event-driven invalidation for Django"; homepage = "https://github.com/Suor/django-cacheops"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix index 836c3cd38ab2..e09f0b32ff20 100644 --- a/pkgs/development/python-modules/pixelmatch/default.nix +++ b/pkgs/development/python-modules/pixelmatch/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Pixel-level image comparison library"; homepage = "https://github.com/whtsky/pixelmatch-py"; license = licenses.isc; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 5e8016ddaee4..3373daf8a796 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "A Python library for interacting with the LXD REST API"; homepage = "https://pylxd.readthedocs.io/en/latest/"; license = licenses.asl20; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index a0ba11a4a370..8585ffb23271 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors"; homepage = "https://github.com/KimiNewt/pyshark/"; license = licenses.mit; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 9edc17f0bc08..680d341d335b 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation rec { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz petabyteboy ]; + maintainers = with maintainers; [ fgaz ]; platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ab9cc14dc9bd..525beb5f98ce 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -41,7 +41,7 @@ let ''; homepage = "https://www.xonotic.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ astsmtl zalakain petabyteboy ]; + maintainers = with lib.maintainers; [ astsmtl zalakain ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/os-specific/linux/unscd/default.nix index 1f974029b017..82b8c7076271 100644 --- a/pkgs/os-specific/linux/unscd/default.nix +++ b/pkgs/os-specific/linux/unscd/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Less buggy replacement for the glibc name service cache daemon"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 44057033bd59..e30f336df0df 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "The RPKI-to-Router server used at Cloudflare"; homepage = "https://github.com/cloudflare/gortr/"; license = licenses.gpl3; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 0b7304a32edd..17ecdc60ef93 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -118,6 +118,6 @@ stdenv.mkDerivation rec { homepage = "https://joinmastodon.org"; license = licenses.agpl3Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ petabyteboy happy-river erictapen izorkin ]; + maintainers = with maintainers; [ happy-river erictapen izorkin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix index b68b1681919b..68e993089482 100644 --- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "Export Jitsi Videobridge metrics to Prometheus"; homepage = "https://git.xsfx.dev/prometheus/jitsiexporter"; license = licenses.mit; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 99dd29db1471..3bea304ebc9d 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -204,7 +204,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; - maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka kloenk ]; + maintainers = with maintainers; [ ninjatrappeur yuka kloenk ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 104a4a81282a..34bec2159095 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "A command-line application to view images from the terminal written in Rust"; homepage = "https://github.com/atanunq/viu"; license = licenses.mit; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index c28272e8bfa5..101c1f271e33 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { description = "Interactive command line client for testing websocket servers"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 783af7fda718..9132c9502a78 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = with licenses; [ gpl2Only gpl2Plus ]; - maintainers = with maintainers; [ petabyteboy felixsinger yuka ]; + maintainers = with maintainers; [ felixsinger yuka ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 3bcb4cdfeb29..ad265ee85484 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "Disk Usage/Free Utility"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ petabyteboy penguwin SuperSandro2000 ]; + maintainers = with maintainers; [ penguwin SuperSandro2000 ]; }; } diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index dc343e563a75..315d58403825 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.linux; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 4587d40a5197..4b283a5eccd8 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "A VPN Designed for Lossy Links, with Build-in Forward Error Correction(FEC) Support"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ ]; }; } From 92531d8585288da313ecffd2a0b200e1576bb469 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:52:42 +0200 Subject: [PATCH 42/95] maintainers: remove bloomvdomino github account deleted --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/audio/mpdevil/default.nix | 2 +- pkgs/applications/audio/muso/default.nix | 2 +- pkgs/applications/misc/bottles/default.nix | 2 +- pkgs/data/icons/kora-icon-theme/default.nix | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb7003063067..aa5d5953d5d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1670,12 +1670,6 @@ githubId = 37907; name = "Julian Stecklina"; }; - bloomvdomino = { - name = "Laura Fäßler"; - email = "0x@ytex.de"; - github = "bloomvdomino"; - githubId = 33204710; - }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 3676697f16e8..f8fac7d14a9f 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -48,6 +48,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/SoongNoonien/mpdevil"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 293271ad6cca..29a97b94dcac 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "An automatic music sorter (based on ID3 tags)"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index a5514d431de1..bf11f3e7f42b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bloomvdomino psydvl shamilton ]; + maintainers = with maintainers; [ psydvl shamilton ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 978adbd257a6..4de65c838626 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bikass/kora"; license = with licenses; [ gpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ ]; }; } From 8cb1366872c7dc8559b3664d2d2eef1bd741b327 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:53:30 +0200 Subject: [PATCH 43/95] maintainers: remove fuwa github account deleted --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/blockchains/wownero/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aa5d5953d5d6..263e7f65f0b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4483,12 +4483,6 @@ githubId = 893115; name = "Mateusz Kowalczyk"; }; - fuwa = { - email = "echowss@gmail.com"; - github = "fuwa0529"; - githubId = 40521440; - name = "Haruka Akiyama"; - }; fuzen = { email = "me@fuzen.cafe"; github = "Fuzen-py"; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 9efdd6c56dfd..61945895eef7 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://wownero.org/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ fuwa ]; + maintainers = with maintainers; [ ]; }; } From 91b724c66d81daa60e6e07a285cedcf47d3bd946 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:54:19 +0200 Subject: [PATCH 44/95] maintainers: remove danharaj github account deleted --- maintainers/maintainer-list.nix | 6 ------ .../science/machine-learning/sc2-headless/default.nix | 2 +- pkgs/development/python-modules/absl-py/default.nix | 2 +- pkgs/development/python-modules/mpyq/default.nix | 2 +- pkgs/development/python-modules/portpicker/default.nix | 2 +- pkgs/development/python-modules/pysc2/default.nix | 2 +- .../development/python-modules/s2clientprotocol/default.nix | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 263e7f65f0b9..15f84eebc572 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2791,12 +2791,6 @@ githubId = 24708079; name = "Dan Eads"; }; - danharaj = { - email = "dan@obsidian.systems"; - github = "danharaj"; - githubId = 23366017; - name = "Dan Haraj"; - }; danielbarter = { email = "danielbarter@gmail.com"; github = "danielbarter"; diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 97cad175ac17..d96d71695e75 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation rec { url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; free = false; }; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index bda6c950d598..60c3bcc4e9ce 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Abseil Python Common Libraries"; homepage = "https://github.com/abseil/abseil-py"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix index 5660e1b0dc5c..94c907c676c4 100644 --- a/pkgs/development/python-modules/mpyq/default.nix +++ b/pkgs/development/python-modules/mpyq/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "A Python library for extracting MPQ (MoPaQ) files."; homepage = "https://github.com/eagleflo/mpyq"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index faf3b9581628..a0ff0f854973 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Library to choose unique available network ports"; homepage = "https://github.com/google/python_portpicker"; license = licenses.asl20; - maintainers = with maintainers; [ danharaj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 9d0bef8e19dc..10040928ad24 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -58,6 +58,6 @@ buildPythonPackage { homepage = "https://github.com/deepmind/pysc2"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index 5fbf4b6fab2c..43c89aa9e776 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "StarCraft II - client protocol."; homepage = "https://github.com/Blizzard/sc2client-proto"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ danharaj ]; + maintainers = with lib.maintainers; [ ]; }; } From ff2925fe6be230f18c0a7176579797ad0ea4f838 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:58:24 +0200 Subject: [PATCH 45/95] maintainers: remove piotr has not contributed since nixpkgs migrated to git --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/misc/bibletime/default.nix | 2 +- pkgs/development/libraries/sword/default.nix | 2 +- pkgs/games/crack-attack/default.nix | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 15f84eebc572..f6d7fd7304ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10029,10 +10029,6 @@ fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; - piotr = { - email = "ppietrasa@gmail.com"; - name = "Piotr Pietraszkiewicz"; - }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index f55b6ef79143..b08c418e1e08 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -59,6 +59,6 @@ mkDerivation rec { homepage = "http://www.bibletime.info/"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.piotr ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 35c1e6e15e29..8871a66fd8c9 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { texts in around 100 languages. ''; license = licenses.gpl2; - maintainers = with maintainers; [ piotr AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index fb13ce8c1638..69395e1c44aa 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/crack-attack/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.piotr ]; + maintainers = [ ]; }; } From be1aefac05ef7d0bda4d69374edf4822ffa78d99 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 00:58:42 +0200 Subject: [PATCH 46/95] maintainers: remove elyhaka github account deleted --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/wofi/default.nix | 2 +- pkgs/data/themes/pop-gtk/default.nix | 2 +- pkgs/development/libraries/libpam-wrapper/default.nix | 2 +- pkgs/tools/security/fprintd/default.nix | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f6d7fd7304ca..b87fc7961192 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3748,12 +3748,6 @@ githubId = 1365692; name = "Will Fancher"; }; - elyhaka = { - email = "elyhaka@protonmail.com"; - github = "Elyhaka"; - githubId = 57923898; - name = "Elyhaka"; - }; emmabastas = { email = "emma.bastas@protonmail.com"; matrix = "@emmabastas:matrix.org"; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index d8af28093b9e..25cbac7d229b 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3Only; - maintainers = with maintainers; [ elyhaka ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 022e1dd81b2f..de2b92be05f2 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pop-os/gtk-theme"; license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ]; platforms = platforms.linux; - maintainers = with maintainers; [ elyhaka ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix index 7d026eb5a091..10d5c98b6687 100644 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wrapper for testing PAM modules"; homepage = "https://cwrap.org/pam_wrapper.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.elyhaka ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 501481957543..d3b1836c9400 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar elyhaka ]; + maintainers = with maintainers; [ abbradar ]; }; } From 3b5f12551546cfb019b81c824e299a1e1d383bcf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:04:01 +0200 Subject: [PATCH 47/95] maintainers: remove metabar no github account + only commit is 78c052e91a3dceb9e13b1593031b2a12746eafff --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/science/biology/diamond/default.nix | 2 +- pkgs/applications/science/biology/ecopcr/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b87fc7961192..4f56247878ce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8239,10 +8239,6 @@ githubId = 6412377; name = "Samuel Ruprecht"; }; - metabar = { - email = "softs@metabarcoding.org"; - name = "Celine Mercier"; - }; kira-bruneau = { email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 1221684f15c6..86b239c93843 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { fullName = "University of Tuebingen, Benjamin Buchfink"; url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; }; - maintainers = [ maintainers.metabar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 4ed11857a30e..4a6b093e1d0b 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.metabarcoding.org/obitools/ecopcr/wikis/home"; license = licenses.cecill20; - maintainers = [ maintainers.metabar ]; + maintainers = [ ]; }; } From 59d8f2b1cd0c4a9cf1e68ab12d0624cba2b7b995 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:06:48 +0200 Subject: [PATCH 48/95] maintainers: remove Nate-Devv no github account + only two commits 251a1ccf55d34aa0da7ecc4ac96f9f741e343ceb and 09f366a360fee8fae4d0e1aa642725738094ea64 --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/tools/solarus-quest-editor/default.nix | 2 +- pkgs/games/solarus/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4f56247878ce..72b3714a8a3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8941,10 +8941,6 @@ fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; }]; }; - Nate-Devv = { - email = "natedevv@gmail.com"; - name = "Nathan Moore"; - }; nathanruiz = { email = "nathanruiz@protonmail.com"; github = "nathanruiz"; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 159fe3d99eb7..60c2bd188ded 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ''; homepage = "http://www.solarus-games.org"; license = licenses.gpl3; - maintainers = [ maintainers.Nate-Devv ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index c42464feaed2..9dc0e1863cfa 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ''; homepage = "http://www.solarus-games.org"; license = licenses.gpl3; - maintainers = [ maintainers.Nate-Devv ]; + maintainers = [ ]; platforms = platforms.linux; }; From 93039509cf31ee3ed70c0ac550b9430f36108805 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:12:48 +0200 Subject: [PATCH 49/95] maintainers: remove dasuxullebt no github handle linked. github account with same name has not had activity for years --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/audio/gbsplay/default.nix | 2 +- pkgs/applications/networking/remote/teamviewer/default.nix | 2 +- pkgs/tools/bluetooth/bluez-tools/default.nix | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 72b3714a8a3a..90e528a42014 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2860,10 +2860,6 @@ githubId = 7589338; name = "Daniel Șerbănescu"; }; - dasuxullebt = { - email = "christoph.senjak@googlemail.com"; - name = "Christoph-Simon Senjak"; - }; datafoo = { email = "34766150+datafoo@users.noreply.github.com"; github = "datafoo"; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 3d280ca72abd..59253af2ad68 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Gameboy sound player"; license = licenses.gpl1; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ dasuxullebt ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 5aa6d6220957..44ce12aeeb48 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -100,6 +100,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga dasuxullebt jraygauthier ]; + maintainers = with maintainers; [ jagajaga jraygauthier ]; }; } diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index af76991436fd..271daed01653 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line bluetooth manager for Bluez5"; license = licenses.gpl2; - maintainers = [ maintainers.dasuxullebt ]; + maintainers = [ ]; platforms = platforms.unix; }; From cfd9d6405bfdebcfdc34af41c92176efa3d228eb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:14:02 +0200 Subject: [PATCH 50/95] maintainers: remove nslqqq no github account --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/python-modules/linode/default.nix | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 90e528a42014..c8495e449be0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9371,10 +9371,6 @@ githubId = 20391; name = "Nahum Shalman"; }; - nslqqq = { - email = "nslqqq@gmail.com"; - name = "Nikita Mikhailov"; - }; nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne"; diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index 3433c0e5717c..c7a60201ee88 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -19,7 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/ghickman/linode"; description = "A thin python wrapper around Linode's API"; license = licenses.mit; - maintainers = with maintainers; [ nslqqq ]; + maintainers = with maintainers; [ ]; }; - } From 213007a351879ee1b80abc13a3d69136c37af9a9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:16:20 +0200 Subject: [PATCH 51/95] maintainers: remove lattfein no github account --- maintainers/maintainer-list.nix | 13 ------------- pkgs/applications/networking/station/default.nix | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c8495e449be0..e75f18766775 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7110,19 +7110,6 @@ githubId = 621759; name = "Lassulus"; }; - lattfein = { - email = "lattfein@gmail.com"; - # Their GitHub account was deleted. - # - # See: https://github.com/NixOS/nixpkgs/pull/69007 where this - # was added but is now owned by a ghost. - # - # Possibly the username lattfein (currently github ID 56827487) is - # owned by the same person, but we should confirm before adding - # the GitHub name or ID back. - # github = "lattfein"; - name = "Koki Yasuno"; - }; layus = { email = "layus.on@gmail.com"; github = "layus"; diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 9409a3c5fcdd..f60bcf8b7bef 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -36,6 +36,6 @@ in appimageTools.wrapType2 rec { homepage = "https://getstation.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ lattfein ]; + maintainers = with maintainers; [ ]; }; } From 50084dde4538c3ad9444e8a15220fa4789d3e27b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:24:25 +0200 Subject: [PATCH 52/95] maintainers: remove drewkett no github handle linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/python-modules/queuelib/default.nix | 2 +- pkgs/development/python-modules/scrapy/default.nix | 2 +- pkgs/development/python-modules/w3lib/default.nix | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e75f18766775..661ccd8f8449 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3363,10 +3363,6 @@ githubId = 6199462; name = "Dmytro Rets"; }; - drewkett = { - email = "burkett.andrew@gmail.com"; - name = "Andrew Burkett"; - }; drewrisinger = { email = "drisinger+nixpkgs@gmail.com"; github = "drewrisinger"; diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index cd83914669e5..71e09ef98ed5 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "A collection of persistent (disk-based) queues for Python"; homepage = "https://github.com/scrapy/queuelib"; license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 70feaa7108e2..44c86cc47a29 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -135,7 +135,7 @@ buildPythonPackage rec { homepage = "https://scrapy.org/"; changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ drewkett marsam ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index a626bdd6ec02..d7074269e6a9 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "A library of web-related functions"; homepage = "https://github.com/scrapy/w3lib"; license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; + maintainers = with maintainers; [ ]; }; } From 246a4998764cb0f50d7918431658bea9ed36c67f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:25:14 +0200 Subject: [PATCH 53/95] maintainers: remove msackman no github account --- maintainers/maintainer-list.nix | 4 ---- pkgs/tools/networking/ndjbdns/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 661ccd8f8449..8eae2ef876d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8733,10 +8733,6 @@ githubId = 839693; name = "Ingolf Wanger"; }; - msackman = { - email = "matthew@wellquite.org"; - name = "Matthew Sackman"; - }; mschneider = { email = "markus.schneider.sic+nix@gmail.com"; name = "Markus Schneider"; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 651cbab86d93..ad3bf6752786 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; homepage = "http://pjp.dgplug.org/ndjbdns/"; license = licenses.gpl2; - maintainers = [ maintainers.msackman ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; From 9966a132db0946702b0bd3ca3114ec02154ab53a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:26:18 +0200 Subject: [PATCH 54/95] maintainers: remove mschneider no github account --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/window-managers/leftwm/default.nix | 2 +- pkgs/data/icons/flat-remix-icon-theme/default.nix | 2 +- pkgs/servers/rpiplay/default.nix | 2 +- pkgs/tools/backup/zfs-autobackup/default.nix | 2 +- pkgs/tools/misc/mons/default.nix | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8eae2ef876d5..fe7d3db80b19 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8733,10 +8733,6 @@ githubId = 839693; name = "Ingolf Wanger"; }; - mschneider = { - email = "markus.schneider.sic+nix@gmail.com"; - name = "Markus Schneider"; - }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index c140b82dec92..c89e140f94e5 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ mschneider ]; + maintainers = with maintainers; [ ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index a72321ea304c..b6fa4b258395 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -39,6 +39,6 @@ stdenvNoCC.mkDerivation rec { license = with licenses; [ gpl3Only ]; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux platforms = platforms.linux; - maintainers = with maintainers; [ mschneider ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix index afcf17568b7e..5bcb9267f484 100644 --- a/pkgs/servers/rpiplay/default.nix +++ b/pkgs/servers/rpiplay/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FD-/RPiPlay"; description = "An open-source implementation of an AirPlay mirroring server."; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mschneider ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index f6a684084661..92f371ca9c32 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -28,6 +28,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/psy0rz/zfs_autobackup"; description = "ZFS backup, replicationand snapshot tool"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mschneider ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix index 923c61532c6f..e9bd96b41b5e 100644 --- a/pkgs/tools/misc/mons/default.nix +++ b/pkgs/tools/misc/mons/default.nix @@ -89,7 +89,7 @@ resholve.mkDerivation rec { description = "POSIX Shell script to quickly manage 2-monitors display"; homepage = "https://github.com/Ventto/mons.git"; license = licenses.mit; - maintainers = with maintainers; [ mschneider thiagokokada ]; + maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; }; } From 0d5d9c159b1a7c7a62b3266e8b58e9b27d66964f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:26:43 +0200 Subject: [PATCH 55/95] maintainers: remove jwilberding no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/ocaml-modules/atd/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe7d3db80b19..f560b356d8be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6461,10 +6461,6 @@ githubId = 46386452; name = "Jeroen Wijenbergh"; }; - jwilberding = { - email = "jwilberding@afiniate.com"; - name = "Jordan Wilberding"; - }; jwoudenberg = { email = "nixpkgs@jasperwoudenberg.com"; github = "jwoudenberg"; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 81b9567fcdc4..ae0bbf36b214 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { description = "Syntax for cross-language type definitions"; homepage = "https://github.com/mjambon/atd"; license = licenses.mit; - maintainers = with maintainers; [ aij jwilberding ]; + maintainers = with maintainers; [ aij ]; mainProgram = "atdcat"; }; } From 19e6ace19fa5aaf7b854306dd8742f15c4d5c236 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:28:05 +0200 Subject: [PATCH 56/95] maintainers: remove epitrochoid no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/window-managers/bspwm/default.nix | 2 +- pkgs/data/fonts/gohufont/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f560b356d8be..d274cbd93e93 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3796,10 +3796,6 @@ githubId = 5085029; name = "Emanuele Peruffo"; }; - epitrochoid = { - email = "mpcervin@uncg.edu"; - name = "Mabry Cervin"; - }; equirosa = { email = "eduardo@eduardoquiros.com"; github = "equirosa"; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index e7c0eecbf82e..53807e65a3cb 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager based on binary space partitioning"; homepage = "https://github.com/baskerville/bspwm"; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index f28e3d5ba619..e72bed4ae410 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://font.gohu.org/"; license = licenses.wtfpl; - maintainers = with maintainers; [ epitrochoid rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } From e966ab3965a656efdd40b6ae0d8cec6183972edc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:29:38 +0200 Subject: [PATCH 57/95] maintainers: remove all what? --- maintainers/maintainer-list.nix | 4 ---- pkgs/top-level/make-tarball.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d274cbd93e93..2a2cae15ad0f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -578,10 +578,6 @@ githubId = 11599075; name = "Pierre-Louis Braun"; }; - all = { - email = "nix-commits@lists.science.uu.nl"; - name = "Nix Committers"; - }; allonsy = { email = "linuxbash8@gmail.com"; github = "allonsy"; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index a63432236471..6858e37fabeb 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -81,6 +81,6 @@ pkgs.releaseTools.sourceTarball { ''; meta = { - maintainers = [ pkgs.lib.maintainers.all ]; + maintainers = [ ]; }; } From e59cb525caf1aa7ebb712615d28f93d1f02e77e9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:30:45 +0200 Subject: [PATCH 58/95] maintainers: remove nfjinjing no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/tools/networking/shadowsocks-libev/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2a2cae15ad0f..f8fbaf171453 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9064,10 +9064,6 @@ githubId = 6391776; name = "Nikita Voloboev"; }; - nfjinjing = { - email = "nfjinjing@gmail.com"; - name = "Jinjing Wang"; - }; ngiger = { email = "niklaus.giger@member.fsf.org"; github = "ngiger"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index b0a24b539c2b..0584184a675e 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/shadowsocks/shadowsocks-libev"; license = licenses.gpl3Plus; - maintainers = [ maintainers.nfjinjing ]; + maintainers = [ ]; platforms = platforms.all; }; } From 4272b6439b874679fcc58fc3af9c58b9251eadc1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:31:39 +0200 Subject: [PATCH 59/95] maintainers: remove willtim no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/misc/copyq/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f8fbaf171453..cfe024e2b330 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13607,10 +13607,6 @@ githubId = 20464732; name = "Willi Butz"; }; - willtim = { - email = "tim.williams.public@gmail.com"; - name = "Tim Philip Williams"; - }; willcohen = { email = "willcohen@users.noreply.github.com"; github = "willcohen"; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 763b8bd34d11..d672df00d79f 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; - maintainers = with maintainers; [ willtim artturin ]; + maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. # OSX build requires QT5. platforms = platforms.linux; From 0aac41a5d98ea1410f2039d6c8eabc70a8904e2a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:32:05 +0200 Subject: [PATCH 60/95] maintainers: remove winden no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/science/electronics/verilog/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cfe024e2b330..5996c05b0b0c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13613,10 +13613,6 @@ githubId = 5185341; name = "Will Cohen"; }; - winden = { - email = "windenntw@gmail.com"; - name = "Antonio Vargas Gonzalez"; - }; winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 4cb8048df675..0aa9091a86d2 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; homepage = "http://iverilog.icarus.com/"; # https does not work license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ winden thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; }; } From a2e2f9128d11246e690aee4a2e2b2045ac1d1204 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:32:44 +0200 Subject: [PATCH 61/95] maintainers: remove markWot no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/tools/networking/cntlm/default.nix | 1 - pkgs/tools/security/radamsa/default.nix | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5996c05b0b0c..ec017f963ad6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7844,10 +7844,6 @@ githubId = 26470037; name = "Markus Kowalewski"; }; - markWot = { - email = "markus@wotringer.de"; - name = "Markus Wotringer"; - }; marijanp = { name = "Marijan Petričević"; email = "marijan.petricevic94@gmail.com"; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index fdfac8fdcbc2..a3b0b9ac5544 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.qknight - maintainers.markWot maintainers.carlosdagos ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 2ddbc4034926..c8b084e1e312 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; homepage = "https://gitlab.com/akihe/radamsa"; - maintainers = [ lib.maintainers.markWot ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } From 330f745f6f133f86f1f2ffd6d6c06d115fdf49e1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:33:15 +0200 Subject: [PATCH 62/95] maintainers: remove skrzyp no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/graphics/ahoviewer/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec017f963ad6..6e5431ddd957 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11750,10 +11750,6 @@ githubId = 266500; name = "Sven Keidel"; }; - skrzyp = { - email = "jot.skrzyp@gmail.com"; - name = "Jakub Skrzypnik"; - }; skykanin = { email = "skykanin@users.noreply.github.com"; github = "skykanin"; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 0459d1d04ac2..d903ce1adf8e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = with maintainers; [ skrzyp xzfc ]; + maintainers = with maintainers; [ xzfc ]; license = licenses.mit; # Unintentionally not working on Darwin: # https://github.com/ahodesuka/ahoviewer/issues/62 From a8517f95b85579d7a6c29d2d4d726f1078c68082 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:37:47 +0200 Subject: [PATCH 63/95] maintainers: remove joelteon no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/tools/cdecl/default.nix | 2 +- .../darwin/apple-source-releases/IOKit/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e5431ddd957..423b513490c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6116,10 +6116,6 @@ githubId = 336631; name = "Joel Moberg"; }; - joelteon = { - email = "me@joelt.io"; - name = "Joel Taylor"; - }; joepie91 = { email = "admin@cryto.net"; matrix = "@joepie91:pixie.town"; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 7eefc4fc92d0..48870c7d2df1 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator English -- C/C++ declarations"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [joelteon]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index 085d223bd04d..b413744677d2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -183,7 +183,7 @@ appleDerivation' stdenv { ''; meta = with lib; { - maintainers = with maintainers; [ joelteon copumpkin ]; + maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; }; From 45ec5898cbe01554bc918b6411a85098c2017f78 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:40:02 +0200 Subject: [PATCH 64/95] maintainers: remove tstrobel was ts468 on github afaict and was actually a committer, but that account hasn't been active since early 2018 --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/editors/rednotebook/default.nix | 2 +- pkgs/applications/misc/diffpdf/default.nix | 2 +- pkgs/applications/misc/tpmmanager/default.nix | 2 +- pkgs/applications/office/ib/controller/default.nix | 2 +- pkgs/applications/office/ib/tws/default.nix | 2 +- pkgs/applications/office/moneyplex/default.nix | 2 +- .../virtualization/driver/win-pvdrivers/default.nix | 2 +- pkgs/applications/virtualization/driver/win-qemu/default.nix | 2 +- .../driver/win-signed-gplpv-drivers/default.nix | 4 ++-- pkgs/applications/virtualization/driver/win-spice/default.nix | 2 +- .../applications/virtualization/driver/win-virtio/default.nix | 2 +- pkgs/applications/virtualization/qboot/default.nix | 2 +- pkgs/applications/virtualization/seabios/default.nix | 2 +- pkgs/applications/virtualization/xen/generic.nix | 2 +- pkgs/build-support/templaterpm/default.nix | 2 +- pkgs/desktops/enlightenment/econnman/default.nix | 2 +- pkgs/desktops/enlightenment/efl/default.nix | 2 +- pkgs/desktops/enlightenment/enlightenment/default.nix | 2 +- pkgs/desktops/enlightenment/terminology/default.nix | 2 +- pkgs/development/libraries/gstreamer/vaapi/default.nix | 2 +- pkgs/development/libraries/libHX/default.nix | 2 +- pkgs/development/libraries/neardal/default.nix | 2 +- pkgs/development/python-modules/python-efl/default.nix | 2 +- pkgs/development/python-modules/toposort/default.nix | 2 +- pkgs/misc/screensavers/xtrlock-pam/default.nix | 2 +- pkgs/os-specific/linux/ima-evm-utils/default.nix | 2 +- pkgs/os-specific/linux/miraclecast/default.nix | 2 +- pkgs/os-specific/linux/pam_mount/default.nix | 2 +- pkgs/servers/neard/default.nix | 2 +- pkgs/servers/web-apps/restya-board/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/X11/xpra/libfakeXinerama.nix | 2 +- pkgs/tools/misc/snapper/default.nix | 2 +- pkgs/tools/networking/dnscrypt-wrapper/default.nix | 2 +- pkgs/tools/security/aide/default.nix | 2 +- pkgs/tools/security/omapd/default.nix | 2 +- pkgs/tools/security/opencryptoki/default.nix | 2 +- pkgs/tools/security/sbsigntool/default.nix | 2 +- pkgs/tools/security/simple-tpm-pk11/default.nix | 2 +- pkgs/tools/security/tpm-luks/default.nix | 2 +- 41 files changed, 41 insertions(+), 45 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 423b513490c7..d181178f751d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13000,10 +13000,6 @@ githubId = 15064765; name = "tshaynik"; }; - tstrobel = { - email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; - name = "Thomas Strobel"; - }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 76c94693d24b..d7746ac17838 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej tstrobel ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 0eb432bc734d..370f41b1b831 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 4523168314ae..48ff9675a78d 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 5f84c95b9d38..6df00fc174ed 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ib-controller/ib-controller"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index f76b38aadb34..24c8cafcdda5 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://www.interactivebrokers.com"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 742e4dc9e293..08d926a6d5e2 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Moneyplex online banking software"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.unfree; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index 75cf99caf861..903eb132738a 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Xen Subproject: Windows PV Driver"; homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index a4cd8dacc449..c442d978737e 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Windows QEMU Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index 8ba02d940216..7a5cd39a1840 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation { Certificate obtained from the VeriSign CA. ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.gpl2; }; -} + } diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 0cf8e06c3115..10668afd7eb4 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod + maintainers = [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 060cc4b4ebf6..ec8e1e84145b 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Windows VirtIO Drivers"; homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; license = [ licenses.bsd3 ]; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index c7a3620d644e..985f7e469e3e 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index c6442b57a421..c870abc30282 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index c85e70116682..cde71d2b87fa 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation (rec { + "\nIncludes:\n" + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}."); platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; + maintainers = with lib.maintainers; [ eelco oxij ]; license = lib.licenses.gpl2; # https://xenbits.xen.org/docs/unstable/support-matrix.html knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [ diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index c98716a3fedb..56c543e8a930 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create templates of nix expressions from RPM .spec files"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; hydraPlatforms = []; }; diff --git a/pkgs/desktops/enlightenment/econnman/default.nix b/pkgs/desktops/enlightenment/econnman/default.nix index d593b5cdcdcd..5d3e39b8b01e 100644 --- a/pkgs/desktops/enlightenment/econnman/default.nix +++ b/pkgs/desktops/enlightenment/econnman/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://enlightenment.org/"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members; + maintainers = with lib.maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; }; } diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 21b31dfa6a79..7c0832a07f44 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -208,6 +208,6 @@ stdenv.mkDerivation rec { homepage = "https://enlightenment.org/"; license = with licenses; [ bsd2 lgpl2Only licenses.zlib ]; platforms = platforms.linux; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members; + maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; }; } diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 781d6a4daeed..3ce2592598f5 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://www.enlightenment.org"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members; + maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; }; } diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 54f619b31174..e676e8543ee5 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.enlightenment.org/about-terminology"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members; + maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 1f144b6985fd..80bcc43c5878 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Set of VAAPI GStreamer Plug-ins"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index e9f117577e49..8b9190fc8274 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { and functions commonly needed, such as maps, deques, linked lists, string formatting and autoresizing, option and config file parsing, type checking casts and more. ''; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl21Plus wtfpl ]; }; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 29f2bed7ecf9..94014d0a4e98 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; homepage = "https://01.org/linux-nfc"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 24e076d1391f..01ce4bc1260c 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members; + maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; }; } diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index e72ed9294e84..603afe3ad59c 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "A topological sort algorithm"; homepage = "https://pypi.python.org/pypi/toposort/"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ac4c8197e554..9159bfe075a9 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index afd46f0d9e8f..aeafd68e7080 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/linux-ima/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ tstrobel ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index b5efaa40afe9..7b502fa4adee 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Connect external monitors via Wi-Fi"; homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 5e4e15c364bd..12209d1b88f0 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "PAM module to mount volumes for a user session"; homepage = "https://pam-mount.sourceforge.net/"; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index d41603873e9f..1115a74844e3 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Near Field Communication manager"; homepage = "https://01.org/linux-nfc"; license = licenses.gpl2Only; - maintainers = with maintainers; [ jtojnar tstrobel ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index e260702d5759..5f558e9097b8 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Web-based kanban board"; license = licenses.osl3; homepage = "https://restya.com"; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 21e37a2eb405..5d0170ec735c 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -206,6 +206,6 @@ in buildPythonApplication rec { description = "Persistent remote applications for X"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel offline numinit mvnetbiz ]; + maintainers = with maintainers; [ offline numinit mvnetbiz ]; }; } diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index bad43c39eef4..414a7c877bfb 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "http://xpra.org/"; description = "fakeXinerama for Xpra"; platforms = platforms.linux; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 1df8492a8e2e..f24b4d796fec 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "http://snapper.io"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ tstrobel markuskowa ]; + maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 88d753baf5b6..ddec798a8467 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A tool for adding dnscrypt support to any name resolver"; homepage = "https://dnscrypt.info/"; license = licenses.isc; - maintainers = with maintainers; [ tstrobel joachifm ]; + maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 0724a756b919..b34be9a37710 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://aide.github.io/"; description = "A file and directory integrity checker"; license = licenses.gpl2Plus; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 7ce377e601a3..c2d911372eb0 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://code.google.com/archive/p/omapd/"; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 0825708f71fd..140f032a5fde 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index a6ec9ae7b602..4c548bbd535f 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for maintaining UEFI signature databases"; homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; - maintainers = with maintainers; [ hmenke tstrobel ]; + maintainers = with maintainers; [ hmenke ]; platforms = [ "x86_64-linux" ]; # Broken on i686 license = licenses.gpl3; }; diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index 4d5c020ad422..7d879aa497de 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/ThomasHabets/simple-tpm-pk11"; license = licenses.asl20; - maintainers = with maintainers; [ tstrobel ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 6063cdecc67a..16d88c9196b8 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { description = "LUKS key storage in TPM NVRAM"; homepage = "https://github.com/shpedoikal/tpm-luks/"; - maintainers = [ maintainers.tstrobel ]; + maintainers = [ ]; license = with licenses; [ gpl2Only ]; platforms = platforms.linux; }; From 89fbc3fea9844d318410128c463187df5c2f61c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:40:33 +0200 Subject: [PATCH 65/95] maintainers: remove balajisivaraman no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/data/fonts/meslo-lg/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d181178f751d..371cb9bc3e81 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1342,10 +1342,6 @@ githubId = 35324; name = "Badi' Abdul-Wahid"; }; - balajisivaraman = { - email = "sivaraman.balaji@gmail.com"; - name = "Balaji Sivaraman"; - }; balodja = { email = "balodja@gmail.com"; github = "balodja"; diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index a55fb65c56c2..be638a03229f 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A customized version of Apple’s Menlo-Regular font"; homepage = "https://github.com/andreberg/Meslo-Font/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ balajisivaraman ]; + maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; all; }; } From d62c3bb22ea458fee4aa0471587bc0b39570e1b1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:40:58 +0200 Subject: [PATCH 66/95] maintainers: remove ravloony no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/tools/system/procodile/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 371cb9bc3e81..a524cf9eb9d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10477,10 +10477,6 @@ githubId = 25647735; name = "Victor Freire"; }; - ravloony = { - email = "ravloony@gmail.com"; - name = "Tom Macdonald"; - }; rawkode = { email = "david.andrew.mckay@gmail.com"; github = "rawkode"; diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 2751601b39b9..6c463b454333 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -11,7 +11,7 @@ bundlerApp { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; homepage = "https://adam.ac/procodile"; license = with licenses; mit; - maintainers = with maintainers; [ ravloony manveru nicknovitski ]; + maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; }; } From 3f5b809a5fc735cfc3a35752ca6fd67240314d12 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:41:29 +0200 Subject: [PATCH 67/95] maintainers: remove sjourdois no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/python-modules/et_xmlfile/default.nix | 2 +- pkgs/development/python-modules/jinja2/default.nix | 2 +- pkgs/development/python-modules/lxml/default.nix | 2 +- pkgs/development/python-modules/openpyxl/default.nix | 2 +- pkgs/development/python-modules/pygal/default.nix | 2 +- pkgs/development/python2-modules/jinja2/default.nix | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a524cf9eb9d6..034c4cf88f98 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11728,10 +11728,6 @@ githubId = 158321; name = "Stewart Mackenzie"; }; - sjourdois = { - email = "sjourdois@gmail.com"; - name = "Stéphane ‘kwisatz’ Jourdois"; - }; skeidel = { email = "svenkeidel@gmail.com"; github = "svenkeidel"; diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index e407ca35e89b..58d9c543aaa6 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; homepage = "https://pypi.python.org/pypi/et_xmlfile"; license = licenses.mit; - maintainers = with maintainers; [ sjourdois ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 8f9113c98de2..ee478fa152d1 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { syntax. Then the template is passed data to render the final document. an optional sandboxed environment. ''; - maintainers = with maintainers; [ pierron sjourdois ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index c9d4a7cf9616..08b66f8ff5fb 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer sjourdois ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index f8b97b6f2ea3..83401436bcf7 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lihop sjourdois ]; + maintainers = with lib.maintainers; [ lihop ]; }; } diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index ae5274944afc..86a56c11bcaa 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Sexy and simple python charting"; homepage = "http://www.pygal.org"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ sjourdois ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python2-modules/jinja2/default.nix b/pkgs/development/python2-modules/jinja2/default.nix index 02127a50df74..0be970d49946 100644 --- a/pkgs/development/python2-modules/jinja2/default.nix +++ b/pkgs/development/python2-modules/jinja2/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. ''; - maintainers = with maintainers; [ pierron sjourdois ]; + maintainers = with maintainers; [ pierron ]; }; } From b67a9bffcc8e740217b1984287f49070d7bce499 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:44:52 +0200 Subject: [PATCH 68/95] maintainers: remove hinton no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/networking/davmail/default.nix | 2 +- pkgs/desktops/lxde/core/lxappearance/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 034c4cf88f98..f833660c7b81 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5100,10 +5100,6 @@ github = "hiljusti"; githubId = 17605298; }; - hinton = { - email = "t@larkery.com"; - name = "Tom Hinton"; - }; hirenashah = { email = "hiren@hiren.io"; github = "hirenashah"; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 4adc508392af..9b4c56a0561f 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ maintainers.hinton ]; + maintainers = [ ]; platforms = platforms.all; license = licenses.gpl2Plus; }; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 97b434c9f605..6e341681cba3 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://lxde.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ hinton romildo ]; + maintainers = with maintainers; [ romildo ]; }; } From 9c583f06af42e39e29ceb8bfbf405d013c79684d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:46:20 +0200 Subject: [PATCH 69/95] maintainers: remove schristo no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/editors/jetbrains/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f833660c7b81..faa60f99740a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11285,10 +11285,6 @@ githubId = 5104601; name = "schnusch"; }; - schristo = { - email = "schristopher@konputa.com"; - name = "Scott Christopher"; - }; sciencentistguy = { email = "jamie@quigley.xyz"; name = "Jamie Quigley"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b06cb4d86245..9f52eca2b358 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -162,7 +162,7 @@ let with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ schristo ]; + maintainers = with maintainers; [ ]; }; }); From e23c5a9471fce11f27cdbaf4233992c644468df4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:46:55 +0200 Subject: [PATCH 70/95] maintainers: remove funfunctor no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/tools/misc/flashrom/default.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index faa60f99740a..a288941c4e9c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4435,10 +4435,6 @@ githubId = 36706276; name = "Fufezan Mihai"; }; - funfunctor = { - email = "eocallaghan@alterapraxis.com"; - name = "Edward O'Callaghan"; - }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 08cba497fc9d..4b2c48824fb7 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { homepage = "https://nuand.com/libbladeRF-doc"; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; - maintainers = with maintainers; [ funfunctor ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index dc42510998cd..7f52ccb9c302 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; - maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; + maintainers = with maintainers; [ fpletz felixsinger ]; platforms = platforms.all; broken = stdenv.isDarwin; # requires DirectHW }; From 95d1c563858fbdcef3b5b56db41a5891dde7e42a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:47:46 +0200 Subject: [PATCH 71/95] maintainers: remove wedens no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/misc/tdrop/default.nix | 2 +- pkgs/applications/window-managers/kbdd/default.nix | 2 +- pkgs/os-specific/linux/vendor-reset/default.nix | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a288941c4e9c..e5955923aa57 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13493,10 +13493,6 @@ github = "wdavidw"; githubId = 46896; }; - wedens = { - email = "kirill.wedens@gmail.com"; - name = "wedens"; - }; WeebSorceress = { name = "WeebSorceress"; email = "hello@weebsorceress.anonaddy.me"; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 66708aa8135d..b6d115c8feb9 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ wedens ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 2aade3607451..2fbc37d8e7eb 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://github.com/qnikst/kbdd"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.wedens ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index d82c5ff58b41..f4430f3224ae 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Linux kernel vendor specific hardware reset module"; homepage = "https://github.com/gnif/vendor-reset"; license = licenses.gpl2Only; - maintainers = with maintainers; [ wedens ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; broken = kernel.kernelOlder "4.19"; }; From 883e38ae9740b60e554376a8b026fd29e9da4a03 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:48:23 +0200 Subject: [PATCH 72/95] maintainers: remove okasu no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/data/fonts/terminus-font-ttf/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e5955923aa57..47d2ba416ed0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9421,10 +9421,6 @@ githubId = 7249506; name = "oida"; }; - okasu = { - email = "oka.sux@gmail.com"; - name = "Okasu"; - }; olcai = { email = "dev@timan.info"; github = "olcai"; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 1ebf987fcd56..3eca29882d80 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -28,6 +28,6 @@ in fetchzip { ''; homepage = "https://files.ax86.net/terminus-ttf"; license = licenses.ofl; - maintainers = with maintainers; [ okasu ]; + maintainers = with maintainers; [ ]; }; } From fa32663f502725015bbb593fa0ebf25bfc5043c8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:50:46 +0200 Subject: [PATCH 73/95] maintainers: remove fuzzy-id no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix | 2 +- pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix | 2 +- pkgs/tools/networking/haproxy/default.nix | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47d2ba416ed0..c6d5846f4a46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4453,10 +4453,6 @@ githubId = 17859309; name = "Fuzen"; }; - fuzzy-id = { - email = "hacking+nixos@babibo.de"; - name = "Thomas Bach"; - }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index a7fd86a31699..dbc6a8fc8e5e 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "http://www.brother.com/"; license = lib.licenses.unfree; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.fuzzy-id ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 4bb07cbfcad4..8a0b981a8235 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.brother.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.fuzzy-id ]; + maintainers = [ ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 2c65634f0125..c5eef48192ad 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { homepage = "https://haproxy.org"; changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG"; license = with licenses; [ gpl2Plus lgpl21Only ]; - maintainers = with maintainers; [ fuzzy-id ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; }; } From a111cc0c2c82852c8aee1bd02de0cc58dae443a0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:53:23 +0200 Subject: [PATCH 74/95] maintainers: remove lrworth no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/tools/misc/unused/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c6d5846f4a46..296997068932 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7511,10 +7511,6 @@ githubId = 1597330; name = "Leonardo Romor"; }; - lrworth = { - email = "luke@worth.id.au"; - name = "Luke Worth"; - }; lschuermann = { email = "leon.git@is.currently.online"; matrix = "@leons:is.currently.online"; diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index de12e527a295..b644a762908e 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { description = "A tool to identify potentially unused code"; homepage = "https://unused.codes"; license = licenses.mit; - maintainers = [ maintainers.lrworth ]; + maintainers = [ ]; }; } From fd75d8c2d398721d1c75df17e3b1d33d315b88ea Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:54:27 +0200 Subject: [PATCH 75/95] maintainers: remove chattered no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/games/angband/default.nix | 2 +- pkgs/games/keeperrl/default.nix | 2 +- pkgs/games/tome4/default.nix | 2 +- pkgs/tools/misc/scanmem/default.nix | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 296997068932..711a4f3ffd0b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2162,10 +2162,6 @@ githubId = 89596; name = "Florian Friesdorf"; }; - chattered = { - email = "me@philscotted.com"; - name = "Phil Scott"; - }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index c6dbb631767f..28de108ca7fa 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://angband.github.io/angband"; description = "A single-player roguelike dungeon exploration game"; - maintainers = [ maintainers.chattered ]; + maintainers = [ ]; license = licenses.gpl2; }; } diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index bd49b821f9e1..a1ead9a3f9cf 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "A dungeon management rogue-like"; homepage = "https://keeperrl.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ chattered ]; + maintainers = with maintainers; [ ]; # TODO: Add OS X platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 1f148feb9320..b732777ed3a8 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Tales of Maj'eyal (rogue-like game)"; homepage = "https://te4.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ chattered peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index bd6b8dbb1d14..0657a40689b5 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; - maintainers = [ maintainers.chattered ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl3; }; From 143efb53d6adb6c929338230a71ebdd65f392daf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:54:58 +0200 Subject: [PATCH 76/95] maintainers: remove m3tti no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/games/quakespasm/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 711a4f3ffd0b..4e5de66dfb24 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7665,10 +7665,6 @@ githubId = 3044438; name = "Lucas Savva"; }; - m3tti = { - email = "mathaeus.peter.sander@gmail.com"; - name = "Mathaeus Sander"; - }; ma27 = { email = "maximilian@mbosch.me"; matrix = "@ma27:nicht-so.sexy"; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index e67363fdc3cc..faeea7e4765b 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ mikroskeem m3tti ]; + maintainers = with maintainers; [ mikroskeem ]; mainProgram = "quake"; }; } From 0c35b851e4988d947d87747feed2c0f7415d2fe5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:56:39 +0200 Subject: [PATCH 77/95] maintainers: remove kkallio no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/misc/mysql-workbench/default.nix | 2 +- pkgs/development/compilers/opa/default.nix | 2 +- pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/racket/racket_7_9.nix | 2 +- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 2 +- pkgs/games/simutrans/default.nix | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e5de66dfb24..57af461f274d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6768,10 +6768,6 @@ github = "kjeremy"; githubId = 4325700; }; - kkallio = { - email = "tierpluspluslists@gmail.com"; - name = "Karn Kallio"; - }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 9ba9f360402b..27f3e53d3e20 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation rec { homepage = "http://wb.mysql.com/"; license = licenses.gpl2; - maintainers = [ maintainers.kkallio ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 0959c6da9ace..1ee284e9f923 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://opalang.org/"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.kkallio ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index a08a1b245dbd..e38f4e8c02ba 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation { with dynamic web pages, prototyping embedded systems). ''; - maintainers = with maintainers; [ kkallio ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 451910e192a8..68ed02ac5910 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ kkallio henrytill vrthra ]; + maintainers = with maintainers; [ henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 8d33962f914c..07c0376b42aa 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ kkallio henrytill vrthra ]; + maintainers = with maintainers; [ henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 4c71246cf9cb..39fbf2d8a534 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -21,6 +21,6 @@ buildDunePackage rec { downloadPage = "https://github.com/backtracking/ocamlgraph"; description = "Graph library for OCaml"; license = licenses.gpl2Oss; - maintainers = with maintainers; [ kkallio ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 60b2bc5faf77..1e5e25dbd3a2 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -163,7 +163,7 @@ let homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ kkallio vcunat phile314 ]; + maintainers = with maintainers; [ vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; }; }; From d26d95d39a995798d1cf20c71b7af1a25e0a8b66 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 01:57:16 +0200 Subject: [PATCH 78/95] maintainers: remove miltador no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 57af461f274d..2c72fee817ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8358,10 +8358,6 @@ githubId = 5378535; name = "Milo Gertjejansen"; }; - miltador = { - email = "miltador@yandex.ua"; - name = "Vasiliy Solovey"; - }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9f52eca2b358..394c668989a0 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -94,7 +94,7 @@ let The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language ''; - maintainers = [ maintainers.miltador ]; + maintainers = [ ]; }; }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' @@ -206,7 +206,7 @@ let apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. ''; - maintainers = [ maintainers.miltador ]; + maintainers = [ ]; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' From 1bce27ea1a12303862d04e87c5c039d4e40cd6e8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:01:35 +0200 Subject: [PATCH 79/95] maintainers: remove Esteth no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/libraries/vo-amrwbenc/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c72fee817ab..2bd3fbe7f531 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3900,10 +3900,6 @@ githubId = 2544204; name = "Erik Skytthe"; }; - Esteth = { - email = "adam.copp@gmail.com"; - name = "Adam Copp"; - }; ethancedwards8 = { email = "ethan@ethancedwards.com"; github = "ethancedwards8"; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 8ad78703d531..e07b8cb7688d 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ homepage = "https://sourceforge.net/projects/opencore-amr/"; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.Esteth ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } From 17da0007412f624ada37b772586de8592acbc09b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:07:59 +0200 Subject: [PATCH 80/95] maintainers: remove zef no github account linked --- maintainers/maintainer-list.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2bd3fbe7f531..66ae6cca2f0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14028,10 +14028,6 @@ githubId = 1557253; name = "Lennart Eichhorn"; }; - zef = { - email = "zef@zef.me"; - name = "Zef Hemel"; - }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; From d3991bc5be2ff874a799c3f4b436b82ead09dab1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:09:12 +0200 Subject: [PATCH 81/95] maintainers: remove lyt no github account linked --- maintainers/maintainer-list.nix | 4 ---- pkgs/data/fonts/ttf-envy-code-r/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 66ae6cca2f0d..d556aa5095a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7641,10 +7641,6 @@ githubId = 39707188; name = "Lynn Dong"; }; - lyt = { - email = "wheatdoge@gmail.com"; - name = "Tim Liou"; - }; m00wl = { name = "Moritz Lumme"; email = "moritz.lumme@gmail.com"; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 4da4aa1823b7..871bfb0099b2 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -20,6 +20,6 @@ in fetchzip { homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; license = licenses.unfree; - maintainers = [ maintainers.lyt ]; + maintainers = [ ]; }; } From 466b14712f467c962c4c2d89c9c96fc0b9ca0e3c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 02:10:30 +0200 Subject: [PATCH 82/95] maintainers: remove bjg does not seem to have contributed since nixpkgs migrated to git --- maintainers/maintainer-list.nix | 4 ---- pkgs/development/libraries/SDL_gfx/default.nix | 2 +- pkgs/development/libraries/glpk/default.nix | 2 +- pkgs/development/libraries/gss/default.nix | 2 +- pkgs/games/egoboo/default.nix | 2 +- pkgs/games/freedink/default.nix | 2 +- pkgs/servers/shishi/default.nix | 2 +- pkgs/shells/rush/default.nix | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d556aa5095a2..e4f588cc3bd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1627,10 +1627,6 @@ githubId = 30630233; name = "Timo Triebensky"; }; - bjg = { - email = "bjg@gnu.org"; - name = "Brian Gough"; - }; bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index f5a3d8635531..442d289de791 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; - maintainers = with maintainers; [ bjg ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a98a06118550..e8b01d6d2e7d 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/glpk/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + maintainers = with maintainers; [ ] ++ teams.sage.members; mainProgram = "glpsol"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 0c49e97a56bd..dd7852ac555b 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 4023eccec441..32678ecdf093 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like - # maintainers = [ lib.maintainers.bjg ]; + # maintainers = [ ]; # platforms = lib.platforms.all; }; } diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 75c50669421d..b48d7e52cf39 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.bjg ]; + maintainers = [ ]; platforms = lib.platforms.all; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 6dd5556e40b0..a2105a8b14d1 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/shishi/"; description = "An implementation of the Kerberos 5 network security system"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; } diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 00bada0201f4..02b33d403f97 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/rush/"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.bjg ]; + maintainers = [ ]; platforms = lib.platforms.all; }; From 2338fffa0f9478cb19893c8262618d3df59e5bd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 00:24:35 +0000 Subject: [PATCH 83/95] gvm-tools: 22.6.0 -> 22.6.1 --- pkgs/development/python-modules/gvm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 93dfef3bf5bf..fef545f6bf92 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "22.6.0"; + version = "22.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H97pVLhXdO56cFzNV2hzaAqax3zKyeBORPiLc7pllEo="; + sha256 = "sha256-pU/KNdWt+Iy/YiIAQFFgkaGHOvXK6v4Loia9MD4qmWc="; }; nativeBuildInputs = [ From bed0a7d1163cc2edd559eb559aab2aed28351917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 02:47:25 +0000 Subject: [PATCH 84/95] gallery-dl: 1.22.1 -> 1.22.3 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index c157c70f3494..a21bf78596b5 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.22.1"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GBG42EH8Ux5ncLPo07rjyHyZnK8/+vd5BjACl4H+kwE="; + sha256 = "sha256-6nveSEpi5fdlf6ooUXFrX1WaVDOQi6mvgDGAGgwi1zc="; }; propagatedBuildInputs = [ requests yt-dlp ]; From e1eb35fb793739b4a3468efcac23fe67c45eb323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 05:17:23 +0000 Subject: [PATCH 85/95] python310Packages.dremel3dpy: 2.0.1 -> 2.1.1 --- pkgs/development/python-modules/dremel3dpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index b734311b1591..170b96fcc494 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dremel3dpy"; - version = "2.0.1"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+gw7JBr4/u7iaxo6DTiCQGq58eBkp6SYX6Z/Lyv+T90="; + hash = "sha256-ioZwvbdPhO2kY10TqGR427mRUJBUZ5bmpiWVOV92OkI="; }; propagatedBuildInputs = [ From 910a91e05c89d6aeecb5b947dcfefda4c9e4e617 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 29 Jun 2022 16:02:48 +1000 Subject: [PATCH 86/95] yt-dlp: 2022.6.22.1 -> 2022.6.29 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.06.29 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 28f9021cb1c0..3f806ea97378 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.6.22.1"; + version = "2022.6.29"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-7kAancx+koWxTxMinD3O/fOH5Zf09Pdz2rMmqv47gww="; + sha256 = "sha256-X7+scv0DXRG8JpPl0c1pM7G8BxL3QvUIKiYXA4ELtck="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From 96fb180e8218ed7f5c96a43c0646c012de759e62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 07:16:09 +0000 Subject: [PATCH 87/95] python310Packages.zha-quirks: 0.0.75 -> 0.0.77 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c4398ff19cb5..9e274af99d4b 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.75"; + version = "0.0.77"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-iwNXyoA85NcgrxqAPydTA3FAW+weE2pdPyijEV4PbSA="; + hash = "sha256-z/DLMTN0VsKore4crzbyvMhyG7O4bicC9XPbeGNf74M="; }; propagatedBuildInputs = [ From 67512d036de4df47e72bb6e9fa91520dfb6c5ce2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:17:51 +0200 Subject: [PATCH 88/95] checkov: 2.1.10 -> 2.1.16 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 41ccde2a1344..50bf1828b430 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.10"; + version = "2.1.16"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-k6T03diwxXZPia+TsPNubkc2Kg6lctOlLdn17XChUkI="; + hash = "sha256-/sYxR7xaNTScyv0rB+7CHUPnxPXMX2aIGl9WtrBo+Jc="; }; nativeBuildInputs = with py.pkgs; [ From 6a0effc6f04fada686c8047e5567ab1a5b0d0870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 07:25:23 +0000 Subject: [PATCH 89/95] python310Packages.rzpipe: 0.1.2 -> 0.4.0 --- pkgs/development/python-modules/rzpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index 91c25f9a3b32..8c365070857c 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "rzpipe"; - version = "0.1.2"; + version = "0.4.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-va56xSWDIVtZ88QUzPfk8cCr28+5nZCNcSJMiVj3SZU="; + sha256 = "sha256-RSgBwmtpI58caRWov+cDWLKhti+7r70VxJbCxJveEiM="; }; # No native rz_core library From 78dd1e59029f2c4614b6e1dad25b10a233af8afa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 07:43:12 +0000 Subject: [PATCH 90/95] python310Packages.bc-python-hcl2: 0.3.43 -> 0.3.44 --- pkgs/development/python-modules/bc-python-hcl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 21e2914ecf61..2eb99d22bf7e 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.43"; + version = "0.3.44"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rUmvhmqvVtblmqzbYJcHUdFSw2PsPGbZFPJRi3Xtjv0="; + hash = "sha256-C7dknDfoN4rwXI5/YhsKXoertpQUpoOKrbbW4yVXrgQ="; }; # Nose is required during build process, so can not use `checkInputs`. From e0b0dcb982c677b524182fdcc34f727c360beee1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:46:10 +0200 Subject: [PATCH 91/95] exploitdb: 2022-06-15 -> 2022-06-28 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 08357b349955..39723cd1528b 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-06-15"; + version = "2022-06-28"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Qh9MoNZ0B8cL8G5maFvkGWLDuwQ3LDpqh3BYyJx3/Rk="; + hash = "sha256-c+tLnwzdYxSfxgBaV4Y6Ig2oXA9ab6f8u4RYhPaesgY="; }; nativeBuildInputs = [ From fd7dff9ea3c9b6b99d141149bf75c08dde7d7863 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:02:50 +0200 Subject: [PATCH 92/95] python310Packages.weconnect: 0.41.0 -> 0.44.2 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 5ea840e61ee5..f0c96acf5e02 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.41.0"; + version = "0.44.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - hash = "sha256-y8vHniQ32WDQYPKfnOin1uLmr24KC1t6zSpxGdgwXOg="; + hash = "sha256-Sbo8KfcwmFjbQ0/MTMLO7HYVTksBI5kNjxQhHvgy/p4="; }; propagatedBuildInputs = [ From fb3101b204c7639bea7aa763d8e670bafb00b8bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:03:02 +0200 Subject: [PATCH 93/95] python310Packages.weconnect-mqtt: 0.35.0 -> 0.37.2 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 5cfc12b5225b..174d9e5b9f0a 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.35.0"; + version = "0.37.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-3WFD99ujaQzJrsKCc9i0zwNEzRjgkGCwUXSip+6/158="; + hash = "sha256-CzdQ5aYaxOZ2rE5vMP53u66OvBBWhi6yXvzGbbCHEuc="; }; propagatedBuildInputs = [ From 02cc44949cbac7a4500a0e2e20f91c740d7cfe72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:26:49 +0200 Subject: [PATCH 94/95] python310Packages.homeconnect: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/homeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 3d7c31dc8623..19692f988fc3 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; + hash = "sha256-yEBi/9FVvLYYGMvsVZO94oGXEqXOdtHQ0G+6o2LEmOQ="; }; propagatedBuildInputs = [ From e6b696e3e2e34fd001ed3070a5b7642c142bfe15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 08:34:03 +0000 Subject: [PATCH 95/95] python310Packages.peaqevcore: 2.0.2 -> 2.1.1 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 239fcfe5962c..2e2029072f83 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "2.0.2"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GU0g1jCvLcbwO9apt3r/Y8XNtiraEI83thiXI/wDIJk="; + hash = "sha256-MX4qWvM7V5xCibpwsaf/2JGOrWYfETHxNmZ6tyeFmKc="; }; postPatch = ''