diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-18 00:12:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-18 00:12:56 +0000 |
commit | 154bc6bfe607be732374fc57554b165e692b77a8 (patch) | |
tree | 60ad3d3927c23db46d7c904b3293906d56ef1f7d /maintainers | |
parent | 58045842897730e7b47c578ad9f175dbf35ad782 (diff) | |
parent | 8a33016960fc556929f10df9efae7fb372877441 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0c4c9a5a17ac7..a0569f44c06e8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3533,6 +3533,16 @@ githubId = 28303440; name = "Max Hausch"; }; + cherrykitten = { + email = "contact@cherrykitten.dev"; + github = "cherrykitten"; + githubId = 20300586; + matrix = "@sammy:cherrykitten.dev"; + name = "CherryKitten"; + keys = [{ + fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; + }]; + }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; @@ -3854,6 +3864,14 @@ githubId = 180339; name = "Andrew Cobb"; }; + coca = { + github = "Coca162"; + githubId = 62479942; + name = "Coca"; + keys = [{ + fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; + }]; + }; coconnor = { email = "coreyoconnor@gmail.com"; github = "coreyoconnor"; @@ -20579,6 +20597,12 @@ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; }]; }; + toasteruwu = { + email = "Aki@ToasterUwU.com"; + github = "ToasterUwU"; + githubId = 43654377; + name = "Aki"; + }; tobiasBora = { email = "tobias.bora.list@gmail.com"; github = "tobiasBora"; @@ -21692,6 +21716,12 @@ github = "wegank"; githubId = 9713184; }; + weitzj = { + name = "Jan Weitz"; + email = "nixpkgs@janweitz.de"; + github = "weitzj"; + githubId = 829277; + }; welteki = { email = "welteki@pm.me"; github = "welteki"; |