diff options
| author | Marco Maggesi <1809783+maggesi@users.noreply.github.com> | 2019-10-13 18:06:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 18:06:23 +0200 |
| commit | 24d0bd37b5ad2307f4f3f22c797d2123a9e143a9 (patch) | |
| tree | dd6d8371bcc83b446f4d1e2b41fab1d92ceb072a /maintainers | |
| parent | ff1ed720e280f2e4ff57dd869e93dbc9eb034040 (diff) | |
| parent | 4fb9a75fc85f82f2bb186d23b89190b53ad3ec1b (diff) | |
| download | nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.gz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.bz2 nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.lz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.xz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.zst nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.zip | |
Merge branch 'master' into rename-z77z-into-maggesi
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33c13754e49..260c8ddadcb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -356,6 +356,16 @@ github = "alunduil"; name = "Alex Brandt"; }; + alva = { + email = "alva@skogen.is"; + github = "fjallarefur"; + githubId = 42881386; + name = "Alva"; + keys = [{ + longkeyid = "ed25519/0xF53E323342F7A6D3"; + fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; + }]; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; @@ -2272,7 +2282,7 @@ name = "Frede Emil"; }; freepotion = { - email = "free.potion@yandex.ru"; + email = "42352817+freepotion@users.noreply.github.com"; github = "freepotion"; githubId = 42352817; name = "Free Potion"; @@ -2627,6 +2637,11 @@ githubId = 1401179; name = "Guanpeng Xu"; }; + hexa = { + github = "mweinelt"; + githubId = 131599; + name = "Martin Weinelt"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; @@ -3261,6 +3276,12 @@ githubId = 8460; name = "John Wiegley"; }; + jwijenbergh = { + email = "jeroenwijenbergh@protonmail.com"; + github = "jwijenbergh"; + githubId = 46386452; + name = "Jeroen Wijenbergh"; + }; jwilberding = { email = "jwilberding@afiniate.com"; name = "Jordan Wilberding"; @@ -3303,6 +3324,12 @@ email = "info+nix@chmist.com"; name = "karolchmist"; }; + kayhide = { + email = "kayhide@gmail.com"; + github = "kayhide"; + githubId = 1730718; + name = "Hideaki Kawai"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; @@ -4268,6 +4295,15 @@ githubId = 5698461; name = "Maciej Kazulak"; }; + mkf = { + email = "m@mikf.pl"; + github = "mkf"; + name = "Michał Krzysztof Feiler"; + keys = [{ + longkeyid = "rsa4096/0xE35C2D7C2C6AC724"; + fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; + }]; + }; mkg = { email = "mkg@vt.edu"; github = "mkgvt"; @@ -6503,6 +6539,12 @@ githubId = 224674; name = "Thomas Pham"; }; + Thra11 = { + email = "tahall256@protonmail.ch"; + github = "Thra11"; + githubId = 1391883; + name = "Tom Hall"; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; @@ -7046,6 +7088,12 @@ githubId = 36407913; name = "Uli Baum"; }; + xfix = { + email = "konrad@borowski.pw"; + github = "xfix"; + githubId = 1297598; + name = "Konrad Borowski"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; |