From 4d61155d4d312a6c4c9977ddf7fbe1d22cb7bbf7 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 20 Nov 2025 10:07:54 -0500
Subject: [PATCH 1/2] maintainers: remove JoanMassachs due to inactivity

No PRs since May 2024 and does not appear to be part of the NixOS GitHub
organization anymore.
---
 maintainers/maintainer-list.nix   | 5 -----
 pkgs/by-name/m1/m1ddc/package.nix | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0d022c7f1dfa..52a325bf142a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12414,11 +12414,6 @@
     githubId = 1102396;
     name = "Jussi Maki";
   };
-  joanmassachs = {
-    github = "joanmassachs";
-    githubId = 22916782;
-    name = "Joan Massachs";
-  };
   joaomoreira = {
     matrix = "@joaomoreira:matrix.org";
     github = "joaoymoreira";
diff --git a/pkgs/by-name/m1/m1ddc/package.nix b/pkgs/by-name/m1/m1ddc/package.nix
index 51a2113fa17a..540e712c8148 100644
--- a/pkgs/by-name/m1/m1ddc/package.nix
+++ b/pkgs/by-name/m1/m1ddc/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/waydabber/m1ddc";
     license = lib.licenses.mit;
     mainProgram = "m1ddc";
-    maintainers = [ lib.maintainers.joanmassachs ];
+    maintainers = [ ];
     platforms = [ "aarch64-darwin" ];
   };
 })

From d050c4c3bf1ab571e7ddbfcf64fbe5e2684ed344 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 20 Nov 2025 10:09:08 -0500
Subject: [PATCH 2/2] m1ddc: adopt

---
 pkgs/by-name/m1/m1ddc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/m1/m1ddc/package.nix b/pkgs/by-name/m1/m1ddc/package.nix
index 540e712c8148..20ad022ecf8b 100644
--- a/pkgs/by-name/m1/m1ddc/package.nix
+++ b/pkgs/by-name/m1/m1ddc/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/waydabber/m1ddc";
     license = lib.licenses.mit;
     mainProgram = "m1ddc";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.amarshall ];
     platforms = [ "aarch64-darwin" ];
   };
 })