From 40a7011c39bc6acb2ce89361f23f0ea3ccc5eb46 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 27 Apr 2024 10:49:31 +0200 Subject: [PATCH] maintainers: remove amaxine Every time I decide to commit additional time to contributing to nix, quite a few "concerned" members come out, either to decry a ban on bigotry and fascism in 2021, or to declare support for minority groups in Nix discriminatory, or a number of other incidents that are not worth recounting in this leaving message. To avoid any ambiguity, my reasoning is similar to pr306702, pr307033, and several others who felt actively made unwelcome or outright harassed out of the Nix project. --- maintainers/maintainer-list.nix | 6 ------ maintainers/team-list.nix | 1 - pkgs/applications/misc/1password-gui/default.nix | 2 +- pkgs/applications/networking/cluster/nomad/default.nix | 2 +- pkgs/applications/networking/cluster/terraform/default.nix | 1 - .../networking/instant-messengers/slack/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/os-specific/linux/ell/default.nix | 2 +- pkgs/os-specific/linux/firmware/fwupd-efi/default.nix | 2 +- pkgs/os-specific/linux/iwd/default.nix | 2 +- pkgs/servers/plex/raw.nix | 1 - pkgs/tools/networking/networkmanager/default.nix | 2 +- 13 files changed, 9 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fc9ca20aa912..dd8a3728539f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1086,12 +1086,6 @@ githubId = 153175; name = "Andrew Marshall"; }; - amaxine = { - email = "max@ine.dev"; - github = "amaxine"; - githubId = 35892750; - name = "Maxine Aubrey"; - }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 35e45ad19450..9d99fa833f8f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -404,7 +404,6 @@ with lib.maintainers; { hedning jtojnar dasj19 - amaxine ]; githubTeams = [ "gnome" diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index e977dffc444b..c151bedd29e6 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 89891fd04046..abb9463cf80c 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -41,7 +41,7 @@ let description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; mainProgram = "nomad"; inherit license; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick cottand ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes techknowlogick cottand ]; }; } // attrs'); in diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 33ec6997ce93..efaef0fa65b1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -58,7 +58,6 @@ let Chili-Man babariviere kalbasit - amaxine timstott zimbatm zowoq diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index e0ce9027551c..82494a442f93 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -84,7 +84,7 @@ let changelog = "https://slack.com/release-notes"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ mmahut amaxine ]; + maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "slack"; }; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index d29fb743c7dc..b2bbbdd7bf3c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -80,7 +80,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar amaxine ] ++ teams.pantheon.members; + maintainers = with maintainers; [ antono jtojnar ] ++ teams.pantheon.members; }; }); diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 4b38c86fbdce..06f6b71172ae 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://worldofgoo.com"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jcumming amaxine ]; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index b340b21c4633..9c16a341a478 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill amaxine ]; + maintainers = with maintainers; [ mic92 dtzWill ]; }; } diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index 7388a69013d1..d89c4a7b140a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ amaxine ]; + maintainers = with maintainers; [ ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 0a7d23d3d33c..5c1d153b83fc 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill fpletz amaxine ]; + maintainers = with maintainers; [ dtzWill fpletz ]; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 9e2488e3b7bc..54ffa4e42655 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { lnl7 pjones thoughtpolice - amaxine MayNiklas ]; description = "Media library streaming server"; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 67de0c877d0d..16ec7b7a0cca 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation rec { description = "Network configuration and management tool"; license = licenses.gpl2Plus; changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz amaxine ]); + maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz ]); platforms = platforms.linux; }; }