From 5650202eda015d52d80591e5e1a1a338f0267523 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:23:18 +1000
Subject: [PATCH 1/4] maintainers: add nixpkgs-{go,rust}

---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 81dc86368b7..1f9f1a12eab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5826,6 +5826,14 @@
     githubId = 16385648;
     name = "Niko Pavlinek";
   };
+  nixpkgs-go = {
+    email = "go@nixpkgs";
+    name = "Nixpkgs Go Packages";
+  };
+  nixpkgs-rust = {
+    email = "rust@nixpkgs";
+    name = "Nixpkgs Rust Packages";
+  };
   nixy = {
     email = "nixy@nixy.moe";
     github = "nixy";

From 2613e6d0e74406f9ed68676a4348cd3c73eb9032 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:24:42 +1000
Subject: [PATCH 2/4] buildRustPackage: add nixpkgs-rust maintainer

---
 pkgs/build-support/rust/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 9e9f2cb4e3b..08f1febea3e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -241,5 +241,9 @@ stdenv.mkDerivation (args // {
   meta = {
     # default to Rust's platforms
     platforms = rustc.meta.platforms;
-  } // meta;
+  } // meta // {
+      # add an extra maintainer to every package
+      maintainers = (meta.maintainers or []) ++
+                    [ stdenv.lib.maintainers.nixpkgs-rust ];
+  };
 })

From 60d878317bebec5ea3ed89aa74ffe63964fd927f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:25:13 +1000
Subject: [PATCH 3/4] buildGoModule: add nixpkgs-go maintainer

---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index a478871bd9a..a1759699c54 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -236,7 +236,7 @@ let
     } // meta // {
       # add an extra maintainer to every package
       maintainers = (meta.maintainers or []) ++
-                    [ lib.maintainers.kalbasit ];
+                    [ lib.maintainers.kalbasit lib.maintainers.nixpkgs-go ];
     };
   });
 in if disabled then

From 075a891269b4679de6a8fd278887264bf9f38648 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 28 Jun 2020 10:25:38 +1000
Subject: [PATCH 4/4] buildGoPackage: add nixpkgs-go maintainer

---
 pkgs/development/go-packages/generic/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 54d1c743bee..cd94ce580f7 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -239,7 +239,11 @@ let
       # Add default meta information
       homepage = "https://${goPackagePath}";
       platforms = go.meta.platforms or lib.platforms.all;
-    } // meta;
+    } // meta // {
+      # add an extra maintainer to every package
+      maintainers = (meta.maintainers or []) ++
+                    [ lib.maintainers.nixpkgs-go ];
+    };
   });
 in if disabled then
   throw "${package.name} not supported for go ${go.meta.branch}"