diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-26 18:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 18:01:02 +0000 |
| commit | 96132a216a919e3260941c67161b5f16c6a85880 (patch) | |
| tree | 55964a141e571c641c703e4251d97785c8e301d3 /maintainers/maintainer-list.nix | |
| parent | 23c525f8dadc3caf0b00a1406ad5a6bd76ea5357 (diff) | |
| parent | adcaf3962d5147cec7d63c1ff9e3f7a3fe4653d4 (diff) | |
| download | nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar.gz nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar.bz2 nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar.lz nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar.xz nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.tar.zst nixpkgs-96132a216a919e3260941c67161b5f16c6a85880.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a1460e3b99b..7e7eb427c28 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1386,6 +1386,12 @@ githubId = 59743220; name = "Vinícius Müller"; }; + arcuru = { + email = "patrick@jackson.dev"; + github = "arcuru"; + githubId = 160646; + name = "Patrick Jackson"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -12085,6 +12091,16 @@ githubId = 839693; name = "Ingolf Wanger"; }; + msanft = { + email = "moritz.sanft@outlook.de"; + matrix = "@msanft:matrix.org"; + name = "Moritz Sanft"; + github = "msanft"; + githubId = 58110325; + keys = [{ + fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; + }]; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -13541,12 +13557,6 @@ githubId = 6931743; name = "pasqui23"; }; - patricksjackson = { - email = "patrick@jackson.dev"; - github = "patricksjackson"; - githubId = 160646; - name = "Patrick Jackson"; - }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; |