diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9dc2572770606..f3b7483bd2f85 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,721 +1,743 @@
{ ...}:
/* List of NixOS maintainers. The format is:
- handle = "Real Name
";
+ handle = { name = "Real Name"; email = "address@example.org>";
+ GitHub ="GH handle"; IRC = "IRC handle"; };
- where is preferred to be your GitHub username (so it's easy
- to ping a package @), and is your real name, not
- a pseudonym. Please keep the list alphabetically sorted. */
-{
- a1russell = "Adam Russell ";
- aaronschif = "Aaron Schif ";
- abaldeau = "Andreas Baldeau ";
- abbradar = "Nikolay Amiantov ";
- abigailbuccaneer = "Abigail Bunyan ";
- aboseley = "Adam Boseley ";
- abuibrahim = "Ruslan Babayev ";
- acowley = "Anthony Cowley ";
- adelbertc = "Adelbert Chang ";
- adev = "Adrien Devresse ";
- adisbladis = "Adam Hose ";
- Adjective-Object = "Maxwell Huang-Hobbs ";
- adnelson = "Allen Nelson ";
- adolfogc = "Adolfo E. García Castro ";
- aespinosa = "Allan Espinosa ";
- aflatter = "Alexander Flatter ";
- afldcr = "James Alexander Feldman-Crough ";
- aforemny = "Alexander Foremny ";
- afranchuk = "Alex Franchuk ";
- aherrmann = "Andreas Herrmann ";
- ahmedtd = "Taahir Ahmed ";
- ak = "Alexander Kjeldaas ";
- akaWolf = "Artjom Vejsel ";
- akc = "Anders Claesson ";
- alexvorobiev = "Alex Vorobiev ";
- dezgeg = "Tuomas Tynkkynen ";
- dfordivam = "Divam ";
- dfoxfranke = "Daniel Fox Franke ";
- dgonyeo = "Derek Gonyeo ";
- dipinhora = "Dipin Hora ";
- disassembler = "Samuel Leathers ";
- dizfer = "David Izquierdo ";
- dmalikov = "Dmitry Malikov ";
- DmitryTsygankov = "Dmitry Tsygankov ";
- dmjio = "David Johnson ";
- dochang = "Desmond O. Chang ";
- domenkozar = "Domen Kozar ";
- dotlambda = "Robert Schütz ";
- doublec = "Chris Double ";
- dpaetzel = "David Pätzel ";
- dpflug = "David Pflug ";
- drets = "Dmytro Rets ";
- drewkett = "Andrew Burkett ";
- dsferruzza = "David Sferruzza ";
- dtzWill = "Will Dietz ";
- dupgit = "Olivier Delhomme ";
- dywedir = "Vladyslav M. ";
- e-user = "Alexander Kahl ";
- earldouglas = "James Earl Douglas ";
- ebzzry = "Rommel Martinez ";
- edanaher = "Evan Danaher ";
- edef = "edef ";
- ederoyd46 = "Matthew Brown ";
- eduarrrd = "Eduard Bachmakov ";
- edwtjo = "Edward Tjörnhammar ";
- eelco = "Eelco Dolstra ";
- ehegnes = "Eric Hegnes ";
- ehmry = "Emery Hemingway ";
- eikek = "Eike Kettner ";
- ekleog = "Leo Gaspard ";
- elasticdog = "Aaron Bull Schaefer ";
- eleanor = "Dejan Lukan ";
- elijahcaine = "Elijah Caine ";
- elitak = "Eric Litak ";
- ellis = "Ellis Whitehead ";
- eperuffo = "Emanuele Peruffo ";
- epitrochoid = "Mabry Cervin ";
- eqyiel = "Ruben Maher ";
- ericbmerritt = "Eric Merritt ";
- ericsagnes = "Eric Sagnes ";
- erictapen = "Justin Humm ";
- erikryb = "Erik Rybakken ";
- ertes = "Ertugrul Söylemez ";
- ethercrow = "Dmitry Ivanov ";
- etu = "Elis Hirwing ";
- exi = "Reno Reckling ";
- exlevan = "Alexey Levan ";
- expipiplus1 = "Joe Hermaszewski ";
- fadenb = "Tristan Helmich ";
- falsifian = "James Cook ";
- fare = "Francois-Rene Rideau ";
- fgaz = "Francesco Gazzetta ";
- FireyFly = "Jonas Höglund ";
- flokli = "Florian Klink ";
- florianjacob = "Florian Jacob ";
- flosse = "Markus Kohlhase ";
- fluffynukeit = "Daniel Austin ";
- fmthoma = "Franz Thoma ";
- forkk = "Andrew Okin ";
- fornever = "Friedrich von Never ";
- fpletz = "Franz Pletz ";
- fps = "Florian Paul Schmidt ";
- fridh = "Frederik Rietdijk ";
- frlan = "Frank Lanitz ";
- fro_ozen = "fro_ozen ";
- ftrvxmtrx = "Siarhei Zirukin ";
- funfunctor = "Edward O'Callaghan ";
- fuuzetsu = "Mateusz Kowalczyk ";
- fuzzy-id = "Thomas Bach ";
- fxfactorial = "Edgar Aroutiounian ";
- gabesoft = "Gabriel Adomnicai ";
- gal_bolle = "Florent Becker ";
- garbas = "Rok Garbas ";
- garrison = "Jim Garrison ";
- gavin = "Gavin Rogers ";
- gebner = "Gabriel Ebner ";
- geistesk = "Alvar Penning ";
- georgewhewell = "George Whewell ";
- gilligan = "Tobias Pflug ";
- giogadi = "Luis G. Torres ";
- gleber = "Gleb Peregud ";
- glenns = "Glenn Searby ";
- globin = "Robin Gloster ";
- gnidorah = "Alex Ivanov ";
- goibhniu = "Cillian de Róiste ";
- Gonzih = "Max Gonzih ";
- goodrone = "Andrew Trachenko ";
- gpyh = "Yacine Hmito ";
- grahamc = "Graham Christensen ";
- grburst = "Julius Elias ";
- gridaphobe = "Eric Seidel ";
- guibert = "David Guibert ";
- guibou = "Guillaume Bouchard ";
- guillaumekoenig = "Guillaume Koenig ";
- guyonvarch = "Joris Guyonvarch ";
- hakuch = "Jesse Haber-Kucharsky ";
- hamhut1066 = "Hamish Hutchings ";
- havvy = "Ryan Scheel ";
- hbunke = "Hendrik Bunke ";
- hce = "Hans-Christian Esperer ";
- hectorj = "Hector Jusforgues ";
- hedning = "Tor Hedin Brønner ";
- heel = "Sergii Paryzhskyi ";
- henrytill = "Henry Till ";
- hhm = "hhm ";
- hinton = "Tom Hinton ";
- hodapp = "Chris Hodapp ";
- hrdinka = "Christoph Hrdinka ";
- htr = "Hugo Tavares Reis ";
- iand675 = "Ian Duncan ";
- ianwookim = "Ian-Woo Kim ";
- iblech = "Ingo Blechschmidt ";
- igsha = "Igor Sharonov ";
- ikervagyok = "Balázs Lengyel ";
- infinisil = "Silvan Mosberger ";
- ironpinguin = "Michele Catalano ";
- ivan-tkatchev = "Ivan Tkatchev ";
- ixmatus = "Parnell Springmeyer ";
- j-keck = "Jürgen Keck ";
- jagajaga = "Arseniy Seroka ";
- jammerful = "jammerful ";
- jansol = "Jan Solanti ";
- javaguirre = "Javier Aguirre ";
- jb55 = "William Casarin ";
- jbedo = "Justin Bedő ";
- jcumming = "Jack Cummings ";
- jdagilliland = "Jason Gilliland ";
- jefdaj = "Jeffrey David Johnson ";
- jensbin = "Jens Binkert ";
- jerith666 = "Matt McHenry ";
- jfb = "James Felix Black ";
- jfrankenau = "Johannes Frankenau ";
- jgeerds = "Jascha Geerds ";
- jgertm = "Tim Jaeger ";
- jgillich = "Jakob Gillich ";
- jhhuh = "Ji-Haeng Huh ";
- jirkamarsik = "Jirka Marsik ";
- jlesquembre = "José Luis Lafuente ";
- jluttine = "Jaakko Luttinen ";
- joachifm = "Joachim Fasting ";
- joamaki = "Jussi Maki ";
- joelmo = "Joel Moberg ";
- joelteon = "Joel Taylor ";
- johbo = "Johannes Bornhold ";
- johnmh = "John M. Harris, Jr. ";
- johnramsden = "John Ramsden ";
- joko = "Ioannis Koutras ";
- jonafato = "Jon Banafato ";
- joncojonathan = "Jonathan Haddock ";
- jpierre03 = "Jean-Pierre PRUNARET ";
- jpotier = "Martin Potier ";
- jraygauthier = "Raymond Gauthier ";
- jtojnar = "Jan Tojnar ";
- juliendehos = "Julien Dehos ";
- jwiegley = "John Wiegley ";
- jwilberding = "Jordan Wilberding ";
- jyp = "Jean-Philippe Bernardy ";
- jzellner = "Jeff Zellner ";
- kaiha = "Kai Harries ";
- kamilchm = "Kamil Chmielewski ";
- kampfschlaefer = "Arnold Krille ";
- karolchmist = "karolchmist ";
- kentjames = "James Kent "; inactive since 2012
- uwap = "uwap ";
- vaibhavsagar = "Vaibhav Sagar ";
- valeriangalliat = "Valérian Galliat ";
- vandenoever = "Jos van den Oever ";
- vanschelven = "Klaas van Schelven ";
- vanzef = "Ivan Solyankin ";
- vbgl = "Vincent Laporte ";
- vbmithr = "Vincent Bernardoff ";
- vcunat = "Vladimír Čunát ";
- vdemeester = "Vincent Demeester ";
- veprbl = "Dmitry Kalinkin ";
- vifino = "Adrian Pistol ";
- vinymeuh = "VinyMeuh ";
- viric = "Lluís Batlle i Rossell ";
- vizanto = "Danny Wilson ";
- vklquevs = "vklquevs ";
- vlstill = "Vladimír Štill ";
- vmandela = "Venkateswara Rao Mandela ";
- vmchale = "Vanessa McHale ";
- volhovm = "Mikhail Volkhov ";
- volth = "Jaroslavas Pocepko ";
- vozz = "Oliver Hunt ";
- vrthra = "Rahul Gopinath ";
- vyp = "vyp ";
- wedens = "wedens ";
- willibutz = "Willi Butz ";
- willtim = "Tim Philip Williams ";
- winden = "Antonio Vargas Gonzalez ";
- wizeman = "Ricardo M. Correia ";
- wjlroe = "William Roe ";
- wkennington = "William A. Kennington III ";
- wmertens = "Wout Mertens ";
- woffs = "Frank Doepper ";
- womfoo = "Kranium Gikos Mendoza ";
- wscott = "Wayne Scott ";
- wyvie = "Elijah Rum ";
- xnwdd = "Guillermo NWDD ";
- xvapx = "Marti Serra ";
- xwvvvvwx = "David Terry ";
- xzfc = "Albert Safin ";
- yarr = "Dmitry V. ";
- yegortimoshenko = "Yegor Timoshenko ";
- ylwghst = "Burim Augustin Berisa ";
- yochai = "Yochai ";
- yorickvp = "Yorick van Pelt ";
- yuriaisaka = "Yuri Aisaka ";
- yurrriq = "Eric Bailey ";
- z77z = "Marco Maggesi ";
- zagy = "Christian Zagrodnick ";
- zalakain = "Unai Zalakain ";
- zarelit = "David Costa ";
- zauberpony = "Elmar Athmer ";
- zef = "Zef Hemel ";
- zimbatm = "zimbatm ";
- Zimmi48 = "Théo Zimmermann ";
- zohl = "Al Zohali ";
- zoomulator = "Kim Simmons