diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-14 10:20:32 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-14 10:20:32 +0100 |
| commit | 05962c4ad558b6802e64e8992aebf2dfc946d34e (patch) | |
| tree | 0fa0c4fd8cd03ca60fe09bd5816864281cbe8d39 /maintainers | |
| parent | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (diff) | |
| parent | ec2ed2d316d850061ffa75a43f487928b0d7e7c3 (diff) | |
| download | nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.gz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.bz2 nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.lz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.xz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.zst nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 180eca8fe32..bdeed800890 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2439,6 +2439,12 @@ githubId = 844574; name = "Daniel Austin"; }; + flyfloh = { + email = "nix@halbmastwurf.de"; + github = "flyfloh"; + githubId = 74379; + name = "Florian Pester"; + }; fmthoma = { email = "f.m.thoma@googlemail.com"; github = "fmthoma"; @@ -5082,6 +5088,12 @@ githubId = 7588406; name = "Andrew R. M."; }; + nloomans = { + email = "noah@nixos.noahloomans.com"; + github = "nloomans"; + githubId = 7829481; + name = "Noah Loomans"; + }; nmattia = { email = "nicolas@nmattia.com"; github = "nmattia"; @@ -7026,6 +7038,11 @@ github = "timbertson"; name = "Tim Cuthbertson"; }; + timma = { + email = "kunduru.it.iitb@gmail.com"; + github = "ktrsoft"; + name = "Timma"; + }; timokau = { email = "timokau@zoho.com"; github = "timokau"; |