From 201cb3e5190cbaa5fa484d9c8cd85fed89926855 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 10:50:44 +0200
Subject: [PATCH 1/2] teams/flyingcircus: remove ma27 from members

By the end of the month, I'll leave Flying Circus. Thanks a lot for the
journey together <3

The rootless-test for podman is something I decided to keep since I'm
using parts of the features covered in there myself.
---
 maintainers/team-list.nix      | 1 -
 nixos/tests/oci-containers.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index d954ae67ccd4..9b1290fe3585 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -421,7 +421,6 @@ with lib.maintainers;
       frlan
       leona
       osnyx
-      ma27
     ];
     scope = "Team for Flying Circus employees who collectively maintain packages.";
     shortName = "Flying Circus employees";
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index d50a8c44aaa4..9d41e4baffdf 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -73,7 +73,7 @@ let
     type:
     makeTest {
       name = "oci-containers-podman-rootless-${type}";
-      meta.maintainers = lib.teams.flyingcircus.members;
+      meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ];
       nodes = {
         podman =
           { pkgs, ... }:

From 10d9aa38114b4812fbdddc5e0361e741f59d2d5c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 27 Aug 2025 10:58:57 +0200
Subject: [PATCH 2/2] treewide: remove myself from a few more packages

* Stopped using wiki-js.
* I never really contributed to mpv, even though that apparently was the
  plan a while ago.
* pydash was a reverse-dependency of privacyidea which I removed long
  ago. Since then I haven't touched it anymore.
---
 pkgs/applications/video/mpv/default.nix            | 1 -
 pkgs/by-name/wi/wiki-js/package.nix                | 2 +-
 pkgs/development/python-modules/pydash/default.nix | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 8bb0d9277411..336d1a1136a9 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -314,7 +314,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       fpletz
       globin
-      ma27
       SchweGELBin
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wi/wiki-js/package.nix b/pkgs/by-name/wi/wiki-js/package.nix
index 81b66b23839b..159ecabc0a2d 100644
--- a/pkgs/by-name/wi/wiki-js/package.nix
+++ b/pkgs/by-name/wi/wiki-js/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://js.wiki/";
     description = "Modern and powerful wiki app built on Node.js";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
index 27f1675ccdf3..57600d4fa5b7 100644
--- a/pkgs/development/python-modules/pydash/default.nix
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://pydash.readthedocs.io";
     changelog = "https://github.com/dgilland/pydash/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 }