diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/maintainers | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/maintainers')
-rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 780c1dbd9c48..0b82c9c59f77 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -710,12 +710,6 @@ githubId = 8316672; name = "Alex Chapman"; }; - alexeyre = { - email = "A.Eyre@sms.ed.ac.uk"; - github = "alexeyre"; - githubId = 38869148; - name = "Alex Eyre"; - }; alexfmpe = { email = "alexandre.fmp.esteves@gmail.com"; github = "alexfmpe"; @@ -3932,6 +3926,12 @@ githubId = 11422515; name = "David Sánchez"; }; + dawidd6 = { + email = "dawidd0811@gmail.com"; + github = "dawidd6"; + githubId = 9713907; + name = "Dawid Dziurla"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; @@ -6113,6 +6113,12 @@ githubId = 313929; name = "Gabriel Ebner"; }; + geluk = { + email = "johan+nix@geluk.io"; + github = "geluk"; + githubId = 1516985; + name = "Johan Geluk"; + }; genericnerdyusername = { name = "GenericNerdyUsername"; email = "genericnerdyusername@proton.me"; @@ -10893,13 +10899,15 @@ name = "Matthias C. M. Troffaes"; }; McSinyx = { - email = "mcsinyx@disroot.org"; + email = "cnx@loang.net"; github = "McSinyx"; githubId = 13689192; + matrix = "@cnx:loang.net"; name = "Nguyễn Gia Phong"; - keys = [{ - fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; - }]; + keys = [ + { fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; } + { fingerprint = "838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"; } + ]; }; mcwitt = { email = "mcwitt@gmail.com"; @@ -11013,6 +11021,12 @@ githubId = 3300322; name = "Mitchell Fossen"; }; + mfrw = { + email = "falakreyaz@gmail.com"; + github = "mfrw"; + githubId = 4929861; + name = "Muhammad Falak R Wani"; + }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; |