swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-20 12:43:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
parent effb57d395 0f19b9ba72
commit f138879273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
maintainers/maintainer-list.nix
View file

@ -5832,14 +5832,6 @@
githubId = 16385648; githubId = 16385648;
name = "Niko Pavlinek"; name = "Niko Pavlinek";
}; };
nixpkgs-go = {
email = "go@nixpkgs";
name = "Nixpkgs Go Packages";
};
nixpkgs-rust = {
email = "rust@nixpkgs";
name = "Nixpkgs Rust Packages";
};
nixy = { nixy = {
email = "nixy@nixy.moe"; email = "nixy@nixy.moe";
github = "nixy"; github = "nixy";

6
pkgs/build-support/rust/default.nix
View file

@ -241,9 +241,5 @@ stdenv.mkDerivation (args // {
meta = { meta = {
# default to Rust's platforms # default to Rust's platforms
platforms = rustc.meta.platforms; platforms = rustc.meta.platforms;
} // meta // { } // meta;
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
[ stdenv.lib.maintainers.nixpkgs-rust ];
};
}) })

2
pkgs/development/go-modules/generic/default.nix
View file

@ -236,7 +236,7 @@ let
} // meta // { } // meta // {
# add an extra maintainer to every package # add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++ maintainers = (meta.maintainers or []) ++
[ lib.maintainers.kalbasit lib.maintainers.nixpkgs-go ]; [ lib.maintainers.kalbasit ];
}; };
}); });
in if disabled then in if disabled then

6
pkgs/development/go-packages/generic/default.nix
View file

@ -239,11 +239,7 @@ let
# Add default meta information # Add default meta information
homepage = "https://${goPackagePath}"; homepage = "https://${goPackagePath}";
platforms = go.meta.platforms or lib.platforms.all; 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 in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}" throw "${package.name} not supported for go ${go.meta.branch}"