From 5fd5746213b783b6abf32ad043a9b293a2a3f41c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 28 Feb 2018 15:17:42 +0100 Subject: [PATCH 1/5] Convert maintainer file entries to attributes, add github handles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on https://github.com/NixOS/nixpkgs/pull/34842, the nix-instantiate output was pretty-printed and the validity of the github handles manually verified, by automatically checking whether the user handles exist on github (https://github.com/userhandle, status 200 or 404). Each handle under 5 characters was manually checked (because the collision probability with non-maintainer accounts is high), each missing entry was manually researched. The script used is kept in `maintainers/scripts` as an example of how to work with the mainainers list through nix’ JSON interface. --- lib/default.nix | 2 +- lib/maintainers.nix | 4745 ++++++++++++++--- .../check-maintainer-github-handles.sh | 23 + 3 files changed, 3966 insertions(+), 804 deletions(-) create mode 100755 maintainers/scripts/check-maintainer-github-handles.sh diff --git a/lib/default.nix b/lib/default.nix index a25a23299b391..c8a898a292a0f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,7 +21,7 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = callLibs ./maintainers.nix; + maintainers = import ./maintainers.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cb9d746ada5d2..3e415ae32f709 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -1,807 +1,3946 @@ -{ ...}: -/* List of NixOS maintainers. The format is: +/* List of NixOS maintainers. - handle = "Real Name "; + handle = { + name = "Real name"; + email = "address@example.org"; + github = "GithubUsername"; + }; - 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. */ + where `name` is your real name, `email` is your maintainer email + address and `github` is your GitHub handle (as it appears in the + URL of your profile page, `https://github.com/`). + address + The only required fields are `name` and `email`. + More fields may be added in the future. + + Please keep the list alphabetically sorted. + See `../maintainers/scripts/check-maintainer-github-handles.sh` + for an example on how to work with this data. + */ { - 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 "; - aij = "Ivan Jager "; - ajgrf = "Alex Griffin "; - 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. "; - dzabraev = "Maksim Dzabraev "; - e-user = "Alexander Kahl "; - earldouglas = "James Earl Douglas "; - earvstedt = "Erik Arvstedt "; - 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 "; - enzime = "Michael Hoang "; - eperuffo = "Emanuele Peruffo "; - epitrochoid = "Mabry Cervin "; - eqyiel = "Ruben Maher "; - ericbmerritt = "Eric Merritt "; - ericsagnes = "Eric Sagnes "; - ericson2314 = "John Ericson "; - erictapen = "Justin Humm "; - erikryb = "Erik Rybakken "; - ertes = "Ertugrul Söylemez "; - erosennin = "Andrey Golovizin "; - ethercrow = "Dmitry Ivanov "; - etu = "Elis Hirwing "; - exfalso = "Andras Slemmer <0slemi0@gmail.com>"; - exi = "Reno Reckling "; - exlevan = "Alexey Levan "; - expipiplus1 = "Joe Hermaszewski "; - fadenb = "Tristan Helmich "; - falsifian = "James Cook "; - fare = "Francois-Rene Rideau "; - f-breidenstein = "Felix Breidenstein "; - 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 "; - genesis = "Ronan Bignaux "; - 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 "; - hyphon81 = "Masato Yonekawa "; - iand675 = "Ian Duncan "; - ianwookim = "Ian-Woo Kim "; - iblech = "Ingo Blechschmidt "; - igsha = "Igor Sharonov "; - ikervagyok = "Balázs Lengyel "; - ilya-kolpakov = "Ilya Kolpakov "; - infinisil = "Silvan Mosberger "; - ironpinguin = "Michele Catalano "; - ivan-tkatchev = "Ivan Tkatchev "; - ixmatus = "Parnell Springmeyer "; - izorkin = "Yurii Izorkin "; - ixxie = "Matan Bendix Shenhav "; - 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 "; - Jo = "Joachim Ernst <0x4A6F@shackspace.de>"; - joachifm = "Joachim Fasting "; - joamaki = "Jussi Maki "; - joelmo = "Joel Moberg "; - joelteon = "Joel Taylor "; - johbo = "Johannes Bornhold "; - johnazoidberg = "Daniel Schäfer "; - johnmh = "John M. Harris, Jr. "; - johnramsden = "John Ramsden "; - joko = "Ioannis Koutras "; - jonafato = "Jon Banafato "; - joncojonathan = "Jonathan Haddock "; - jpdoyle = "Joe Doyle "; - 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 Date: Sat, 3 Mar 2018 03:18:37 +0100 Subject: [PATCH 2/5] maintainers/scripts: improve github handle checker Now also finds name-clashes for github handles who never contributed to nixpkgs before. Also deals with too many request errors. --- .../check-maintainer-github-handles.sh | 53 +++++++++++++++++-- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh index e389fde7d8aa8..879a2e452cb33 100755 --- a/maintainers/scripts/check-maintainer-github-handles.sh +++ b/maintainers/scripts/check-maintainer-github-handles.sh @@ -6,18 +6,61 @@ set -e -# checks whether a user handle can be found on github +# nixpkgs='' +# if [ -n "$1" ]; then + +function checkCommits { + local user="$1" + local tmp=$(mktemp) + curl --silent -w "%{http_code}" \ + "https://github.com/NixOS/nixpkgs/commits?author=$user" \ + > "$tmp" + # the last line of tmp contains the http status + local status=$(tail -n1 "$tmp") + local ret= + case $status in + 200) if <"$tmp" grep -i "no commits found" > /dev/null; then + ret=1 + else + ret=0 + fi + ;; + # because of github’s hard request limits, this can take some time + 429) sleep 2 + printf "." + checkCommits "$user" + ret=$? + ;; + *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1 + ret=1 + ;; + esac + rm "$tmp" + return $ret +} +export -f checkCommits + function checkUser { local user="$1" local status= status="$(curl --silent --head "https://github.com/${user}" | grep Status)" - printf "%s\t\t\t\t%s\n" "$status" "$user" + # checks whether a user handle can be found on github + if [[ "$status" =~ 404 ]]; then + printf "%s\t\t\t\t%s\n" "$status" "$user" + # checks whether the user handle has any nixpkgs commits + elif checkCommits "$user"; then + printf "OK!\t\t\t\t%s\n" "$user" + else + printf "No Commits!\t\t\t%s\n" "$user" + fi } export -f checkUser # output the maintainers set as json # and filter out the github username of each maintainer (if it exists) -# then check 100 at the same time +# then check some at the same time nix-instantiate -A lib.maintainers --eval --strict --json \ - | jq -r '.[]|.github' \ - | parallel -j100 checkUser + | jq -r '.[]|.github|select(.)' \ + | parallel -j5 checkUser + +# parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a" From 5b7021da555bcda3f7e94c9b1edc9336653b8822 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 3 Mar 2018 05:40:54 +0100 Subject: [PATCH 3/5] lib/maintainers: correct wrong (clashing) github handles Corrected every handle that had no commits to nixpkgs, manually researched the correct handles by looking at maintained packages & blames/history on Github. --- lib/maintainers.nix | 99 ++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 65 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3e415ae32f709..5f47b01ec1311 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -316,7 +316,7 @@ }; amorsillo = { email = "andrew.morsillo@gmail.com"; - github = "amorsillo"; + github = "AndrewMorsillo"; name = "Andrew Morsillo"; }; anderspapitto = { @@ -331,7 +331,7 @@ }; andres = { email = "ksnixos@andres-loeh.de"; - github = "andres"; + github = "kosmikus"; name = "Andres Loeh"; }; andrestylianos = { @@ -396,7 +396,7 @@ }; aristid = { email = "aristidb@gmail.com"; - github = "aristid"; + github = "aristidb"; name = "Aristid Breitkreuz"; }; arobyn = { @@ -476,7 +476,6 @@ }; balajisivaraman = { email = "sivaraman.balaji@gmail.com"; - github = "balajisivaraman"; name = "Balaji Sivaraman"; }; barrucadu = { @@ -690,7 +689,6 @@ }; chattered = { email = "me@philscotted.com"; - github = "chattered"; name = "Phil Scott"; }; chiiruno = { @@ -780,7 +778,7 @@ }; coconnor = { email = "coreyoconnor@gmail.com"; - github = "coconnor"; + github = "coreyoconnor"; name = "Corey O'Connor"; }; codsl = { @@ -875,7 +873,6 @@ }; dasuxullebt = { email = "christoph.senjak@googlemail.com"; - github = "dasuxullebt"; name = "Christoph-Simon Senjak"; }; david50407 = { @@ -920,7 +917,7 @@ }; derchris = { email = "derchris@me.com"; - github = "derchris"; + github = "derchrisuk"; name = "Christian Gerbrandt"; }; dermetfan = { @@ -1020,7 +1017,6 @@ }; drewkett = { email = "burkett.andrew@gmail.com"; - github = "drewkett"; name = "Andrew Burkett"; }; dsferruzza = { @@ -1090,7 +1086,7 @@ }; eelco = { email = "eelco.dolstra@logicblox.com"; - github = "eelco"; + github = "edolstra"; name = "Eelco Dolstra"; }; ehegnes = { @@ -1100,7 +1096,6 @@ }; ehmry = { email = "emery@vfemail.net"; - github = "ehmry"; name = "Emery Hemingway"; }; eikek = { @@ -1120,7 +1115,7 @@ }; eleanor = { email = "dejan@proteansec.com"; - github = "eleanor"; + github = "proteansec"; name = "Dejan Lukan"; }; elijahcaine = { @@ -1150,7 +1145,6 @@ }; epitrochoid = { email = "mpcervin@uncg.edu"; - github = "epitrochoid"; name = "Mabry Cervin"; }; eqyiel = { @@ -1319,7 +1313,6 @@ }; fuzzy-id = { email = "hacking+nixos@babibo.de"; - github = "fuzzy-id"; name = "Thomas Bach"; }; fxfactorial = { @@ -1334,7 +1327,7 @@ }; gal_bolle = { email = "florent.becker@ens-lyon.org"; - github = "galbolle"; + github = "FlorentBecker"; name = "Florent Becker"; }; garbas = { @@ -1349,7 +1342,7 @@ }; gavin = { email = "gavin@praxeology.co.uk"; - github = "gavin"; + github = "gavinrogers"; name = "Gavin Rogers"; }; gebner = { @@ -1364,7 +1357,7 @@ }; genesis = { email = "ronan@aimao.org"; - github = "genesis"; + github = "bignaux"; name = "Ronan Bignaux"; }; georgewhewell = { @@ -1499,17 +1492,16 @@ }; hhm = { email = "heehooman+nixpkgs@gmail.com"; - github = "hhm"; + github = "hhm0"; name = "hhm"; }; hinton = { email = "t@larkery.com"; - github = "hinton"; name = "Tom Hinton"; }; hodapp = { email = "hodapp87@gmail.com"; - github = "hodapp"; + github = "Hodapp87"; name = "Chris Hodapp"; }; hrdinka = { @@ -1569,7 +1561,6 @@ }; ivan-tkatchev = { email = "tkatchev@gmail.com"; - github = "ivan-tkatchev"; name = "Ivan Tkatchev"; }; ixmatus = { @@ -1624,7 +1615,6 @@ }; jcumming = { email = "jack@mudshark.org"; - github = "jcumming"; name = "Jack Cummings"; }; jdagilliland = { @@ -1709,7 +1699,6 @@ }; joelteon = { email = "me@joelt.io"; - github = "joelteon"; name = "Joel Taylor"; }; johbo = { @@ -1784,7 +1773,6 @@ }; jwilberding = { email = "jwilberding@afiniate.com"; - github = "jwilberding"; name = "Jordan Wilberding"; }; jyp = { @@ -1814,7 +1802,6 @@ }; karolchmist = { email = "info+nix@chmist.com"; - github = "karolchmist"; name = "karolchmist"; }; kentjames = { @@ -1863,7 +1850,7 @@ }; koral = { email = "koral@mailoo.org"; - github = "koral"; + github = "k0ral"; name = "Koral"; }; kovirobi = { @@ -1903,7 +1890,7 @@ }; lassulus = { email = "lassulus@gmail.com"; - github = "lassulus"; + github = "Lassulus"; name = "Lassulus"; }; layus = { @@ -1983,7 +1970,7 @@ }; linus = { email = "linusarver@gmail.com"; - github = "linus"; + github = "listx"; name = "Linus Arver"; }; lluchs = { @@ -2072,7 +2059,6 @@ }; m3tti = { email = "mathaeus.peter.sander@gmail.com"; - github = "m3tti"; name = "Mathaeus Sander"; }; ma27 = { @@ -2221,7 +2207,6 @@ }; metabar = { email = "softs@metabarcoding.org"; - github = "metabar"; name = "Celine Mercier"; }; mgdelacroix = { @@ -2281,7 +2266,6 @@ }; miltador = { email = "miltador@yandex.ua"; - github = "miltador"; name = "Vasiliy Solovey"; }; mimadrid = { @@ -2359,11 +2343,6 @@ github = "moretea"; name = "Maarten Hoogendoorn"; }; - mornfall = { - email = "me@mornfall.net"; - github = "mornfall"; - name = "Petr Ročkai"; - }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; @@ -2396,7 +2375,6 @@ }; msackman = { email = "matthew@wellquite.org"; - github = "msackman"; name = "Matthew Sackman"; }; mschristiansen = { @@ -2421,12 +2399,12 @@ }; mtreskin = { email = "zerthurd@gmail.com"; - github = "mtreskin"; + github = "Zert"; name = "Max Treskin"; }; mudri = { email = "lamudri@gmail.com"; - github = "mudri"; + github = "laMudri"; name = "James Wood"; }; muflax = { @@ -2575,7 +2553,7 @@ }; offline = { email = "jakahudoklin@gmail.com"; - github = "offline"; + github = "offlinehacker"; name = "Jaka Hudoklin"; }; oida = { @@ -2664,7 +2642,7 @@ }; pashev = { email = "pashev.igor@gmail.com"; - github = "pashev"; + github = "ip1981"; name = "Igor Pashev"; }; patternspandemic = { @@ -2749,7 +2727,6 @@ }; piotr = { email = "ppietrasa@gmail.com"; - github = "piotr"; name = "Piotr Pietraszkiewicz"; }; pjbarnoy = { @@ -2784,7 +2761,7 @@ }; pmeunier = { email = "pierre-etienne.meunier@inria.fr"; - github = "pmeunier"; + github = "P-E-Meunier"; name = "Pierre-Étienne Meunier"; }; pmiddend = { @@ -2834,7 +2811,6 @@ }; pstn = { email = "philipp@xndr.de"; - github = "pstn"; name = "Philipp Steinpaß"; }; puffnfresh = { @@ -2853,7 +2829,7 @@ }; ragge = { email = "r.dahlen@gmail.com"; - github = "ragge"; + github = "ragnard"; name = "Ragnar Dahlen"; }; ralith = { @@ -2878,17 +2854,16 @@ }; raskin = { email = "7c6f434c@mail.ru"; - github = "raskin"; + github = "7c6f434c"; name = "Michael Raskin"; }; ravloony = { email = "ravloony@gmail.com"; - github = "ravloony"; name = "Tom Macdonald"; }; razvan = { email = "razvan.panda@gmail.com"; - github = "razvan"; + github = "razvan-panda"; name = "Răzvan Flavius Panda"; }; rbasso = { @@ -2923,7 +2898,7 @@ }; renzo = { email = "renzocarbonara@gmail.com"; - github = "renzo"; + github = "k0001"; name = "Renzo Carbonara"; }; retrry = { @@ -3108,7 +3083,7 @@ }; sander = { email = "s.vanderburg@tudelft.nl"; - github = "sander"; + github = "svanderburg"; name = "Sander van der Burg"; }; sargon = { @@ -3192,7 +3167,7 @@ }; shell = { email = "cam.turn@gmail.com"; - github = "shell"; + github = "VShell"; name = "Shell Turner"; }; shlevy = { @@ -3237,7 +3212,6 @@ }; sjourdois = { email = "sjourdois@gmail.com"; - github = "sjourdois"; name = "Stéphane ‘kwisatz’ Jourdois"; }; skeidel = { @@ -3247,7 +3221,6 @@ }; skrzyp = { email = "jot.skrzyp@gmail.com"; - github = "skrzyp"; name = "Jakub Skrzypnik"; }; sleexyz = { @@ -3257,7 +3230,7 @@ }; smironov = { email = "grrwlf@gmail.com"; - github = "smironov"; + github = "grwlf"; name = "Sergey Mironov"; }; snyh = { @@ -3382,7 +3355,7 @@ }; taeer = { email = "taeer@necsi.edu"; - github = "taeer"; + github = "Radvendii"; name = "Taeer Bar-Yam"; }; tailhook = { @@ -3447,7 +3420,7 @@ }; thammers = { email = "jawr@gmx.de"; - github = "thammers"; + github = "tobias-hammerschmidt"; name = "Tobias Hammerschmidt"; }; thanegill = { @@ -3462,7 +3435,7 @@ }; theuni = { email = "ct@flyingcircus.io"; - github = "theuni"; + github = "ctheune"; name = "Christian Theune"; }; thoughtpolice = { @@ -3537,12 +3510,12 @@ }; trevorj = { email = "nix@trevor.joynson.io"; - github = "trevorj"; + github = "akatrevorjay"; name = "Trevor Joynson"; }; trino = { email = "muehlhans.hubert@ekodia.de"; - github = "trino"; + github = "hmuehlhans"; name = "Hubert Mühlhans"; }; troydm = { @@ -3552,7 +3525,6 @@ }; tstrobel = { email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; - github = "tstrobel"; name = "Thomas Strobel"; }; ttuegel = { @@ -3577,7 +3549,7 @@ }; tweber = { email = "tw+nixpkgs@360vier.de"; - github = "tweber"; + github = "thorstenweber83"; name = "Thorsten Weber"; }; twey = { @@ -3741,7 +3713,6 @@ }; wedens = { email = "kirill.wedens@gmail.com"; - github = "wedens"; name = "wedens"; }; willibutz = { @@ -3751,12 +3722,10 @@ }; willtim = { email = "tim.williams.public@gmail.com"; - github = "willtim"; name = "Tim Philip Williams"; }; winden = { email = "windenntw@gmail.com"; - github = "winden"; name = "Antonio Vargas Gonzalez"; }; wizeman = { @@ -3896,7 +3865,7 @@ }; zalakain = { email = "contact@unaizalakain.info"; - github = "zalakain"; + github = "umazalakain"; name = "Unai Zalakain"; }; zarelit = { From 050abd0aa46994ced89d6f3cfee198f8b38271e2 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 4 Mar 2018 03:05:04 +0100 Subject: [PATCH 4/5] lib/maintainers: add new maintainers before maintainers merge Add new maintainers that were added before merging the new `maintainers.nix` file format. --- lib/maintainers.nix | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5f47b01ec1311..f397ee0ddb8c9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -459,6 +459,11 @@ github = "aycanirican"; name = "Aycan iRiCAN"; }; + babariviere = { + email = "babariviere@protonmail.com"; + github = "babariviere"; + name = "babariviere"; + }; bachp = { email = "pascal.bach@nextrem.ch"; github = "bachp"; @@ -1054,6 +1059,11 @@ github = "earldouglas"; name = "James Earl Douglas"; }; + earvstedt = { + email = "erik.arvstedt@gmail.com"; + github = "erikarvstedt"; + name = "Erik Arvstedt"; + }; ebzzry = { email = "ebzzry@ebzzry.io"; github = "ebzzry"; @@ -1157,6 +1167,11 @@ github = "ericbmerritt"; name = "Eric Merritt"; }; + erosennin = { + email = "ag@sologoc.com"; + github = "erosennin"; + name = "Andrey Golovizin"; + }; ericsagnes = { email = "eric.sagnes@gmail.com"; github = "ericsagnes"; @@ -1898,6 +1913,11 @@ github = "layus"; name = "Guillaume Maudoux"; }; + lblasc = { + email = "lblasc@znode.net"; + github = "lblasc"; + name = "Luka Blaskovic"; + }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; @@ -1933,6 +1953,11 @@ github = "leonardoce"; name = "Leonardo Cecchi"; }; + lejonet = { + email = "daniel@kuehn.se"; + github = "lejonet"; + name = "Daniel Kuehn"; + }; lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; @@ -3403,6 +3428,11 @@ github = "telotortium"; name = "Robert Irelan"; }; + teozkr = { + email = "teo@nullable.se"; + github = "teozkr"; + name = "Teo Klestrup Röijezon"; + }; teto = { email = "mcoudron@hotmail.com"; github = "teto"; @@ -3463,6 +3493,11 @@ github = "timokau"; name = "Timo Kaufmann"; }; + timor = { + email = "timor.dd@googlemail.com"; + github = "timor"; + name = "timor"; + }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; @@ -3778,6 +3813,11 @@ github = "xeji"; name = "xeji"; }; + xnaveira = { + email = "xnaveira@gmail.com"; + github = "xnaveira"; + name = "Xavier Naveira"; + }; xnwdd = { email = "nwdd+nixos@no.team"; github = "xnwdd"; From 060657dfb1234a449343ae9917c04f07a1c23217 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 4 Mar 2018 03:21:39 +0100 Subject: [PATCH 5/5] lib/maintainers: rename file to maintainers-list.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on a request by @oxij: “Can we also rename this file to `maintainers/maintainers-list.nix` while we at this? Motivation: much saner `git log ./lib`.” --- lib/default.nix | 2 +- lib/{maintainers.nix => maintainers-list.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/{maintainers.nix => maintainers-list.nix} (100%) diff --git a/lib/default.nix b/lib/default.nix index c8a898a292a0f..7716fe34dbaba 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,7 +21,7 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = import ./maintainers.nix; + maintainers = import ./maintainers-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; diff --git a/lib/maintainers.nix b/lib/maintainers-list.nix similarity index 100% rename from lib/maintainers.nix rename to lib/maintainers-list.nix