From d49d1905727a8c492f273309fc693521305e1b6b Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 15 Feb 2026 00:41:19 +0100 Subject: [PATCH] maintainers: drop joachifm Signed-off-by: Marcin Serwin --- ci/OWNERS | 6 +----- maintainers/maintainer-list.nix | 6 ------ nixos/modules/config/malloc.nix | 2 +- nixos/modules/profiles/hardened.nix | 1 - nixos/modules/security/lock-kernel-modules.nix | 2 +- nixos/modules/security/misc.nix | 2 +- nixos/tests/dnscrypt-proxy.nix | 2 +- nixos/tests/hardened.nix | 4 ++-- nixos/tests/tor.nix | 2 +- pkgs/applications/misc/electrum/default.nix | 1 - pkgs/by-name/cp/cppcheck/package.nix | 2 +- pkgs/by-name/gr/gradm/package.nix | 1 - pkgs/by-name/hu/hugs/package.nix | 2 +- pkgs/by-name/ma/macchanger/package.nix | 1 - pkgs/by-name/mi/minisign/package.nix | 2 +- pkgs/by-name/mk/mksh/package.nix | 4 +--- pkgs/by-name/na/nano/package.nix | 1 - pkgs/by-name/nt/ntbtls/package.nix | 2 +- pkgs/by-name/pa/pax-utils/package.nix | 1 - pkgs/by-name/pa/paxtest/package.nix | 4 +--- pkgs/by-name/ru/runit/package.nix | 2 +- pkgs/by-name/sc/scsh/package.nix | 2 +- pkgs/by-name/so/socklog/package.nix | 2 +- pkgs/by-name/su/surf/package.nix | 2 +- pkgs/by-name/ti/tinycc/package.nix | 1 - pkgs/by-name/to/tor-browser/package.nix | 1 - pkgs/by-name/to/tor/package.nix | 1 - pkgs/by-name/un/unrtf/package.nix | 2 +- pkgs/by-name/un/untex/package.nix | 2 +- pkgs/development/python-modules/emoji/default.nix | 2 +- 30 files changed, 21 insertions(+), 44 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 8a52e846aafd..8f741686635f 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -293,11 +293,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/modules/services/backup/mysql-backup.nix @6543 # Hardened profile & related modules -/nixos/modules/profiles/hardened.nix @joachifm -/nixos/modules/security/lock-kernel-modules.nix @joachifm -/nixos/modules/security/misc.nix @joachifm -/nixos/tests/hardened.nix @joachifm -/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr @joachifm +/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr # Home Automation /nixos/modules/services/home-automation/home-assistant.nix @mweinelt diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddd4fd41604f..0a9338b96fa0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12587,12 +12587,6 @@ githubId = 26695750; name = "Joakim Holm"; }; - joachifm = { - email = "joachifm@fastmail.fm"; - github = "joachifm"; - githubId = 41977; - name = "Joachim Fasting"; - }; joachimschmidt557 = { email = "joachim.schmidt557@outlook.com"; github = "joachimschmidt557"; diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index 8959a99f7b7b..403e7900c008 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -93,7 +93,7 @@ in { meta = { - maintainers = [ lib.maintainers.joachifm ]; + maintainers = [ ]; }; options = { diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index e12eb19b13d8..8a7e98781717 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -29,7 +29,6 @@ in config = mkIf config.profiles.hardened { meta = { maintainers = [ - maintainers.joachifm maintainers.emily ]; }; diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 6ad2c76785d5..43829c002898 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - maintainers = [ lib.maintainers.joachifm ]; + maintainers = [ ]; }; options = { diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index dc90d60386eb..72fa61c54845 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - maintainers = [ lib.maintainers.joachifm ]; + maintainers = [ ]; }; imports = [ diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 4728232eb5d9..72a65f449670 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -4,7 +4,7 @@ let in { name = "dnscrypt-proxy"; - meta.maintainers = with lib.maintainers; [ joachifm ]; + meta.maintainers = [ ]; nodes = { # A client running the recommended setup: DNSCrypt proxy as a forwarder diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index f025e85e3821..ac0cedc98dd2 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "hardened"; - meta = with pkgs.lib.maintainers; { - maintainers = [ joachifm ]; + meta = { + maintainers = [ ]; }; nodes.machine = diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index ce35a38c7e0b..0e2052f58898 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "tor"; - meta.maintainers = with lib.maintainers; [ joachifm ]; + meta.maintainers = [ ]; nodes.client = { pkgs, ... }: diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index fe18804b1be3..1b3233a766dc 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -169,7 +169,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ - joachifm np prusnak ]; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index c86f39c30123..6789d6f9e139 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://cppcheck.sourceforge.net"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gr/gradm/package.nix b/pkgs/by-name/gr/gradm/package.nix index cd01e6ee96e8..72a72ec0afe7 100644 --- a/pkgs/by-name/gr/gradm/package.nix +++ b/pkgs/by-name/gr/gradm/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice - joachifm ]; }; }) diff --git a/pkgs/by-name/hu/hugs/package.nix b/pkgs/by-name/hu/hugs/package.nix index 790d486a90a8..55d06991fe32 100644 --- a/pkgs/by-name/hu/hugs/package.nix +++ b/pkgs/by-name/hu/hugs/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ma/macchanger/package.nix b/pkgs/by-name/ma/macchanger/package.nix index 9a721f0ed200..1ca99963a393 100644 --- a/pkgs/by-name/ma/macchanger/package.nix +++ b/pkgs/by-name/ma/macchanger/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Utility for viewing/manipulating the MAC address of network interfaces"; maintainers = with lib.maintainers; [ - joachifm dotlambda ]; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/mi/minisign/package.nix b/pkgs/by-name/mi/minisign/package.nix index 56657694ce01..0c500c447769 100644 --- a/pkgs/by-name/mi/minisign/package.nix +++ b/pkgs/by-name/mi/minisign/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://jedisct1.github.io/minisign/"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "minisign"; }; diff --git a/pkgs/by-name/mk/mksh/package.nix b/pkgs/by-name/mk/mksh/package.nix index 51ba16bb42cc..cebf5527aec7 100644 --- a/pkgs/by-name/mk/mksh/package.nix +++ b/pkgs/by-name/mk/mksh/package.nix @@ -60,9 +60,7 @@ stdenv.mkDerivation (finalAttrs: { isc unicode-dfs-2016 ]; - maintainers = with lib.maintainers; [ - joachifm - ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index abc61d66afd3..6d043d70ea06 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -106,7 +106,6 @@ stdenv.mkDerivation rec { description = "Small, user-friendly console text editor"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - joachifm sigmasquadron ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/nt/ntbtls/package.nix b/pkgs/by-name/nt/ntbtls/package.nix index 3ccaed6883af..f9aee72fe168 100644 --- a/pkgs/by-name/nt/ntbtls/package.nix +++ b/pkgs/by-name/nt/ntbtls/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnupg.org/software/ntbtls/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/pa/pax-utils/package.nix b/pkgs/by-name/pa/pax-utils/package.nix index c66a89ada67f..6280fdb28218 100644 --- a/pkgs/by-name/pa/pax-utils/package.nix +++ b/pkgs/by-name/pa/pax-utils/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice - joachifm ]; }; }) diff --git a/pkgs/by-name/pa/paxtest/package.nix b/pkgs/by-name/pa/paxtest/package.nix index 4f546295cfd3..0f6c39f02553 100644 --- a/pkgs/by-name/pa/paxtest/package.nix +++ b/pkgs/by-name/pa/paxtest/package.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "paxtest"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - joachifm - ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index ac2bb0d73097..f4a5de244edd 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "UNIX init scheme with service supervision"; license = lib.licenses.bsd3; homepage = "http://smarden.org/runit"; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/sc/scsh/package.nix b/pkgs/by-name/sc/scsh/package.nix index 6b0ae0957141..a4a09fb5c020 100644 --- a/pkgs/by-name/sc/scsh/package.nix +++ b/pkgs/by-name/sc/scsh/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { description = "Scheme shell"; homepage = "http://www.scsh.net/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = with lib.platforms; unix; mainProgram = "scsh"; }; diff --git a/pkgs/by-name/so/socklog/package.nix b/pkgs/by-name/so/socklog/package.nix index 56731a2d8ec6..dee2a33c9eaf 100644 --- a/pkgs/by-name/so/socklog/package.nix +++ b/pkgs/by-name/so/socklog/package.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://smarden.org/socklog/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix index 58353944c9d2..d7e31c56d772 100644 --- a/pkgs/by-name/su/surf/package.nix +++ b/pkgs/by-name/su/surf/package.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://surf.suckless.org"; license = lib.licenses.mit; platforms = webkitgtk_4_1.meta.platforms; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix index fe3ec0801920..cfb64f0b97c7 100644 --- a/pkgs/by-name/ti/tinycc/package.nix +++ b/pkgs/by-name/ti/tinycc/package.nix @@ -140,7 +140,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ lgpl21Only ]; mainProgram = "tcc"; maintainers = with lib.maintainers; [ - joachifm onemoresuza ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 1bd0c40c4688..549e969085ec 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -353,7 +353,6 @@ stdenv.mkDerivation rec { c4patino felschr hax404 - joachifm panicgh ]; # MPL2.0+, GPL+, &c. While it's not entirely clear whether diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index 1e15bd851875..2778700d8ad2 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "tor"; maintainers = with lib.maintainers; [ thoughtpolice - joachifm prusnak ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/un/unrtf/package.nix b/pkgs/by-name/un/unrtf/package.nix index 8cb21112ad50..ba156db81b7f 100644 --- a/pkgs/by-name/un/unrtf/package.nix +++ b/pkgs/by-name/un/unrtf/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.gnu.org/software/unrtf/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/un/untex/package.nix b/pkgs/by-name/un/untex/package.nix index 60b5f479d5e5..ec6ca4093e78 100644 --- a/pkgs/by-name/un/untex/package.nix +++ b/pkgs/by-name/un/untex/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "untex"; homepage = "https://www.ctan.org/pkg/untex"; license = lib.licenses.gpl1Only; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 2af73016d9b9..9c2efc8220bd 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/carpedm20/emoji/"; changelog = "https://github.com/carpedm20/emoji/blob/${src.tag}/CHANGES.md"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = [ ]; }; }