From 8feba149a095b206e4ed56628cfb0db7aa3a3eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=B6ppner?= <chris@mkaito.net>
Date: Wed, 13 Nov 2024 11:56:11 +0000
Subject: [PATCH] mkaito: Remove

---
 maintainers/maintainer-list.nix       | 6 ------
 nixos/tests/oci-containers.nix        | 2 +-
 pkgs/by-name/ac/acme-sh/package.nix   | 2 +-
 pkgs/by-name/va/vault-bin/package.nix | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eb4de4a1f18b..49aa4ca72b92 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14550,12 +14550,6 @@
     githubId = 16974598;
     name = "Mike Playle";
   };
-  mkaito = {
-    email = "chris@mkaito.net";
-    github = "mkaito";
-    githubId = 20434;
-    name = "Christian Höppner";
-  };
   mkazulak = {
     email = "kazulakm@gmail.com";
     github = "mulderr";
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index 9adceb11f18c..bc80f2d9b5db 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -12,7 +12,7 @@ let
     name = "oci-containers-${backend}";
 
     meta.maintainers = lib.teams.serokell.members
-                       ++ (with lib.maintainers; [ benley mkaito ]);
+                       ++ (with lib.maintainers; [ benley ]);
 
     nodes = {
       ${backend} = { pkgs, ... }: {
diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index c79bcebda086..d0b8eadbbd00 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
       - Cron job notifications for renewal or error etc.
     '';
     license = licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ mkaito ] ++ teams.serokell.members;
+    maintainers = lib.teams.serokell.members;
     inherit (coreutils.meta) platforms;
     mainProgram = "acme.sh";
   };
diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index c6622a32c884..6e39e73ef48b 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
         psyanticy
         Chili-Man
         techknowlogick
-        mkaito
       ];
     mainProgram = "vault";
     platforms = [