From a646a39bb326a34f3b5123392daed4efe0cd72af Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 16:47:58 +0200
Subject: [PATCH 1/3] maintainers/matrix: add transcaffeine

She's been tirelessly keeping Synapse up-to-date and also worked quite a
lot on the Element packages, so having her officially part of this makes
sense. I confirmed with her in private that she's interested.
---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1480b3733b92..b9a161f95456 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -510,6 +510,7 @@ with lib.maintainers;
       dandellion
       nickcao
       teutat3s
+      transcaffeine
     ];
     scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
     shortName = "Matrix";

From 4ed9aa9fd26fb33d66ab59bb814b518317c03e9d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 17:09:57 +0200
Subject: [PATCH 2/3] maintainers/matrix: rescope the team

It's absolutely not reasonable to have us maintain random homeserver
implementations and Matrix clients. I don't think anyone is actually
operating and focusing on >1 of these implementations, so restricting
ourselves to the core things & reference implementations makes more
sense to me.
---
 maintainers/team-list.nix                                      | 2 +-
 nixos/modules/services/matrix/dendrite.nix                     | 1 -
 nixos/tests/matrix/pantalaimon.nix                             | 3 ---
 .../networking/instant-messengers/hydrogen-web/unwrapped.nix   | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index b9a161f95456..638ef8e58e9b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -512,7 +512,7 @@ with lib.maintainers;
       teutat3s
       transcaffeine
     ];
-    scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
+    scope = "Maintain the foundational packages of the Matrix ecosystem.";
     shortName = "Matrix";
   };
 
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 302bd42b5e37..4a55c30c839b 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -341,5 +341,4 @@ in
       };
     };
   };
-  meta.teams = [ lib.teams.matrix ];
 }
diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix
index fdf2c4de7ad3..aac75ab28c9d 100644
--- a/nixos/tests/matrix/pantalaimon.nix
+++ b/nixos/tests/matrix/pantalaimon.nix
@@ -31,9 +31,6 @@ let
 in
 {
   name = "pantalaimon";
-  meta = {
-    maintainers = pkgs.lib.teams.matrix.members;
-  };
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
index b6fc9a80f8a5..adbe9fa9659c 100644
--- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lightweight matrix client with legacy and mobile browser support";
     homepage = "https://github.com/element-hq/hydrogen-web";
-    teams = [ lib.teams.matrix ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     inherit (olm.meta) knownVulnerabilities;

From 68b5ed676715901a2d8542103370693c2d732510 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 17:17:33 +0200
Subject: [PATCH 3/3] maintainers/matrix: rm inactive people

This list reflects the current reality better.
---
 maintainers/team-list.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 638ef8e58e9b..043e3f6336cd 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -506,8 +506,6 @@ with lib.maintainers;
   matrix = {
     members = [
       ma27
-      mguentner
-      dandellion
       nickcao
       teutat3s
       transcaffeine