diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-10 00:12:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-10 00:12:33 +0000 |
commit | 864aa20266f410fa57340458b9d5c5e76d2af060 (patch) | |
tree | e86cc0e5b064636ea1d2d8e81309b8f27fefe000 /maintainers | |
parent | 01eec38f90306b0b68ba1c715c05244dcc2e5554 (diff) | |
parent | 2b1eb11946cd47f4d7a5e248a091852b0fbb5fda (diff) |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 463707bc328c4..77c6562377b07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4651,6 +4651,16 @@ fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }]; }; + dunxen = { + email = "git@dunxen.dev"; + matrix = "@dunxen:x0f.org"; + github = "dunxen"; + githubId = 3072149; + name = "Duncan Dean"; + keys = [{ + fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; + }]; + }; dwarfmaster = { email = "nixpkgs@dwarfmaster.net"; github = "dwarfmaster"; @@ -8560,6 +8570,12 @@ name = "John Soo"; githubId = 10039785; }; + jsusk = { + email = "joshua@suskalo.org"; + github = "IGJoshua"; + name = "Joshua Suskalo"; + githubId = 27734541; + }; jtbx = { email = "jtbx@duck.com"; name = "Jeremy Baxter"; @@ -9392,6 +9408,12 @@ name = "Tomas Krupka"; matrix = "@krupkat:matrix.org"; }; + krzaczek = { + name = "Pawel Krzaczkowski"; + email = "pawel@printu.pl"; + github = "krzaczek"; + githubId = 5773701; + }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; @@ -10820,7 +10842,7 @@ }]; }; max-amb = { - email = "maxpeterambaum@gmail.com"; + email = "max_a@e.email"; github = "max-amb"; githubId = 137820334; name = "Max Ambaum"; |