diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 05:35:09 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 05:35:09 +0000 |
commit | d99a2fc093c1bffd41f0008689cd2be4f1b7dea6 (patch) | |
tree | 827becf0bb8f449b71439a22a1746698eb175612 /lib/maintainers.nix | |
parent | 020a6663d319c7b4af5c0219bc451abdac12f62a (diff) | |
parent | 3ac474aee6ac977f67fa4ffd35da8af56df5fba8 (diff) | |
download | nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar.gz nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar.bz2 nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar.lz nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar.xz nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.tar.zst nixlib-d99a2fc093c1bffd41f0008689cd2be4f1b7dea6.zip |
Merge branch 'master' into staging
* master: (293 commits) go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle qsyncthingtray: fix build qt56.qtwebengine: fix build stdman: d860212 -> 2017.04.02 jackett: use mono50 hg-git: disable with python3 hg-git: 0.8.5 -> 0.8.10 xfce4-settings: enable parallel building gcc-snapshot: mark as broken heaptrack: 2017-02-14 -> 2017-10-30 nixos-container: Modify existing test to cover show-ip command nixos-container: Make show-ip work together with ipv4 + netmask linux-copperhead: 4.13.12.a -> 4.13.13.a matterbridge: 1.1.0 -> 1.4.1 nixos/nghttpx: add module for the nghttpx proxy server (#31680) mattermost: 4.3.0 -> 4.4.0 breakpad: delete simp_le: 0.2.0 -> 0.6.1 certbot: 0.11.1 -> 0.19.0 afl: 2.51b -> 2.52b ...
Diffstat (limited to 'lib/maintainers.nix')
-rw-r--r-- | lib/maintainers.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f09869cda2d0..f3790d62add0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -62,7 +62,7 @@ asppsa = "Alastair Pharo <asppsa@gmail.com>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; asymmetric = "Lorenzo Manacorda <lorenzo@mailbox.org>"; - aszlig = "aszlig <aszlig@redmoonstudios.org>"; + aszlig = "aszlig <aszlig@nix.build>"; auntie = "Jonathan Glines <auntieNeo@gmail.com>"; avnik = "Alexander V. Nikolaev <avn@avnik.info>"; aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; @@ -111,6 +111,7 @@ changlinli = "Changlin Li <mail@changlinli.com>"; chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; chattered = "Phil Scott <me@philscotted.com>"; + ChengCat = "Yucheng Zhang <yu@cheng.cat>"; choochootrain = "Hurshal Patel <hurshal@imap.cc>"; chpatrick = "Patrick Chilton <chpatrick@gmail.com>"; chris-martin = "Chris Martin <ch.martin@gmail.com>"; @@ -144,6 +145,7 @@ DamienCassou = "Damien Cassou <damien@cassou.me>"; danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>"; dancek = "Hannu Hartikainen <hannu.hartikainen@gmail.com>"; + danharaj = "Dan Haraj <dan@obsidian.systems>"; danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>"; dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>"; david50407 = "David Kuo <me@davy.tw>"; @@ -218,6 +220,7 @@ falsifian = "James Cook <james.cook@utoronto.ca>"; fare = "Francois-Rene Rideau <fahree@gmail.com>"; fgaz = "Francesco Gazzetta <francygazz@gmail.com>"; + FireyFly = "Jonas Höglund <nix@firefly.nu>"; flokli = "Florian Klink <flokli@flokli.de>"; florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; @@ -282,6 +285,7 @@ infinisil = "Silvan Mosberger <infinisil@icloud.com>"; ironpinguin = "Michele Catalano <michele@catalano.de>"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; + ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jammerful = "jammerful <jammerful@gmail.com>"; @@ -325,6 +329,7 @@ kaiha = "Kai Harries <kai.harries@gmail.com>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; + karolchmist = "karolchmist <info+nix@chmist.com>"; kentjames = "James Kent <jameschristopherkent@gmail.com"; kevincox = "Kevin Cox <kevincox@kevincox.ca>"; khumba = "Bryan Gardiner <bog@khumba.net>"; |