git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93394 from NixOS/revert-89017-package-grouping

Revert "Group packages by language/builder via dummy maintainer"

commitf13887927328c2602a2498369f58a47d411096b8 authorzowoq <59103226+zowoq@users.noreply.github.com> dateSat 18 Jul 2020, 18:14 (6 years ago) parenteffb57d0f19b9b
4 files changed+3−19
maintainers/maintainer-list.nix−8 pkgs/build-support/rust/default.nix+1−5 pkgs/development/go-modules/generic/default.nix+1−1 pkgs/development/go-packages/generic/default.nix+1−5
maintainers/maintainer-list.nix−8
@@ -5832,14 +5832,6 @@
58325832 githubId = 16385648;
58335833 name = "Niko Pavlinek";
58345834 };
5835− nixpkgs-go = {
5836− email = "go@nixpkgs";
5837− name = "Nixpkgs Go Packages";
5838− };
5839− nixpkgs-rust = {
5840− email = "rust@nixpkgs";
5841− name = "Nixpkgs Rust Packages";
5842− };
58435835 nixy = {
58445836 email = "nixy@nixy.moe";
58455837 github = "nixy";
pkgs/build-support/rust/default.nix+1−5
@@ -241,9 +241,5 @@ stdenv.mkDerivation (args // {
241241 meta = {
242242 # default to Rust's platforms
243243 platforms = rustc.meta.platforms;
244− } // meta // {
245− # add an extra maintainer to every package
246− maintainers = (meta.maintainers or []) ++
247− [ stdenv.lib.maintainers.nixpkgs-rust ];
248− };
244+ } // meta;
249245})
pkgs/development/go-modules/generic/default.nix+1−1
@@ -236,7 +236,7 @@ let
236236 } // meta // {
237237 # add an extra maintainer to every package
238238 maintainers = (meta.maintainers or []) ++
239− [ lib.maintainers.kalbasit lib.maintainers.nixpkgs-go ];
239+ [ lib.maintainers.kalbasit ];
240240 };
241241 });
242242in if disabled then
pkgs/development/go-packages/generic/default.nix+1−5
@@ -239,11 +239,7 @@ let
239239 # Add default meta information
240240 homepage = "https://${goPackagePath}";
241241 platforms = go.meta.platforms or lib.platforms.all;
242− } // meta // {
243− # add an extra maintainer to every package
244− maintainers = (meta.maintainers or []) ++
245− [ lib.maintainers.nixpkgs-go ];
246− };
242+ } // meta;
247243 });
248244in if disabled then
249245 throw "${package.name} not supported for go ${go.meta.branch}"