From 3fab0235db609082a25aa468f57576f1674bc210 Mon Sep 17 00:00:00 2001
From: Phorcys <57866459+phorcys420@users.noreply.github.com>
Date: Tue, 7 Jul 2026 21:23:59 +0200
Subject: [PATCH] maintainers: drop ghuntley

Last commits on maintained packages:
- coder: ["coder: resolve hash mismatch in fixed-output derivation" (23091da)](https://github.com/NixOS/nixpkgs/commit/23091da20c6491ccce78acbc71bfa98d8c64af28) on Mar 12, 2023
- mastodon: ["mastodon: add ghuntley as maintainer
" (6e0c9dc)](https://github.com/NixOS/nixpkgs/commit/6e0c9dcd87280deae219d2c5abfa1f5fd550f23a) on Nov 16, 2022
- openvscode-server: none in commit history
- pulumi: ["pulumi: 2.6.1 -> 2.10.2" (a922b0b)](https://github.com/NixOS/nixpkgs/commit/a922b0bf6fad2c7025de22a16ba12c911dd0be00) on Sep 24, 2020
---
 maintainers/maintainer-list.nix               | 6 ------
 pkgs/by-name/co/coder/package.nix             | 1 -
 pkgs/by-name/ma/mastodon/package.nix          | 1 -
 pkgs/by-name/op/openvscode-server/package.nix | 1 -
 pkgs/by-name/pu/pulumi-bin/package.nix        | 1 -
 5 files changed, 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe6dd76cbfa3..ddecd52f9ece 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10011,12 +10011,6 @@
     name = "Will Owens";
     keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303  FC4C 8074 09C9 2CE2 3033"; } ];
   };
-  ghuntley = {
-    email = "ghuntley@ghuntley.com";
-    github = "ghuntley";
-    githubId = 127353;
-    name = "Geoffrey Huntley";
-  };
   gibbert = {
     email = "gbjgms@gmail.com";
     github = "zgibberish";
diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index a56a65e02e57..84f200ff3676 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -104,7 +104,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       bpmct
       developmentcats
-      ghuntley
       kylecarbs
       phorcys420
     ];
diff --git a/pkgs/by-name/ma/mastodon/package.nix b/pkgs/by-name/ma/mastodon/package.nix
index f75a1fda6a4d..3a211fdc08b6 100644
--- a/pkgs/by-name/ma/mastodon/package.nix
+++ b/pkgs/by-name/ma/mastodon/package.nix
@@ -190,7 +190,6 @@ stdenv.mkDerivation rec {
       happy-river
       erictapen
       izorkin
-      ghuntley
     ];
   };
 }
diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index 074d42c058e5..494acae6cf4b 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -239,7 +239,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dguenther
-      ghuntley
       emilytrau
     ];
     platforms = [
diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix
index 6a10d4ca58eb..86513a3c1187 100644
--- a/pkgs/by-name/pu/pulumi-bin/package.nix
+++ b/pkgs/by-name/pu/pulumi-bin/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
     license = with lib.licenses; [ asl20 ];
     platforms = builtins.attrNames data.pulumiPkgs;
     maintainers = with lib.maintainers; [
-      ghuntley
       jlesquembre
       cpcloud
       wrbbz