diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
| commit | ad899504860973e98351c922ecb934595f2c0f19 (patch) | |
| tree | b1260cc90947e834af941c6cb6aed51dc68f50b5 /nixpkgs/maintainers | |
| parent | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (diff) | |
| parent | dc676e1b5014069a2b06e236242e2f0990384934 (diff) | |
| download | nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.gz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.bz2 nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.lz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.xz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.zst nixlib-ad899504860973e98351c922ecb934595f2c0f19.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/maintainers')
| -rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 24 | ||||
| -rw-r--r-- | nixpkgs/maintainers/team-list.nix | 10 |
2 files changed, 33 insertions, 1 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 181cfd845f0a..23975a5a33a6 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -6706,7 +6706,7 @@ }; getpsyched = { name = "Priyanshu Tripathi"; - email = "priyanshutr@proton.me"; + email = "priyanshu@getpsyched.dev"; matrix = "@getpsyched:matrix.org"; github = "getpsyched"; githubId = 43472218; @@ -7525,6 +7525,16 @@ githubId = 362833; name = "Hongchang Wu"; }; + honnip = { + name = "Jung seungwoo"; + email = "me@honnip.page"; + matrix = "@honnip:matrix.org"; + github = "honnip"; + githubId = 108175486; + keys = [{ + fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; + }]; + }; hoppla20 = { email = "privat@vincentcui.de"; github = "hoppla20"; @@ -9298,6 +9308,12 @@ githubId = 5124422; name = "Julien Urraca"; }; + justanotherariel = { + email = "ariel@ebersberger.io"; + github = "justanotherariel"; + githubId = 31776703; + name = "Ariel Ebersberger"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; @@ -13014,6 +13030,12 @@ githubId = 77314501; name = "Maurice Zhou"; }; + Nebucatnetzer = { + email = "andreas+nixpkgs@zweili.ch"; + github = "Nebucatnetzer"; + githubId = 2287221; + name = "Andreas Zweili"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index 35aba906cffe..c5b37437ddb2 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -96,6 +96,16 @@ with lib.maintainers; { shortName = "Blockchains"; }; + buildbot = { + members = [ + lopsided98 + mic92 + zowoq + ]; + scope = "Maintain Buildbot CI framework"; + shortName = "Buildbot"; + }; + c = { members = [ matthewbauer |