From e134422465913332a5c9cb3ec9161650f7d459c8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Nov 2024 12:56:36 +0800 Subject: [PATCH] maintainers: remove expipiplus1 Another year, another exhausting undermoderated thread full of people arguing against being an inclusive community, tone policing and denying that discriminatory behaviour even exists. This clearly isn't getting any better and I'm embarrassed that I stayed around for this long. I can't continue to lend my name to such a project. --- maintainers/maintainer-list.nix | 8 -------- maintainers/team-list.nix | 1 - .../instant-messengers/signald/default.nix | 2 +- .../science/electronics/fped/default.nix | 2 +- .../science/electronics/picoscope/default.nix | 2 +- .../version-management/git-fame/default.nix | 2 +- pkgs/by-name/li/libgpiod_1/package.nix | 2 +- pkgs/by-name/mo/monado/package.nix | 2 +- pkgs/by-name/xr/xrgears/package.nix | 5 +---- pkgs/development/embedded/fpga/ecpdap/default.nix | 2 +- .../configuration-hackage2nix/main.yaml | 10 ---------- .../haskell-modules/hackage-packages.nix | 13 +------------ pkgs/development/libraries/libgpiod/default.nix | 2 +- pkgs/development/libraries/libsurvive/default.nix | 2 +- pkgs/development/libraries/pangolin/default.nix | 2 +- pkgs/development/libraries/swiftshader/default.nix | 2 +- .../tools/build-managers/qbs/default.nix | 2 +- pkgs/servers/mautrix-signal/default.nix | 1 - pkgs/servers/mx-puppet-discord/default.nix | 2 +- .../graphics/directx-shader-compiler/default.nix | 5 +---- .../graphics/vulkan-extension-layer/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 2 +- pkgs/tools/misc/inav-blackbox-tools/default.nix | 2 +- pkgs/tools/misc/lighthouse-steamvr/default.nix | 5 +---- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- 25 files changed, 21 insertions(+), 61 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998..96a3c478cd4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6881,14 +6881,6 @@ githubId = 873530; name = "Alexey Levan"; }; - expipiplus1 = { - email = "nix@monoid.al"; - matrix = "@ellie:monoid.al"; - github = "expipiplus1"; - githubId = 857308; - name = "Ellie Hermaszewska"; - keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; - }; exploitoverload = { email = "nix@exploitoverload.com"; github = "exploitoverload"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6542675bbc98..b4f555105051 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -449,7 +449,6 @@ with lib.maintainers; haskell = { members = [ cdepillabout - expipiplus1 maralorn ncfavier sternenseemann diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 6131e64e9152..acadc87d9a3d 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index e3984dba77d8..dbfeb69c6bfa 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7fc737eb1d38..056a682d1c1c 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -17,7 +17,7 @@ let shared_meta = lib: { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; }; diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index d69988eca012..54af934bde8b 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -15,7 +15,7 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index 337229c25db7..94644afff3fe 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 84719a4fa8be..f65a83c3d601 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix index 82a801a54be0..96737ae7972e 100644 --- a/pkgs/by-name/xr/xrgears/package.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -65,9 +65,6 @@ stdenv.mkDerivation { mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - Scrumplex - ]; + maintainers = with maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 6d43f107563a..1dfc54e9c3c6 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/adamgreig/ecpdap"; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53acd512a0ef..b1dc2492f8b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -223,16 +223,6 @@ package-maintainers: - tlynx - xmonad - xmonad-contrib - expipiplus1: - - VulkanMemoryAllocator - - autoapply - - exact-real - - language-c - - orbits - - update-nix-fetchgit - - vector-sized - - vulkan - - vulkan-utils erictapen: - hakyll evenbrenden: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 67ba06fe891d..d51851b2c471 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22317,7 +22317,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -43471,7 +43470,6 @@ self: { description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "autodocodec" = callPackage @@ -103828,7 +103826,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -188180,7 +188177,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -229065,7 +229061,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "orc" = callPackage @@ -323122,9 +323117,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; mainProgram = "update-nix-fetchgit"; - maintainers = [ - lib.maintainers.expipiplus1 lib.maintainers.sorki - ]; + maintainers = [ lib.maintainers.sorki ]; }) {}; "update-repos" = callPackage @@ -326556,7 +326549,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-sized_1_6_1" = callPackage @@ -326576,7 +326568,6 @@ self: { description = "Size tagged vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -328393,7 +328384,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -328427,7 +328417,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "waargonaut" = callPackage diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 1880b8310fce..e52a0f83ad3c 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lgpl21Plus # libgpiod lgpl3Plus # C++ bindings ] ++ lib.optional enable-tools gpl2Plus; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 53ebe6f18e41..4e5418de689a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 7b26f3f12fca..f15a7dfe4490 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 624d239fa35c..3063ccc3a189 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Should be possible to support Darwin by changing the install phase with # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. platforms = with platforms; linux; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 092f8efe785c..9c642123ee4d 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 143034ecddee..0b21bd539d1d 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,6 @@ buildGoModule rec { description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - expipiplus1 niklaskorz ma27 ]; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 254434a8ba3d..1d86bc472a36 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -44,7 +44,7 @@ in myNodePackages.package.override { description = "Discord puppeting bridge for matrix"; license = licenses.asl20; homepage = "https://gitlab.com/mx-puppet/discord/mx-puppet-discord"; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 11deeca44d06..bd5d00aa50d1 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ - expipiplus1 - Flakebi - ]; + maintainers = with lib.maintainers; [ Flakebi ]; }; }) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 268353985889..4b03e4e098f2 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; platforms = platforms.linux; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d031d20c1bb..08236ab39a2c 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LunarG/VulkanTools"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 228035108a81..4acfc4d4890e 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tools for working with blackbox flight logs"; homepage = "https://github.com/inavflight/blackbox-tools"; license = licenses.gpl3Only; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 90590d01cfdc..9c9f7e97fa68 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -29,10 +29,7 @@ rustPlatform.buildRustPackage rec { description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - bddvlpr - ]; + maintainers = with maintainers; [ bddvlpr ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index c7e92770b7d6..e4e1791c8971 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; mainProgram = "OpenCorsairLink.elf"; }; }