Merge pull request #93394 from NixOS/revert-89017-package-grouping

Revert "Group packages by language/builder via dummy maintainer"
This commit is contained in:
zowoq 2020-07-18 18:14:25 +10:00 committed by GitHub
commit f138879273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 19 deletions

View file

@ -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";

View file

@ -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;
})

View file

@ -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

View file

@ -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}"