Merge remote-tracking branch 'upstream/master' into wrapper-pname-support

This commit is contained in:
John Ericson
2019-11-24 17:25:07 +00:00
5772 changed files with 168373 additions and 134383 deletions
+481 -23
View File
@@ -137,6 +137,11 @@
githubId = 2321000;
name = "Ruslan Babayev";
};
acairncross = {
email = "acairncross@gmail.com";
github = "acairncross";
name = "Aiken Cairncross";
};
acowley = {
email = "acowley@gmail.com";
github = "acowley";
@@ -184,6 +189,12 @@
githubId = 1250775;
name = "Adolfo E. García Castro";
};
adsr = {
email = "as@php.net";
github = "adsr";
githubId = 315003;
name = "Adam Saponara";
};
aepsil0n = {
email = "eduard.bopp@aepsil0n.de";
github = "aepsil0n";
@@ -356,6 +367,16 @@
github = "alunduil";
name = "Alex Brandt";
};
alva = {
email = "alva@skogen.is";
github = "fjallarefur";
githubId = 42881386;
name = "Alva";
keys = [{
longkeyid = "ed25519/0xF53E323342F7A6D3";
fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A";
}];
};
amar1729 = {
email = "amar.paul16@gmail.com";
github = "amar1729";
@@ -536,12 +557,24 @@
githubId = 56009;
name = "Arcadio Rubio García";
};
arcnmx = {
email = "arcnmx@users.noreply.github.com";
github = "arcnmx";
githubId = 13426784;
name = "arcnmx";
};
ardumont = {
email = "eniotna.t@gmail.com";
github = "ardumont";
githubId = 718812;
name = "Antoine R. Dumont";
};
arianvp = {
email = "arian.vanputten@gmail.com";
github = "arianvp";
githubId = 628387;
name = "Arian van Putten";
};
aristid = {
email = "aristidb@gmail.com";
github = "aristidb";
@@ -570,6 +603,12 @@
fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A";
}];
};
arthur = {
email = "me@arthur.li";
github = "arthurl";
githubId = 3965744;
name = "Arthur Lee";
};
artuuge = {
email = "artuuge@gmail.com";
github = "artuuge";
@@ -692,8 +731,18 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
b4dm4n = {
email = "fabianm88@gmail.com";
github = "B4dM4n";
githubId = 448169;
name = "Fabian Möller";
keys = [{
longkeyid = "rsa4096/0x754B5C0963C42C5";
fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50";
}];
};
babariviere = {
email = "babariviere@protonmail.com";
email = "babathriviere@gmail.com";
github = "babariviere";
githubId = 12128029;
name = "babariviere";
@@ -895,6 +944,12 @@
githubId = 5718007;
name = "Bastian Köcher";
};
blitz = {
email = "js@alien8.de";
github = "blitz";
githubId = 37907;
name = "Julian Stecklina";
};
bluescreen303 = {
email = "mathijs@bluescreen303.nl";
github = "bluescreen303";
@@ -1109,16 +1164,18 @@
githubId = 977929;
name = "Cody Allen";
};
cf6b88f = {
email = "elmo.todurov@eesti.ee";
name = "Elmo Todurov";
};
cfouche = {
email = "chaddai.fouche@gmail.com";
github = "Chaddai";
githubId = 5771456;
name = "Chaddaï Fouché";
};
cfsmp3 = {
email = "carlos@sanz.dev";
github = "cfsmp3";
githubId = 5949913;
name = "Carlos Fernandez Sanz";
};
chaduffy = {
email = "charles@dyfis.net";
github = "charles-dyfis-net";
@@ -1165,6 +1222,12 @@
githubId = 30435868;
name = "Okina Matara";
};
chkno = {
email = "chuck@intelligence.org";
github = "chkno";
githubId = 1118859;
name = "Scott Worley";
};
choochootrain = {
email = "hurshal@imap.cc";
github = "choochootrain";
@@ -1219,6 +1282,12 @@
githubId = 3956062;
name = "Simon Lackerbauer";
};
cizra = {
email = "todurov+nix@gmail.com";
github = "cizra";
githubId = 2131991;
name = "Elmo Todurov";
};
ck3d = {
email = "ck3d@gmx.de";
github = "ck3d";
@@ -1336,6 +1405,12 @@
githubId = 1740337;
name = "Chris Ostrouchov";
};
contrun = {
email = "uuuuuu@protonmail.com";
github = "contrun";
githubId = 32609395;
name = "B YI";
};
couchemar = {
email = "couchemar@yandex.ru";
github = "couchemar";
@@ -1348,6 +1423,12 @@
githubId = 411324;
name = "Carles Pagès";
};
craigem = {
email = "craige@mcwhirter.io";
github = "craigem";
githubId = "6470493";
name = "Craige McWhirter";
};
cransom = {
email = "cransom@hubns.net";
github = "cransom";
@@ -1403,6 +1484,16 @@
}
];
};
dadada = {
name = "dadada";
email = "dadada@dadada.li";
github = "dadada";
githubId = 7216772;
keys = [{
longkeyid = "ed25519/0xEEB8D1CE62C4DFEA";
fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA";
}];
};
dalance = {
email = "dalance@gmail.com";
github = "dalance";
@@ -1427,6 +1518,12 @@
githubId = 245394;
name = "Hannu Hartikainen";
};
danderson = {
email = "dave@natulte.net";
github = "danderson";
githubId = 1918;
name = "David Anderson";
};
danharaj = {
email = "dan@obsidian.systems";
github = "danharaj";
@@ -1478,6 +1575,16 @@
github = "davidrusu";
name = "David Rusu";
};
davidtwco = {
email = "nix@david.davidtw.co";
github = "davidtwco";
githubId = 1295100;
name = "David Wood";
keys = [{
longkeyid = "rsa4096/0x01760B4F9F53F154";
fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154";
}];
};
davorb = {
email = "davor@davor.se";
github = "davorb";
@@ -1502,6 +1609,12 @@
githubId = 14032;
name = "Daniel Brockman";
};
dduan = {
email = "daniel@duan.ca";
github = "dduan";
githubId = 75067;
name = "Daniel Duan";
};
deepfire = {
email = "_deepfire@feelingofgreen.ru";
github = "deepfire";
@@ -1643,6 +1756,12 @@
githubId = 1316469;
name = "Naomi Morse";
};
dkudriavtsev = {
email = "dkudriavtsev@gmail.com";
github = "dkudriavtsev";
githubId = 9790772;
name = "Dmitry Kudriavtsev";
};
dmalikov = {
email = "malikov.d.y@gmail.com";
github = "dmalikov";
@@ -1661,6 +1780,12 @@
githubId = 875324;
name = "David Johnson";
};
dmrauh = {
email = "dmrauh@posteo.de";
github = "dmrauh";
githubId = 37698547;
name = "Dominik Michael Rauh";
};
dmvianna = {
email = "dmlvianna@gmail.com";
github = "dmvianna";
@@ -1697,7 +1822,7 @@
name = "Chris Double";
};
dpaetzel = {
email = "david.a.paetzel@gmail.com";
email = "david.paetzel@posteo.de";
github = "dpaetzel";
githubId = 974130;
name = "David Pätzel";
@@ -1875,7 +2000,9 @@
name = "Eric Hegnes";
};
ehmry = {
email = "emery@vfemail.net";
email = "ehmry@posteo.net";
github= "ehmry";
githubId = 537775;
name = "Emery Hemingway";
};
eikek = {
@@ -1961,6 +2088,12 @@
github = "ericnorris";
githubId = 1906605;
};
Enteee = {
email = "nix@duckpond.ch";
github = "Enteee";
githubid = 5493775;
name = "Ente";
};
enzime = {
email = "enzime@users.noreply.github.com";
github = "enzime";
@@ -1977,6 +2110,12 @@
email = "mpcervin@uncg.edu";
name = "Mabry Cervin";
};
equirosa = {
email = "eduardo@eduardoquiros.com";
github = "equirosa";
githubId = 39096810;
name = "Eduardo Quiros";
};
eqyiel = {
email = "ruben@maher.fyi";
github = "eqyiel";
@@ -1995,6 +2134,11 @@
githubId = 4828;
name = "Eric Merritt";
};
ericdallo = {
email = "ercdll1337@gmail.com";
github = "ericdallo";
name = "Eric Dallo";
};
ericsagnes = {
email = "eric.sagnes@gmail.com";
github = "ericsagnes";
@@ -2033,6 +2177,12 @@
github = "ertes";
name = "Ertugrul Söylemez";
};
esclear = {
email = "esclear@users.noreply.github.com";
github = "esclear";
githubId = 7432848;
name = "Daniel Albert";
};
Esteth = {
email = "adam.copp@gmail.com";
name = "Adam Copp";
@@ -2065,6 +2215,12 @@
githubId = 195032;
name = "Eric Evenchick";
};
evenbrenden = {
email = "evenbrenden@gmail.com";
github = "evenbrenden";
githubId = 2512008;
name = "Even Brenden";
};
exfalso = {
email = "0slemi0@gmail.com";
github = "exfalso";
@@ -2101,12 +2257,6 @@
githubId = 2817965;
name = "f--t";
};
fleaz = {
email = "mail@felixbreidenstein.de";
github = "fleaz";
githubId = 2489598;
name = "Felix Breidenstein";
};
fadenb = {
email = "tristan.helmich+nixos@gmail.com";
github = "fadenb";
@@ -2147,12 +2297,32 @@
githubId = 8182846;
name = "Francesco Gazzetta";
};
filalex77 = {
email = "brightone@protonmail.com";
github = "filalex77";
githubId = 12615679;
name = "Oleksii Filonenko";
keys = [{
longkeyid = "rsa3072/0xA1BC8428323ECFE8";
fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8";
}];
};
FireyFly = {
email = "nix@firefly.nu";
github = "FireyFly";
githubId = 415760;
name = "Jonas Höglund";
};
Flakebi = {
email = "flakebi@t-online.de";
github = "Flakebi";
githubId = "Flakebi";
name = "Sebastian Neubauer";
keys = [{
longkeyid = "rsa4096/0xECC755EE583C1672";
fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672";
}];
};
flexw = {
email = "felix.weilbach@t-online.de";
github = "FlexW";
@@ -2237,7 +2407,7 @@
name = "Frede Emil";
};
freepotion = {
email = "free.potion@yandex.ru";
email = "42352817+freepotion@users.noreply.github.com";
github = "freepotion";
githubId = 42352817;
name = "Free Potion";
@@ -2348,6 +2518,12 @@
github = "gavinrogers";
name = "Gavin Rogers";
};
gazally = {
email = "gazally@runbox.com";
github = "gazally";
githubId = 16470252;
name = "Gemini Lasswell";
};
gebner = {
email = "gebner@gebner.org";
github = "gebner";
@@ -2490,6 +2666,12 @@
githubId = 9705357;
name = "Guillaume Bouchard";
};
GuillaumeDesforges = {
email = "aceus02@gmail.com";
github = "GuillaumeDesforges";
githubId = 1882000;
name = "Guillaume Desforges";
};
guillaumekoenig = {
email = "guillaume.edward.koenig@gmail.com";
github = "guillaumekoenig";
@@ -2592,6 +2774,11 @@
githubId = 1401179;
name = "Guanpeng Xu";
};
hexa = {
github = "mweinelt";
githubId = 131599;
name = "Martin Weinelt";
};
hhm = {
email = "heehooman+nixpkgs@gmail.com";
github = "hhm0";
@@ -2602,6 +2789,15 @@
email = "t@larkery.com";
name = "Tom Hinton";
};
hkjn = {
email = "me@hkjn.me";
name = "Henrik Jonsson";
github = "hkjn";
keys = [{
longkeyid = "rsa4096/0x03EFBF839A5FDC15";
fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15";
}];
};
hlolli = {
email = "hlolli@gmail.com";
github = "hlolli";
@@ -2739,6 +2935,15 @@
githubId = 137306;
name = "Michele Catalano";
};
isgy = {
email = "isgy@teiyg.com";
github = "isgy";
githubId = 13622947;
keys = [{
longkeyid = "rsa4096/0xD3E1B013B4631293";
fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293";
}];
};
ivan = {
email = "ivan@ludios.org";
github = "ivan";
@@ -2787,6 +2992,11 @@
githubId = 26877687;
name = "Yurii Izorkin";
};
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
githubId = "2570854";
};
jasoncarr = {
email = "jcarr250@gmail.com";
github = "jasoncarr0";
@@ -2815,6 +3025,12 @@
githubId = 820715;
name = "Jake Logemann";
};
jakestanger = {
email = "mail@jstanger.dev";
github = "JakeStanger";
githubId = 5057870;
name = "Jake Stanger";
};
jakewaksbaum = {
email = "jake.waksbaum@gmail.com";
github = "jbaum98";
@@ -2982,6 +3198,11 @@
githubId = 184898;
name = "Jirka Marsik";
};
jitwit = {
email = "jrn@bluefarm.ca";
github = "jitwit";
name = "jitwit";
};
jlesquembre = {
email = "jl@lafuente.me";
github = "jlesquembre";
@@ -3106,6 +3327,11 @@
githubId = 392720;
name = "Jon Banafato";
};
jonathanmarler = {
email = "johnnymarler@gmail.com";
github = "marler8997";
name = "Jonathan Marler";
};
jonathanreeve = {
email = "jon.reeve@gmail.com";
github = "JonathanReeve";
@@ -3189,6 +3415,12 @@
github = "juliendehos";
name = "Julien Dehos";
};
jumper149 = {
email = "felixspringer149@gmail.com";
github = "jumper149";
githubId = 39434424;
name = "Felix Springer";
};
justinwoo = {
email = "moomoowoo@gmail.com";
github = "justinwoo";
@@ -3201,6 +3433,12 @@
githubId = 8460;
name = "John Wiegley";
};
jwijenbergh = {
email = "jeroenwijenbergh@protonmail.com";
github = "jwijenbergh";
githubId = 46386452;
name = "Jeroen Wijenbergh";
};
jwilberding = {
email = "jwilberding@afiniate.com";
name = "Jordan Wilberding";
@@ -3243,6 +3481,12 @@
email = "info+nix@chmist.com";
name = "karolchmist";
};
kayhide = {
email = "kayhide@gmail.com";
github = "kayhide";
githubId = 1730718;
name = "Hideaki Kawai";
};
kazcw = {
email = "kaz@lambdaverse.org";
github = "kazcw";
@@ -3370,7 +3614,11 @@
github = "kmein";
githubId = 10352507;
};
knairda = {
email = "adrian@kummerlaender.eu";
name = "Adrian Kummerlaender";
github = "KnairdA";
};
knedlsepp = {
email = "josef.kemetmueller@gmail.com";
github = "knedlsepp";
@@ -3459,12 +3707,29 @@
githubId = 449813;
name = "Roman Kuznetsov";
};
kylesferrazza = {
name = "Kyle Sferrazza";
email = "kyle.sferrazza@gmail.com";
github = "kylesferrazza";
githubId = 6677292;
keys = [{
longkeyid = "rsa4096/81A1540948162372";
fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372";
}];
};
kylewlacy = {
email = "kylelacy+nix@pm.me";
github = "kylewlacy";
githubId = 1362179;
name = "Kyle Lacy";
};
laikq = {
email = "gwen@quasebarth.de";
github = "laikq";
name = "Gwendolyn Quasebarth";
};
lasandell = {
email = "lasandell@gmail.com";
github = "lasandell";
@@ -3482,6 +3747,12 @@
github = "Lassulus";
name = "Lassulus";
};
lattfein = {
email = "lattfein@gmail.com";
github = "lattfein";
githubId = 53550838;
name = "Koki Yasuno";
};
layus = {
email = "layus.on@gmail.com";
github = "layus";
@@ -3576,6 +3847,12 @@
githubId = 307589;
name = "Nathaniel Baxter";
};
liff = {
email = "liff@iki.fi";
github = "liff";
githubId = 124475;
name = "Olli Helenius";
};
lightbulbjim = {
email = "chris@killred.net";
github = "lightbulbjim";
@@ -3692,6 +3969,22 @@
github = "lovek323";
name = "Jason O'Conal";
};
lovesegfault = {
email = "meurerbernardo@gmail.com";
github = "lovesegfault";
githubId = 7243783;
name = "Bernardo Meurer";
keys = [
{
longkeyid = "rsa2048/0xE421C74191EA186C";
fingerprint = "5894 12CE 19DF 582A E10A 3320 E421 C741 91EA 186C";
}
{
longkeyid = "rsa2048/0x4A6D87A0E7475769";
fingerprint = "56A8 E164 E834 290C 4AC0 EE3E 4A6D 87A0 E747 5769";
}
];
};
lowfatcomputing = {
email = "andreas.wagner@lowfatcomputing.org";
github = "lowfatcomputing";
@@ -3763,6 +4056,11 @@
githubId = 13791;
name = "Luke Gorrie";
};
lumi = {
email = "lumi@pew.im";
github = "lumi-me-not";
name = "lumi";
};
luz = {
email = "luz666@daum.net";
github = "Luz";
@@ -3934,6 +4232,12 @@
githubId = 427866;
name = "Matthias Beyer";
};
matthuszagh = {
email = "huszaghmatt@gmail.com";
github = "matthuszagh";
githubId = 7377393;
name = "Matt Huszagh";
};
matti-kariluoma = {
email = "matti@kariluo.ma";
github = "matti-kariluoma";
@@ -4147,11 +4451,11 @@
email = "miltador@yandex.ua";
name = "Vasiliy Solovey";
};
mimadrid = {
email = "mimadrid@ucm.es";
github = "mimadrid";
mimame = {
email = "miguel.madrid.mencia@gmail.com";
github = "mimame";
githubId = 3269878;
name = "Miguel Madrid";
name = "Miguel Madrid Mencía";
};
minijackson = {
email = "minijackson@riseup.net";
@@ -4187,6 +4491,15 @@
githubId = 5698461;
name = "Maciej Kazulak";
};
mkf = {
email = "m@mikf.pl";
github = "mkf";
name = "Michał Krzysztof Feiler";
keys = [{
longkeyid = "rsa4096/0xE35C2D7C2C6AC724";
fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724";
}];
};
mkg = {
email = "mkg@vt.edu";
github = "mkgvt";
@@ -4205,6 +4518,12 @@
githubId = 104795;
name = "Marek Mahut";
};
mmai = {
email = "henri.bourcereau@gmail.com";
github = "mmai";
githubId = 117842;
name = "Henri Bourcereau";
};
mmlb = {
email = "me.mmlb@mmlb.me";
github = "mmlb";
@@ -4262,6 +4581,10 @@
github = "moredread";
githubId = 100848;
name = "André-Patrick Bubel";
keys = [{
longkeyid = "rsa8192/0x118CE7C424B45728";
fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728";
}];
};
moretea = {
email = "maarten@moretea.nl";
@@ -4943,6 +5266,16 @@
githubId = 1179566;
name = "Nicolas B. Pierron";
};
pingiun = {
email = "nixos@pingiun.com";
github = "pingiun";
githubId = 1576660;
name = "Jelle Besseling";
keys = [{
longkeyid = "rsa4096/0x9712452E8BE3372E";
fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E";
}];
};
piotr = {
email = "ppietrasa@gmail.com";
name = "Piotr Pietraszkiewicz";
@@ -5359,6 +5692,12 @@
github = "rickynils";
name = "Rickard Nilsson";
};
rileyinman = {
email = "rileyminman@gmail.com";
github = "rileyinman";
githubId = 37246692;
name = "Riley Inman";
};
ris = {
email = "code@humanleg.org.uk";
github = "risicle";
@@ -5760,8 +6099,14 @@
githubId = 1151264;
name = "Sebastian Graf";
};
shahrukh330 = {
email = "shahrukh330@gmail.com";
github = "shahrukh330";
githubId = 1588288;
name = "Shahrukh Khan";
};
shanemikel = {
email = "shanemikel1@gmail.com";
email = "shanepearlman@pm.me";
github = "shanemikel";
githubId = 6720672;
name = "Shane Pearlman";
@@ -5811,6 +6156,12 @@
githubId = 819413;
name = "Benedict Aas";
};
shyim = {
email = "s.sayakci@gmail.com";
github = "shyim";
githubId = 6224096;
name = "Soner Sayakci";
};
siddharthist = {
email = "langston.barrett@gmail.com";
github = "langston-barrett";
@@ -5840,6 +6191,16 @@
github = "sikmir";
githubId = 688044;
name = "Nikolay Korotkiy";
keys = [{
longkeyid = "rsa2048/0xD1DE6D7F693663A5";
fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
}];
};
simonchatts = {
email = "code@chatts.net";
github = "simonchatts";
githubId = 11135311;
name = "Simon Chatterjee";
};
simonvandel = {
email = "simon.vandel@gmail.com";
@@ -6138,6 +6499,12 @@
githubId = 120188;
name = "Scott W. Dunlop";
};
sweber = {
email = "sweber2342+nixpkgs@gmail.com";
github = "sweber83";
githubId = 19905904;
name = "Simon Weber";
};
swflint = {
email = "swflint@flintfam.org";
github = "swflint";
@@ -6255,6 +6622,12 @@
githubId = 506181;
name = "Peter Marheine";
};
tasmo = {
email = "tasmo@tasmo.de";
github = "tasmo";
githubId = 102685;
name = "Thomas Friese";
};
tavyc = {
email = "octavian.cerna@gmail.com";
github = "tavyc";
@@ -6354,6 +6727,12 @@
githubId = 42933;
name = "Andrew Childs";
};
thefenriswolf = {
email = "stefan.rohrbacher97@gmail.com";
github = "thefenriswolf";
githubId = "8547242";
name = "Stefan Rohrbacher";
};
thesola10 = {
email = "thesola10@bobile.fr";
github = "thesola10";
@@ -6394,6 +6773,12 @@
githubId = 224674;
name = "Thomas Pham";
};
Thra11 = {
email = "tahall256@protonmail.ch";
github = "Thra11";
githubId = 1391883;
name = "Tom Hall";
};
tilpner = {
email = "till@hoeppner.ws";
github = "tilpner";
@@ -6435,6 +6820,16 @@
githubId = 13026;
name = "Jonathan Rudenberg";
};
tkerber = {
email = "tk@drwx.org";
github = "tkerber";
githubId = 5722198;
name = "Thomas Kerber";
keys = [ {
longkeyid = "rsa4096/0x8489B911F9ED617B";
fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
} ];
};
tmplt = {
email = "tmplt@dragons.rocks";
github = "tmplt";
@@ -6482,6 +6877,12 @@
githubId = 178444;
name = "Thomas Bereknyei";
};
tomfitzhenry = {
email = "tom@tom-fitzhenry.me.uk";
github = "tomfitzhenry";
githubId = 61303;
name = "Tom Fitzhenry";
};
tomsmeets = {
email = "tom.tsmeets@gmail.com";
github = "tomsmeets";
@@ -6512,6 +6913,12 @@
githubId = 1312290;
name = "Trevor Joynson";
};
tricktron = {
email = "tgagnaux@gmail.com";
github = "tricktron";
githubId = 16036882;
name = "Thibault Gagnaux";
};
trino = {
email = "muehlhans.hubert@ekodia.de";
github = "hmuehlhans";
@@ -6524,6 +6931,11 @@
githubId = 483735;
name = "Dmitry Geurkov";
};
tscholak = {
email = "torsten.scholak@googlemail.com";
github = "tscholak";
name = "Torsten Scholak";
};
tstrobel = {
email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains";
name = "Thomas Strobel";
@@ -6636,7 +7048,7 @@
githubId = 1525767;
name = "Vaibhav Sagar";
};
valebes = {
valebes = {
email = "valebes@gmail.com";
github = "valebes";
githubid = 10956211;
@@ -6840,6 +7252,12 @@
email = "kirill.wedens@gmail.com";
name = "wedens";
};
WhittlesJr = {
email = "alex.joseph.whitt@gmail.com";
github = "WhittlesJr";
githubId = 19174984;
name = "Alex Whitt";
};
willibutz = {
email = "willibutz@posteo.de";
github = "willibutz";
@@ -6937,6 +7355,12 @@
githubId = 36407913;
name = "Uli Baum";
};
xfix = {
email = "konrad@borowski.pw";
github = "xfix";
githubId = 1297598;
name = "Konrad Borowski";
};
xnaveira = {
email = "xnaveira@gmail.com";
github = "xnaveira";
@@ -7049,8 +7473,24 @@
githubId = 1866448;
name = "Eric Bailey";
};
z77z = {
email = "maggesi@math.unifi.it";
Yumasi = {
email = "gpagnoux@gmail.com";
github = "Yumasi";
githubId = 24368641;
name = "Guillaume Pagnoux";
keys = [{
longkeyid = "rsa4096/0xEC5065899AEAAF4C";
fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";
}];
};
yvt = {
email = "i@yvt.jp";
github = "yvt";
githubId = 5253988;
name = "yvt";
};
maggesi = {
email = "marco.maggesi@gmail.com";
github = "maggesi";
githubId = 1809783;
name = "Marco Maggesi";
@@ -7094,6 +7534,12 @@
email = "zef@zef.me";
name = "Zef Hemel";
};
zfnmxt = {
name = "zfnmxt";
email = "zfnmxt@zfnmxt.com";
github = "zfnmxt";
githubId = 37446532;
};
zgrannan = {
email = "zgrannan@gmail.com";
github = "zgrannan";
@@ -7166,4 +7612,16 @@
githubId = 1986844;
name = "Daniel Wheeler";
};
zokrezyl = {
email = "zokrezyl@gmail.com";
github = "zokrezyl";
githubId = 51886259;
name = "Zokre Zyl";
};
rakesh4g = {
email = "rakeshgupta4u@gmail.com";
github = "rakesh4g";
githubId = 50867187;
name = "Rakesh Gupta";
};
}
+24 -12
View File
@@ -11,13 +11,15 @@ import click
import requests
from pyquery import PyQuery as pq
def map_dict (f, d):
for k,v in d.items():
d[k] = f(v)
maintainers_json = subprocess.check_output([
'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
'nix-instantiate', '-A', 'lib.maintainers', '--eval', '--strict', '--json'
])
maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.items()}
MAINTAINERS = map_dict(lambda v: v.get('github', None), maintainers)
def get_response_text(url):
return pq(requests.get(url).text) # IO
@@ -38,30 +40,39 @@ def get_maintainers(attr_name):
'-A',
'.'.join(nixname[1:]) + '.meta',
EVAL_FILE[nixname[0]],
'--arg',
'nixpkgs',
'./.',
'--json'])
meta = json.loads(meta_json)
if meta.get('maintainers'):
return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
return meta.get('maintainers', [])
except:
return []
def filter_github_users(maintainers):
github_only = []
for i in maintainers:
if i.get('github'):
github_only.append(i)
return github_only
def print_build(table_row):
a = pq(table_row)('a')[1]
print("- [ ] [{}]({})".format(a.text, a.get('href')), flush=True)
maintainers = get_maintainers(a.text)
if maintainers:
print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))))
job_maintainers = filter_github_users(get_maintainers(a.text))
if job_maintainers:
print(" - maintainers: {}".format(" ".join(map(lambda u: '@' + u.get('github'), job_maintainers))))
# TODO: print last three persons that touched this file
# TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
sys.stdout.flush()
@click.command()
@click.option(
'--jobset',
default="nixos/release-17.09",
help='Hydra project like nixos/release-17.09')
default="nixos/release-19.09",
help='Hydra project like nixos/release-19.09')
def cli(jobset):
"""
Given a Hydra project, inspect latest evaluation
@@ -93,6 +104,7 @@ def cli(jobset):
print_build(tr)
if __name__ == "__main__":
try:
cli()
@@ -37,14 +37,17 @@ lua-zlib,,,,,koral
lua_cliargs,,,,,
luabitop,,,,,
luacheck,,,,,
luacov,,,,,
luadbi,,,,,
luadbi-mysql,,,,,
luadbi-postgresql,,,,,
luadbi-sqlite3,,,,,
luadoc,,,,,
luaevent,,,,,
luaexpat,,,1.3.0-1,,arobyn flosse
luaffi,,http://luarocks.org/dev,,,
luafilesystem,,,1.7.0-2,,flosse vcunat
lualogging,,,,,
luaossl,,,,lua5_1,vcunat
luaposix,,,,,vyp lblasc
luasec,,,,,flosse
@@ -68,3 +71,4 @@ say,,,,,
std__debug,std._debug,,,,
std_normalize,std.normalize,,,,
stdlib,,,,,vyp
pulseaudio,,,,,doronbehar
1 # nix name luarocks name server version luaversion maintainers
37 lua_cliargs
38 luabitop
39 luacheck
40 luacov
41 luadbi
42 luadbi-mysql
43 luadbi-postgresql
44 luadbi-sqlite3
45 luadoc
46 luaevent
47 luaexpat 1.3.0-1 arobyn flosse
48 luaffi http://luarocks.org/dev
49 luafilesystem 1.7.0-2 flosse vcunat
50 lualogging
51 luaossl lua5_1 vcunat
52 luaposix vyp lblasc
53 luasec flosse
71 std__debug std._debug
72 std_normalize std.normalize
73 stdlib vyp
74 pulseaudio doronbehar
@@ -226,7 +226,7 @@ sub pkg_to_attr {
sub get_pkg_name {
my ($module) = @_;
return $module->package_name . '-' . $module->package_version;
return ( $module->package_name, $module->package_version =~ s/^v(\d)/$1/r );
}
sub read_meta {
@@ -375,13 +375,13 @@ die "module $module_name not found\n" if scalar @modules == 0;
die "multiple packages that match module $module_name\n" if scalar @modules > 1;
my $module = $modules[0];
my $pkg_name = get_pkg_name $module;
my ($pkg_name, $pkg_version) = get_pkg_name $module;
my $attr_name = pkg_to_attr $module;
INFO( "attribute name: ", $attr_name );
INFO( "module: ", $module->module );
INFO( "version: ", $module->version );
INFO( "package: ", $module->package, " (", $pkg_name, ", ", $attr_name, ")" );
INFO( "package: ", $module->package, " (", "$pkg_name-$pkg_version", ", ", $attr_name, ")" );
INFO( "path: ", $module->path );
my $tar_path = $module->fetch();
@@ -436,10 +436,11 @@ my $build_fun = -e "$pkg_path/Build.PL"
print STDERR "===\n";
print <<EOF;
${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun rec {
name = "$pkg_name";
${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun {
pname = "$pkg_name";
version = "$pkg_version";
src = fetchurl {
url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}";
url = "mirror://cpan/${\$module->path}/${\$module->package}";
sha256 = "${\$module->status->checksum_value}";
};
EOF
+3 -3
View File
@@ -6,7 +6,7 @@ exec >${1:?usage: $0 <output-file>}
cat <<EOF
{ branch ? "stable", pkgs }:
# Generated by /maintainers/scripts/update-discord
let
inherit (pkgs) callPackage fetchurl;
in {
@@ -16,7 +16,7 @@ for branch in "" ptb canary; do
url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
version=${url##https://dl*.discordapp.net/apps/linux/}
version=${version%%/*.tar.gz}
echo " ${branch:-stable} = callPackage ./base.nix {"
echo " ${branch:-stable} = callPackage ./base.nix rec {"
echo " pname = \"discord${branch:+-}${branch}\";"
case $branch in
"") suffix="" ;;
@@ -27,7 +27,7 @@ for branch in "" ptb canary; do
echo " desktopName = \"Discord${suffix:+ }${suffix}\";"
echo " version = \"${version}\";"
echo " src = fetchurl {"
echo " url = \"${url}\";"
echo " url = \"${url//${version}/\$\{version\}}\";"
echo " sha256 = \"$(nix-prefetch-url "$url")\";"
echo " };"
echo " };"