diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-07 18:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 18:01:27 +0000 |
| commit | 9cdb39f965f588390a2685b6f725a023c4b16221 (patch) | |
| tree | 6750e439562a6e2b3dbc130931b809c57ccf8aca /maintainers | |
| parent | 4e2cf99754e07b51bb266e9392009302ef4bd802 (diff) | |
| parent | 64b690300863dd46651da6ecc69451e8ffb8af97 (diff) | |
| download | nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar.gz nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar.bz2 nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar.lz nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar.xz nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.tar.zst nixpkgs-9cdb39f965f588390a2685b6f725a023c4b16221.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4498db46d28..4eeffa46472 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4396,6 +4396,12 @@ githubId = 27668; name = "Tobias Pflug"; }; + gin66 = { + email = "jochen@kiemes.de"; + github = "gin66"; + githubId = 5549373; + name = "Jochen Kiemes"; + }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; @@ -7523,16 +7529,6 @@ githubId = 29855073; name = "Michael Colicchia"; }; - matdsoupe = { - github = "matdsoupe"; - githubId = 44469426; - name = "Matheus de Souza Pessanha"; - email = "matheus_pessanha2001@outlook.com"; - keys = [{ - longkeyid = "rsa4096/0x2671964AB1E06A08"; - fingerprint = "2F32 CFEF E11A D73B A740 FA47 2671 964A B1E0 6A08"; - }]; - }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -13767,6 +13763,16 @@ github = "zeri42"; githubId = 68825133; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + longkeyid = "rsa4096/0x1E1E889CDBD6A315"; + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zombiezen = { name = "Ross Light"; email = "ross@zombiezen.com"; |