maintainers: remove expipiplus1 (#354409)

tomodachi94 · web-flow · commit cda153cb0997 · 2024-11-07T22:32:59.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ in stdenv.mkDerivation {`
`84`	`84`	`binaryBytecode # deps`
`85`	`85`	`];`
`86`	`86`	`license = licenses.gpl3Plus;`
`87`		`- maintainers = with maintainers; [ expipiplus1 ];`
	`87`	`+ maintainers = [];`
`88`	`88`	`platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];`
`89`	`89`	`};`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ stdenv.mkDerivation {`
`43`	`43`	`mainProgram = "fped";`
`44`	`44`	`homepage = "http://projects.qi-hardware.com/index.php/p/fped/";`
`45`	`45`	`license = licenses.gpl2;`
`46`		`- maintainers = with maintainers; [ expipiplus1 ];`
	`46`	`+ maintainers = [];`
`47`	`47`	`platforms = platforms.linux;`
`48`	`48`	`};`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {`
`39`	`39`	`'';`
`40`	`40`	`homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";`
`41`	`41`	`license = licenses.lgpl2;`
`42`		`- maintainers = [ maintainers.expipiplus1 ];`
	`42`	`+ maintainers = [];`
`43`	`43`	`platforms = platforms.linux;`
`44`	`44`	`};`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {`
`32`	`32`	`'';`
`33`	`33`	`homepage = "https://github.com/adamgreig/ecpdap";`
`34`	`34`	`license = licenses.asl20;`
`35`		`- maintainers = with maintainers; [ expipiplus1 ];`
	`35`	`+ maintainers = [];`
`36`	`36`	`};`
`37`	`37`	`}`
`38`	`38`