diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 8 | ||||
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 2 | ||||
| -rw-r--r-- | 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 bd7a513bd2d..8e77ec4ff31 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 08f1febea3e..9e9f2cb4e3b 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 a1759699c54..a478871bd9a 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 cd94ce580f7..54d1c743bee 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}" |