From f41836506718662fc4b50a99a7d49bf3f04c9013 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 5 Oct 2025 22:22:45 +0300 Subject: [PATCH] maintainers: drop evils --- maintainers/maintainer-list.nix | 7 ------ .../modules/services/hardware/fancontrol.nix | 2 -- nixos/modules/services/hardware/rasdaemon.nix | 3 --- nixos/modules/services/monitoring/tuptime.nix | 3 --- nixos/modules/services/monitoring/vnstat.nix | 2 -- nixos/tests/fancontrol.nix | 6 ++--- nixos/tests/rasdaemon.nix | 6 ++--- nixos/tests/tuptime.nix | 6 ++--- .../audio/bucklespring/default.nix | 2 +- .../misc/sway-contrib/default.nix | 22 +++++++------------ .../science/electronics/kicad/default.nix | 2 +- pkgs/by-name/bt/btrfs-heatmap/package.nix | 2 +- pkgs/by-name/f3/f3/package.nix | 1 - pkgs/by-name/ra/rasdaemon/package.nix | 2 +- pkgs/by-name/re/readexe/package.nix | 2 +- pkgs/by-name/sc/screentest/package.nix | 2 +- pkgs/by-name/st/stepreduce/package.nix | 2 +- pkgs/by-name/tu/tuptime/package.nix | 2 +- pkgs/by-name/us/usb-reset/package.nix | 2 +- pkgs/by-name/vn/vnstat/package.nix | 2 +- .../python-modules/btrfs/default.nix | 1 - .../python-modules/diffimg/default.nix | 2 +- .../python-modules/i2c-tools/default.nix | 2 +- .../python-modules/image-diff/default.nix | 2 +- .../python-modules/imgdiff/default.nix | 2 +- .../python-modules/liquidctl/default.nix | 1 - .../python-modules/pycflow2dot/default.nix | 2 +- .../pytest-image-diff/default.nix | 2 +- .../python-modules/pytomlpp/default.nix | 2 +- .../python-modules/rtoml/default.nix | 2 +- .../linux/error-inject/default.nix | 4 ++-- pkgs/os-specific/linux/mm-tools/default.nix | 5 ++--- 32 files changed, 39 insertions(+), 66 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0c25896509a2..b9811b9fedd2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8051,13 +8051,6 @@ githubId = 6803717; name = "Ilya Elenskiy"; }; - evils = { - email = "evils.devils@protonmail.com"; - matrix = "@evils:nixos.dev"; - github = "evils"; - githubId = 30512529; - name = "Evils"; - }; evris99 = { name = "Evrymachos Koukoumakas"; github = "evris99"; diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index 882eea001b39..3d550aa8d78f 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -52,6 +52,4 @@ in ''; }; - - meta.maintainers = [ lib.maintainers.evils ]; } diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix index b86e8b04d5ff..cc1723793b9e 100644 --- a/nixos/modules/services/hardware/rasdaemon.nix +++ b/nixos/modules/services/hardware/rasdaemon.nix @@ -176,7 +176,4 @@ in }; }; }; - - meta.maintainers = [ lib.maintainers.evils ]; - } diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix index 58094a185182..67706e63f289 100644 --- a/nixos/modules/services/monitoring/tuptime.nix +++ b/nixos/modules/services/monitoring/tuptime.nix @@ -89,7 +89,4 @@ in }; }; }; - - meta.maintainers = [ lib.maintainers.evils ]; - } diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index 958a46e81730..baae16394edd 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -58,6 +58,4 @@ in }; }; }; - - meta.maintainers = [ lib.maintainers.evils ]; } diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix index 5bfd4b2bd37e..cc61985639a8 100644 --- a/nixos/tests/fancontrol.nix +++ b/nixos/tests/fancontrol.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ ... }: { name = "fancontrol"; - meta = with pkgs.lib.maintainers; { - maintainers = [ evils ]; + meta = { + maintainers = [ ]; }; nodes.machine = diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix index cc7b3fc3c670..d8fcc3c39f05 100644 --- a/nixos/tests/rasdaemon.nix +++ b/nixos/tests/rasdaemon.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ ... }: { name = "rasdaemon"; - meta = with pkgs.lib.maintainers; { - maintainers = [ evils ]; + meta = { + maintainers = [ ]; }; nodes.machine = diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix index b5bde1280e89..cf10211c45a9 100644 --- a/nixos/tests/tuptime.nix +++ b/nixos/tests/tuptime.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ ... }: { name = "tuptime"; - meta = with pkgs.lib.maintainers; { - maintainers = [ evils ]; + meta = { + maintainers = [ ]; }; nodes.machine = diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix index 846ded340e16..a20e15feb87c 100644 --- a/pkgs/applications/audio/bucklespring/default.nix +++ b/pkgs/applications/audio/bucklespring/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zevv/bucklespring"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/sway-contrib/default.nix b/pkgs/applications/misc/sway-contrib/default.nix index f9242ed5d20e..33c79b9b04e7 100644 --- a/pkgs/applications/misc/sway-contrib/default.nix +++ b/pkgs/applications/misc/sway-contrib/default.nix @@ -83,14 +83,11 @@ in fi ''; - meta = - with lib; - meta - // { - description = "Helper for screenshots within sway"; - maintainers = with maintainers; [ evils ]; - mainProgram = "grimshot"; - }; + meta = meta // { + description = "Helper for screenshots within sway"; + maintainers = [ ]; + mainProgram = "grimshot"; + }; }; inactive-windows-transparency = @@ -114,14 +111,11 @@ in ''; meta = - with lib; - meta - // { + + meta // { description = "It makes inactive sway windows transparent"; mainProgram = "${lname}.py"; - maintainers = with maintainers; [ - evils # packaged this as a side-effect of grimshot but doesn't use it - ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 02da48dea1a1..1c267d792f2c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -326,7 +326,7 @@ stdenv.mkDerivation rec { The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ evils ]; + maintainers = [ ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; mainProgram = "kicad"; diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix index ff7bc2a9462d..32c6c06c1070 100644 --- a/pkgs/by-name/bt/btrfs-heatmap/package.nix +++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/knorrie/btrfs-heatmap"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix index dacee40225d1..736ead2fb5dc 100644 --- a/pkgs/by-name/f3/f3/package.nix +++ b/pkgs/by-name/f3/f3/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ makefu - evils ]; }; } diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix index 238114c6a628..8a58170589fe 100644 --- a/pkgs/by-name/ra/rasdaemon/package.nix +++ b/pkgs/by-name/ra/rasdaemon/package.nix @@ -130,6 +130,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; changelog = "${finalAttrs.meta.homepage}/releases/tag/v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ evils ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/re/readexe/package.nix b/pkgs/by-name/re/readexe/package.nix index 6a0173652806..f60449fddb55 100644 --- a/pkgs/by-name/re/readexe/package.nix +++ b/pkgs/by-name/re/readexe/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { isc bsd3 ]; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; mainProgram = "readexe"; }; }) diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix index 821e71454367..65c02d3e569a 100644 --- a/pkgs/by-name/sc/screentest/package.nix +++ b/pkgs/by-name/sc/screentest/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/TobiX/screentest"; changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ evils ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/st/stepreduce/package.nix b/pkgs/by-name/st/stepreduce/package.nix index 36ac6c563a9a..3e1b0b9f6553 100644 --- a/pkgs/by-name/st/stepreduce/package.nix +++ b/pkgs/by-name/st/stepreduce/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "Reduces STEP file size by removing redundancy"; homepage = "https://gitlab.com/sethhillbrand/stepreduce"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; mainProgram = "stepreduce"; }; } diff --git a/pkgs/by-name/tu/tuptime/package.nix b/pkgs/by-name/tu/tuptime/package.nix index 02b01ff4a455..a4c936cda23e 100644 --- a/pkgs/by-name/tu/tuptime/package.nix +++ b/pkgs/by-name/tu/tuptime/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rfrail3/tuptime/blob/master/CHANGELOG"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; mainProgram = "tuptime"; }; } diff --git a/pkgs/by-name/us/usb-reset/package.nix b/pkgs/by-name/us/usb-reset/package.nix index c573472304af..509cb1ee2a06 100644 --- a/pkgs/by-name/us/usb-reset/package.nix +++ b/pkgs/by-name/us/usb-reset/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { homepage = "https://github.com/ralight/usb-reset"; changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; license = licenses.mit; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "usb-reset"; }; diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix index af2d11682c0c..2e3d1cae0a00 100644 --- a/pkgs/by-name/vn/vnstat/package.nix +++ b/pkgs/by-name/vn/vnstat/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://humdi.net/vnstat/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index f758cada9f2d..abd382c68aba 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ - evils Luflosi ]; }; diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix index a6a412a82fca..5c0468a7ed1d 100644 --- a/pkgs/development/python-modules/diffimg/default.nix +++ b/pkgs/development/python-modules/diffimg/default.nix @@ -40,6 +40,6 @@ buildPythonPackage { description = "Differentiate images in python - get a ratio or percentage difference, and generate a diff image"; homepage = "https://github.com/nicolashahn/diffimg"; license = licenses.mit; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix index 0073292b5ecb..4f3ec3dfb0c3 100644 --- a/pkgs/development/python-modules/i2c-tools/default.nix +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -19,6 +19,6 @@ buildPythonPackage { description = "Wrapper for i2c-tools' smbus stuff"; # from py-smbus/smbusmodule.c license = [ licenses.gpl2Only ]; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix index 1b64799cb0af..20515a38c161 100644 --- a/pkgs/development/python-modules/image-diff/default.nix +++ b/pkgs/development/python-modules/image-diff/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { mainProgram = "image-diff"; homepage = "https://github.com/simonw/image-diff"; license = licenses.asl20; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/imgdiff/default.nix b/pkgs/development/python-modules/imgdiff/default.nix index f9fbafb80535..cd49b215cea5 100644 --- a/pkgs/development/python-modules/imgdiff/default.nix +++ b/pkgs/development/python-modules/imgdiff/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/mgedmin/imgdiff"; changelog = "https://github.com/mgedmin/imgdiff/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index ea77d1181afc..75bfe87174ce 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ arturcygan - evils ]; mainProgram = "liquidctl"; }; diff --git a/pkgs/development/python-modules/pycflow2dot/default.nix b/pkgs/development/python-modules/pycflow2dot/default.nix index 19289d0b6cbd..feef5a1f4d4a 100644 --- a/pkgs/development/python-modules/pycflow2dot/default.nix +++ b/pkgs/development/python-modules/pycflow2dot/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { mainProgram = "cflow2dot"; homepage = "https://github.com/johnyf/pycflow2dot"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix index 3d22b5b46d5a..706cf7044c66 100644 --- a/pkgs/development/python-modules/pytest-image-diff/default.nix +++ b/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Pytest helps for compare images and regression"; homepage = "https://github.com/Apkawa/pytest-image-diff"; license = licenses.mit; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index c8954b43c20f..e705241e3a08 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Python wrapper for tomlplusplus"; homepage = "https://github.com/bobfang1992/pytomlpp"; license = licenses.mit; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index f88db017d3b3..f55d4060d920 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Rust based TOML library for Python"; homepage = "https://github.com/samuelcolvin/rtoml"; license = licenses.mit; - maintainers = with maintainers; [ evils ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/error-inject/default.nix b/pkgs/os-specific/linux/error-inject/default.nix index f5cc7a465191..3617e22d79b8 100644 --- a/pkgs/os-specific/linux/error-inject/default.nix +++ b/pkgs/os-specific/linux/error-inject/default.nix @@ -38,7 +38,7 @@ description = "MCE error injection tool"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; }; @@ -71,7 +71,7 @@ description = "PCIE AER error injection tool"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; }; } diff --git a/pkgs/os-specific/linux/mm-tools/default.nix b/pkgs/os-specific/linux/mm-tools/default.nix index ed592fc83514..5185bedf371e 100644 --- a/pkgs/os-specific/linux/mm-tools/default.nix +++ b/pkgs/os-specific/linux/mm-tools/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, linux, }: @@ -12,9 +11,9 @@ stdenv.mkDerivation { preConfigure = "cd tools/mm"; - meta = with lib; { + meta = { inherit (linux.meta) license platforms; description = "Set of virtual memory tools"; - maintainers = [ maintainers.evils ]; + maintainers = [ ]; }; }