about summary refs log tree commit diff
path: root/lib/maintainers.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-10-30 17:16:07 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-10-30 17:16:07 -0700
commitdd2de66d614e58a8b89046e2de73f2305df4b23f (patch)
treef89847bb63642613f543a44e4e270643f6c1c4b7 /lib/maintainers.nix
parent99fe4f97c55185d3f51b759cbd5f8e3ab029eadb (diff)
parenta7d573f224707185c44c92b8a35eb6a7ad62c552 (diff)
downloadnixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.gz
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.bz2
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.lz
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.xz
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.zst
nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'lib/maintainers.nix')
-rw-r--r--lib/maintainers.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78ccbc68b8bf..902095b5a7fe 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -76,6 +76,7 @@
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
+  demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>";
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
@@ -89,6 +90,7 @@
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
+  elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   emery = "Emery Hemingway <emery@vfemail.net>";
   enolan = "Echo Nolan <echo@echonolan.net>";
@@ -181,6 +183,7 @@
   mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
+  mbe = "Brandon Edens <brandonedens@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
@@ -259,9 +262,11 @@
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
+  spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
+  steveej = "Stefan Junker <mail@stefanjunker.de>";
   szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
@@ -289,6 +294,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
+  wedens = "wedens <kirill.wedens@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";