diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /maintainers/maintainer-list.nix | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab555b19b9f..60484838756 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -807,6 +807,11 @@ github = "coroa"; name = "Jonas Hörsch"; }; + costrouc = { + email = "chris.ostrouchov@gmail.com"; + github = "costrouc"; + name = "Chris Ostrouchov"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -1689,6 +1694,11 @@ github = "imalsogreg"; name = "Greg Hale"; }; + imuli = { + email = "i@imu.li"; + github = "imuli"; + name = "Imuli"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; @@ -1837,6 +1847,11 @@ github = "jluttine"; name = "Jaakko Luttinen"; }; + jmettes = { + email = "jonathan@jmettes.com"; + github = "jmettes"; + name = "Jonathan Mettes"; + }; Jo = { email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; @@ -2094,6 +2109,11 @@ github = "kuznero"; name = "Roman Kuznetsov"; }; + kylewlacy = { + email = "kylelacy+nix@pm.me"; + github = "kylewlacy"; + name = "Kyle Lacy"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; @@ -2180,7 +2200,7 @@ name = "Nathaniel Baxter"; }; lightdiscord = { - email = "arnaud@lightdiscord.me"; + email = "root@arnaud.sh"; github = "lightdiscord"; name = "Arnaud Pascal"; }; |