diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
| commit | 884449105ea418fb8d205c0e1cd37a32b49c18db (patch) | |
| tree | 20dce878c7b27691383a4da487379b4a04eb81ba /maintainers | |
| parent | c1eb661271bf5c3e0baa7b32ebd9d455883d95d0 (diff) | |
| parent | 5c6e85ee472d37c904dd43f8f76b680602b9128f (diff) | |
| download | nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.gz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.bz2 nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.lz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.xz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.zst nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3716b1d6e0..a34b9917388 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3692,6 +3692,12 @@ githubId = 1222362; name = "Matías Lang"; }; + criyle = { + email = "i+nixos@goj.ac"; + name = "Yang Gao"; + githubId = 6821729; + github = "criyle"; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; @@ -4245,6 +4251,12 @@ githubId = 5503422; name = "Dmitriy Demin"; }; + demine = { + email = "riches_tweaks0o@icloud.com"; + github = "demine0"; + githubId = 51992962; + name = "Nikita Demin"; + }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ea5f4a53e1d..3ad43f2a34e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -324,12 +324,16 @@ with lib.maintainers; { geospatial = { members = [ imincik - sikmir nh2 + sikmir willcohen ]; + githubTeams = [ + "geospatial" + ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; + enableFeatureFreezePing = true; }; gitlab = { |