From 0f19b9ba72912d92faba2e2e18ba04158840b6ee Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 18 Jul 2020 17:45:08 +1000
Subject: [PATCH] Revert "Group packages by language/builder via dummy
 maintainer"

---
 maintainers/maintainer-list.nix                  | 8 --------
 pkgs/build-support/rust/default.nix              | 6 +-----
 pkgs/development/go-modules/generic/default.nix  | 2 +-
 pkgs/development/go-packages/generic/default.nix | 6 +-----
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bd7a513bd2d6..8e77ec4ff314 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5832,14 +5832,6 @@
     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";
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 08f1febea3e4..9e9f2cb4e3bc 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -241,9 +241,5 @@ stdenv.mkDerivation (args // {
   meta = {
     # default to Rust's platforms
     platforms = rustc.meta.platforms;
-  } // meta // {
-      # add an extra maintainer to every package
-      maintainers = (meta.maintainers or []) ++
-                    [ stdenv.lib.maintainers.nixpkgs-rust ];
-  };
+  } // meta;
 })
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index a1759699c548..a478871bd9ad 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.nixpkgs-go ];
+                    [ lib.maintainers.kalbasit ];
     };
   });
 in if disabled then
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index cd94ce580f7e..54d1c743bee0 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -239,11 +239,7 @@ let
       # Add default meta information
       homepage = "https://${goPackagePath}";
       platforms = go.meta.platforms or lib.platforms.all;
-    } // meta // {
-      # add an extra maintainer to every package
-      maintainers = (meta.maintainers or []) ++
-                    [ lib.maintainers.nixpkgs-go ];
-    };
+    } // meta;
   });
 in if disabled then
   throw "${package.name} not supported for go ${go.meta.branch}"