diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 803 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/hydra-report.hs | 55 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh | 2 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 26 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 19 | ||||
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 224 | ||||
| -rw-r--r-- | maintainers/scripts/update-luarocks-shell.nix | 13 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 36 |
8 files changed, 802 insertions, 376 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index de345f0e8bf2..5ce24431c00a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -149,6 +149,12 @@ github = "360ied"; githubId = 19516527; }; + _365tuwe = { + name = "Uwe Schlifkowitz"; + email = "supertuwe@gmail.com"; + github = "365tuwe"; + githubId = 10263091; + }; _3699n = { email = "nicholas@nvk.pm"; github = "3699n"; @@ -371,6 +377,15 @@ githubId = 124545; name = "Anthony Cowley"; }; + acuteenvy = { + matrix = "@acuteenvy:matrix.org"; + github = "acuteenvy"; + githubId = 126529524; + name = "Lena"; + keys = [{ + fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; + }]; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -446,6 +461,13 @@ githubId = 25236206; name = "Adrian Dole"; }; + adriangl = { + email = "adrian@lauterer.it"; + matrix = "@adriangl:pvv.ntnu.no"; + github = "adrlau"; + githubId = 25004152; + name = "Adrian Gunnar Lauterer"; + }; AdsonCicilioti = { name = "Adson Cicilioti"; email = "adson.cicilioti@live.com"; @@ -533,6 +555,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahoneybun = { + email = "aaron@system76.com"; + github = "ahoneybun"; + githubId = 4884946; + name = "Aaron Honeycutt"; + }; ahrzb = { email = "ahrzb5@gmail.com"; github = "ahrzb"; @@ -588,6 +616,12 @@ githubId = 1229027; name = "Andreas Schrägle"; }; + ajwhouse = { + email = "adam@ajwh.chat"; + github = "ajwhouse"; + githubId = 56616368; + name = "Adam House"; + }; ak = { email = "ak@formalprivacy.com"; github = "alexanderkjeldaas"; @@ -753,6 +787,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; + alex-fu27 = { + email = "alex.fu27@gmail.com"; + github = "alex-fu27"; + githubId = 49982580; + name = "Alexander Fuchs"; + }; alexnortung = { name = "alexnortung"; email = "alex_nortung@live.dk"; @@ -1203,6 +1243,11 @@ githubId = 81317317; name = "Anna Aurora"; }; + a-n-n-a-l-e-e = { + github = "a-n-n-a-l-e-e"; + githubId = 150648636; + name = "annalee"; + }; anoa = { matrix = "@andrewm:amorgan.xyz"; email = "andrew@amorgan.xyz"; @@ -1386,6 +1431,12 @@ githubId = 59743220; name = "Vinícius Müller"; }; + arcuru = { + email = "patrick@jackson.dev"; + github = "arcuru"; + githubId = 160646; + name = "Patrick Jackson"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1398,6 +1449,12 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + argrat = { + email = "n.bertazzo@protonmail.com"; + github = "argrat"; + githubId = 98821629; + name = "Nicolò Bertazzo"; + }; arian-d = { email = "arianxdehghani@gmail.com"; github = "arian-d"; @@ -1491,6 +1548,11 @@ fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; }]; }; + arthsmn = { + name = "Arthur Cerqueira"; + github = "arthsmn"; + githubId = 150680976; + }; arthur = { email = "me@arthur.li"; github = "arthurl"; @@ -1535,6 +1597,13 @@ githubId = 1482768; name = "Benjamin Asbach"; }; + asbjornolling = { + email = "asbjorn@olli.ng"; + matrix = "@asbjorn:olli.ng"; + github = "AsbjornOlling"; + githubId = 11493130; + name = "Asbjørn Olling"; + }; asciimoth = { name = "Andrew"; email = "ascii@moth.contact"; @@ -1714,6 +1783,12 @@ github = "auchter"; githubId = 1190483; }; + augustebaum = { + email = "auguste.apple@gmail.com"; + github = "augustebaum"; + githubId = 52001167; + name = "Auguste Baum"; + }; auntie = { email = "auntieNeo@gmail.com"; github = "auntieNeo"; @@ -1765,12 +1840,6 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; - aveltras = { - email = "romain.viallard@outlook.fr"; - github = "aveltras"; - githubId = 790607; - name = "Romain Viallard"; - }; averelld = { email = "averell+nixos@rxd4.com"; github = "averelld"; @@ -1831,6 +1900,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + ayes-web = { + email = "ayes2022@protonmail.com"; + github = "ayes-web"; + githubId = 52951851; + name = "ayes-web"; + }; aynish = { github = "Chickensoupwithrice"; githubId = 22575913; @@ -2394,6 +2469,12 @@ githubId = 37907; name = "Julian Stecklina"; }; + bloveless = { + email = "brennon.loveless@gmail.com"; + github = "bloveless"; + githubId = 535135; + name = "Brennon Loveless"; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; @@ -2449,6 +2530,12 @@ githubId = 50839; name = "Brian Jones"; }; + boltzmannrain = { + email = "boltzmannrain@gmail.com"; + github = "boltzmannrain"; + githubId = 150560585; + name = "Dmitry Ivankov"; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -2517,6 +2604,12 @@ githubId = 4621; name = "Brad Ediger"; }; + brahyerr = { + name = "Bryant Pham"; + email = "bp@1829847@gmail.com"; + github = "brahyerr"; + githubId = 120991075; + }; brainrape = { email = "martonboros@gmail.com"; github = "brainrake"; @@ -2577,6 +2670,12 @@ github = "brianmcgee"; githubId = 1173648; }; + brianmcgillion = { + name = "Brian McGillion"; + email = "bmg.avoin@gmail.com"; + github = "brianmcgillion"; + githubId = 1044263; + }; brodes = { email = "me@brod.es"; github = "brhoades"; @@ -2592,6 +2691,13 @@ githubId = 1071610; name = "Gunnar Nitsche"; }; + brokenpip3 = { + email = "brokenpip3@gmail.com"; + matrix = "@brokenpip3:matrix.org"; + github = "brokenpip3"; + githubId = 40476330; + name = "brokenpip3"; + }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; matrix = "@bryanasdev000:matrix.org"; @@ -2648,6 +2754,12 @@ githubId = 61636; name = "Brad Langhorst"; }; + bycEEE = { + email = "bycEEE@gmail.com"; + github = "bycEEE"; + githubId = 8891115; + name = "Brian Choy"; + }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; @@ -2763,6 +2875,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + camelpunch = { + email = "me@andrewbruce.net"; + github = "camelpunch"; + githubId = 141733; + name = "Andrew Bruce"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -2826,6 +2944,13 @@ githubId = 686190; name = "Carlos D'Agostino"; }; + carlossless = { + email = "contact@carlossless.io"; + matrix = "@carlossless:matrix.org"; + github = "carlossless"; + githubId = 498906; + name = "Karolis Stasaitis"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; @@ -3042,6 +3167,9 @@ email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; githubId = 9590981; + keys = [{ + fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; + }]; matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; @@ -3051,6 +3179,12 @@ githubId = 1689801; name = "Mikhail Chekan"; }; + chen = { + email = "i@cuichen.cc"; + github = "cu1ch3n"; + githubId = 80438676; + name = "Chen Cui"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -3069,6 +3203,11 @@ githubId = 18648043; name = "Daniel Cartwright"; }; + chewblacka = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; @@ -3156,15 +3295,6 @@ githubId = 1103294; name = "Christopher Rosset"; }; - christianharke = { - email = "christian@harke.ch"; - github = "rake5k"; - githubId = 13007345; - name = "Christian Harke"; - keys = [{ - fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; - }]; - }; christophcharles = { github = "christophcharles"; githubId = 23055925; @@ -3664,6 +3794,12 @@ githubId = 1222362; name = "Matías Lang"; }; + criyle = { + email = "i+nixos@goj.ac"; + name = "Yang Gao"; + githubId = 6821729; + github = "criyle"; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; @@ -3674,6 +3810,15 @@ fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; + Cryolitia = { + name = "Beiyan Cryolitia"; + email = "Cryolitia@gmail.com"; + github = "Cryolitia"; + githubId = 23723294; + keys = [{ + fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; + }]; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -4144,6 +4289,15 @@ githubId = 156239; name = "D Anzorge"; }; + defelo = { + name = "Defelo"; + matrix = "@defelo:matrix.defelo.de"; + github = "Defelo"; + githubId = 41747605; + keys = [{ + fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; + }]; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; @@ -4184,6 +4338,12 @@ githubId = 12224254; name = "Delta"; }; + delta231 = { + email = "swstkbaranwal@gmail.com"; + github = "Delta456"; + githubId = 28479139; + name = "Swastik Baranwal"; + }; deltadelta = { email = "contact@libellules.eu"; name = "Dara Ly"; @@ -4202,6 +4362,12 @@ githubId = 5503422; name = "Dmitriy Demin"; }; + demine = { + email = "riches_tweaks0o@icloud.com"; + github = "demine0"; + githubId = 51992962; + name = "Nikita Demin"; + }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; @@ -4850,6 +5016,12 @@ githubId = 424946; name = "James Earl Douglas"; }; + EBADBEEF = { + name = "EBADBEEF"; + email = "errno@ebadf.com"; + github = "EBADBEEF"; + githubId = 4167946; + }; ebbertd = { email = "daniel@ebbert.nrw"; github = "ebbertd"; @@ -5294,6 +5466,13 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + ericthemagician = { + email = "eric@ericyen.com"; + matrix = "@eric:jupiterbroadcasting.com"; + github = "EricTheMagician"; + githubId = 323436; + name = "Eric Yen"; + }; erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; @@ -5865,6 +6044,12 @@ githubId = 74379; name = "Florian Pester"; }; + fmhoeger = { + email = "fmhoeger@mirsem.org"; + name = "fmhoeger"; + github = "fmhoeger"; + githubId = 59626853; + }; fmoda3 = { email = "fmoda3@mac.com"; github = "fmoda3"; @@ -5920,13 +6105,6 @@ githubId = 92793; name = "Friedrich von Never"; }; - fortuneteller2k = { - email = "lythe1107@gmail.com"; - matrix = "@fortuneteller2k:matrix.org"; - github = "fortuneteller2k"; - githubId = 20619776; - name = "fortuneteller2k"; - }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; @@ -5954,6 +6132,11 @@ githubId = 119691; name = "Michael Gough"; }; + franciscod = { + github = "franciscod"; + githubId = 726447; + name = "Francisco Demartino"; + }; franzmondlichtmann = { name = "Franz Schroepf"; email = "franz-schroepf@t-online.de"; @@ -6030,6 +6213,10 @@ github = "frogamic"; githubId = 10263813; name = "Dominic Shelton"; + matrix = "@frogamic:beeper.com"; + keys = [{ + fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; + }]; }; frontsideair = { email = "photonia@gmail.com"; @@ -6096,7 +6283,7 @@ }; fugi = { email = "me@fugi.dev"; - github = "FugiMuffi"; + github = "fugidev"; githubId = 21362942; name = "Fugi"; }; @@ -6380,6 +6567,12 @@ githubId = 67984144; name = "Gerhard Schwanzer"; }; + gernotfeichter = { + email = "gernotfeichter@gmail.com"; + github = "gernotfeichter"; + githubId = 23199375; + name = "Gernot Feichter"; + }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; @@ -6463,6 +6656,12 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giomf = { + email = "giomf@mailbox.org"; + github = "giomf"; + githubId = 35076723; + name = "Guillaume Fournier"; + }; giorgiga = { email = "giorgio.gallo@bitnic.it"; github = "giorgiga"; @@ -6959,6 +7158,13 @@ githubId = 287769; name = "Sergii Paryzhskyi"; }; + heisfer = { + email = "heisfer@refract.dev"; + github = "heisfer"; + githubId = 28564678; + matrix = "@heisfer:matrix.org"; + name = "Heisfer"; + }; helium = { email = "helium.dev@tuta.io"; github = "helium18"; @@ -7425,6 +7631,13 @@ githubId = 1550265; name = "Dominic Steinitz"; }; + iFreilicht = { + github = "iFreilicht"; + githubId = 9742635; + matrix = "@ifreilicht:matrix.org"; + email = "nixpkgs@mail.felix-uhl.de"; + name = "Felix Uhl"; + }; ifurther = { github = "ifurther"; githubId = 55025025; @@ -7454,6 +7667,12 @@ githubId = 25505957; name = "Ilian"; }; + iliayar = { + email = "iliayar3@gmail.com"; + github = "iliayar"; + githubId = 17529355; + name = "Ilya Yaroshevskiy"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -7622,6 +7841,12 @@ githubId = 88038050; name = "Souvik Sen"; }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "iogamaster"; + githubId = 67164465; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; @@ -7683,6 +7908,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan770 = { + email = "ivan@ivan770.me"; + github = "ivan770"; + githubId = 14003886; + name = "Ivan Leshchenko"; + }; ivan-babrou = { email = "nixpkgs@ivan.computer"; name = "Ivan Babrou"; @@ -7730,6 +7961,12 @@ githubId = 41924494; name = "Ivar"; }; + ivarmedi = { + email = "ivar@larsson.me"; + github = "ivarmedi"; + githubId = 1318743; + name = "Ivar"; + }; iwanb = { email = "tracnar@gmail.com"; github = "iwanb"; @@ -7866,6 +8103,12 @@ githubId = 2212681; name = "Jakub Grzgorz Sokołowski"; }; + jakuzure = { + email = "shin@posteo.jp"; + github = "jakuzure"; + githubId = 11823547; + name = "jakuzure"; + }; jali-clarke = { email = "jinnah.ali-clarke@outlook.com"; name = "Jinnah Ali-Clarke"; @@ -7926,6 +8169,12 @@ githubId = 488556; name = "Javier Aguirre"; }; + javimerino = { + email = "merino.jav@gmail.com"; + name = "Javi Merino"; + github = "JaviMerino"; + githubId = 44926; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; @@ -8185,11 +8434,14 @@ githubId = 18501; name = "Julien Langlois"; }; - jfrankenau = { - email = "johannes@frankenau.net"; - github = "jfrankenau"; - githubId = 2736480; - name = "Johannes Frankenau"; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; }; jfroche = { name = "Jean-François Roche"; @@ -8208,11 +8460,6 @@ githubId = 31008330; name = "Jann Marc Villablanca"; }; - jgarcia = { - github = "chewblacka"; - githubId = 18430320; - name = "John Garcia"; - }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; @@ -8322,6 +8569,12 @@ githubId = 3081095; name = "Jürgen Keck"; }; + jl178 = { + email = "jeredlittle1996@gmail.com"; + github = "jl178"; + githubId = 72664723; + name = "Jered Little"; + }; jlamur = { email = "contact@juleslamur.fr"; github = "jlamur"; @@ -9347,6 +9600,12 @@ githubId = 691290; name = "Keshav Kini"; }; + kinzoku = { + email = "kinzokudev4869@gmail.com"; + github = "kinzoku-dev"; + githubId = 140647311; + name = "Ayman Hamza"; + }; kip93 = { name = "Leandro Reina Kiperman"; email = "leandro@kip93.net"; @@ -9770,12 +10029,23 @@ }]; name = "Joseph LaFreniere"; }; + lagoja = { + github = "Lagoja"; + githubId =750845; + name = "John Lago"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + lamarios = { + matrix = "@lamarios:matrix.org"; + github = "lamarios"; + githubId = 1192563; + name = "Paul Fauchon"; + }; lambda-11235 = { email = "taranlynn0@gmail.com"; github = "lambda-11235"; @@ -9872,6 +10142,13 @@ githubId = 2472678; name = "Lucas Desgouilles"; }; + ldprg = { + email = "lukas_4dr@gmx.at"; + matrix = "@ldprg:matrix.org"; + github = "LDprg"; + githubId = 71488985; + name = "LDprg"; + }; league = { email = "league@contrapunctus.net"; github = "league"; @@ -9890,6 +10167,15 @@ githubId = 887072; name = "Alexander Lebedev"; }; + lecoqjacob = { + name = "Jacob LeCoq"; + email = "lecoqjacob@gmail.com"; + githubId = 9278174; + github = "lecoqjacob"; + keys = [{ + fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; + }]; + }; ledif = { email = "refuse@gmail.com"; github = "ledif"; @@ -10421,6 +10707,12 @@ githubId = 2487922; name = "Lars Jellema"; }; + ludat = { + email = "lucas6246@gmail.com"; + github = "ludat"; + githubId = 4952044; + name = "Lucas David Traverso"; + }; ludo = { email = "ludo@gnu.org"; github = "civodul"; @@ -10813,6 +11105,12 @@ githubId = 3507; name = "Michael Fellinger"; }; + maolonglong = { + email = "shaolong.chen@outlook.it"; + github = "maolonglong"; + githubId = 50797868; + name = "Shaolong Chen"; + }; maralorn = { email = "mail@maralorn.de"; matrix = "@maralorn:maralorn.de"; @@ -10820,6 +11118,12 @@ githubId = 1651325; name = "maralorn"; }; + marcovergueira = { + email = "vergueira.marco@gmail.com"; + github = "marcovergueira"; + githubId = 929114; + name = "Marco Vergueira"; + }; marcus7070 = { email = "marcus@geosol.com.au"; github = "marcus7070"; @@ -11082,6 +11386,12 @@ githubId = 11810057; name = "Matt Snider"; }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -11130,6 +11440,12 @@ githubId = 1187050; name = "Maximilian Huber"; }; + maxhearnden = { + email = "max@hearnden.org.uk"; + github = "MaxHearnden"; + githubId = 8320393; + name = "Max Hearnden"; + }; maxhero = { email = "contact@maxhero.dev"; github = "themaxhero"; @@ -11593,6 +11909,12 @@ githubId = 34864484; name = "Mikael Fangel"; }; + mikecm = { + email = "mikecmcleod@gmail.com"; + github = "MaxwellDupre"; + githubId = 14096356; + name = "Michael McLeod"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -11870,7 +12192,7 @@ name = "Martin Milata"; }; mmlb = { - email = "manny@peekaboo.mmlb.icu"; + email = "i@m.mmlb.dev"; github = "mmlb"; githubId = 708570; name = "Manuel Mendez"; @@ -11928,6 +12250,13 @@ github = "ribosomerocker"; githubId = 46468162; }; + moni = { + email = "lythe1107@gmail.com"; + matrix = "@fortuneteller2k:matrix.org"; + github = "moni-dz"; + githubId = 20619776; + name = "moni"; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; @@ -12079,12 +12408,30 @@ github = "MrTarantoga"; githubId = 53876219; }; + mrtnvgr = { + name = "Egor Martynov"; + github = "mrtnvgr"; + githubId = 48406064; + keys = [{ + fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; + }]; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; githubId = 839693; name = "Ingolf Wanger"; }; + msanft = { + email = "moritz.sanft@outlook.de"; + matrix = "@msanft:matrix.org"; + name = "Moritz Sanft"; + github = "msanft"; + githubId = 58110325; + keys = [{ + fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; + }]; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -12299,6 +12646,12 @@ githubId = 9636071; name = "Myrl Hex"; }; + n00b0ss = { + email = "nixpkgs@n00b0ss.de"; + github = "n00b0ss"; + githubId = 61601147; + name = "basti n00b0ss"; + }; n0emis = { email = "nixpkgs@n0emis.network"; github = "n0emis"; @@ -12315,6 +12668,11 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + nadir-ishiguro = { + github = "nadir-ishiguro"; + githubId = 23151917; + name = "nadir-ishiguro"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "Nadrieril"; @@ -12358,6 +12716,11 @@ githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -12378,6 +12741,12 @@ githubId = 330943; name = "Nathan Bijnens"; }; + nathanielbrough = { + github = "silvergasp"; + githubId = 7277663; + email = "nathaniel.brough@gmail.com"; + name = "Nathaniel Brough"; + }; nathanruiz = { email = "nathanruiz@protonmail.com"; github = "nathanruiz"; @@ -12424,6 +12793,13 @@ githubId = 1386642; name = "Noah Brenowitz"; }; + nbsp = { + email = "aoife@enby.space"; + matrix = "@nbsp:enby.space"; + github = "enbyspace"; + githubId = 57151943; + name = "aoife cassidy"; + }; ncfavier = { email = "n@monade.li"; matrix = "@ncfavier:matrix.org"; @@ -12563,6 +12939,12 @@ githubId = 13920346; name = "Sébastien Iooss"; }; + netthier = { + email = "netthier@proton.me"; + name = "nett_hier"; + github = "netthier"; + githubId = 66856670; + }; networkexception = { name = "networkException"; email = "nix@nwex.de"; @@ -12748,13 +13130,6 @@ fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; - ninjatrappeur = { - email = "felix@alternativebit.fr"; - matrix = "@ninjatrappeur:matrix.org"; - github = "NinjaTrappeur"; - githubId = 1219785; - name = "Félix Baylac-Jacqué"; - }; nintron = { email = "nintron@sent.com"; github = "Nintron27"; @@ -12794,6 +13169,11 @@ githubId = 66913205; name = "Rick Sanchez"; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -12870,6 +13250,13 @@ githubId = 40049608; name = "Andy Chun"; }; + noodlez1232 = { + email = "contact@nathanielbarragan.xyz"; + matrix = "@noodlez1232:matrix.org"; + github = "Noodlez1232"; + githubId = 12480453; + name = "Nathaniel Barragan"; + }; nook = { name = "Tom Nook"; email = "0xnook@protonmail.com"; @@ -12888,6 +13275,12 @@ githubId = 3521180; name = "Tom Sydney Kerckhove"; }; + nosewings = { + name = "Nicholas Coltharp"; + email = "coltharpnicholas@gmail.com"; + github = "nosewings"; + githubId = 24929858; + }; NotAShelf = { name = "NotAShelf"; email = "raf@notashelf.dev"; @@ -13179,6 +13572,12 @@ githubId = 72201; name = "Ole Jørgen Brønner"; }; + oliver-koss = { + email = "oliver.koss06@gmail.com"; + github = "oliver-koss"; + githubId = 39134647; + name = "Oliver Koss"; + }; ollieB = { github = "oliverbunting"; githubId = 1237862; @@ -13297,6 +13696,15 @@ githubId = 75299; name = "Malcolm Matalka"; }; + orhun = { + email = "orhunparmaksiz@gmail.com"; + github = "orhun"; + githubId = 24392180; + name = "Orhun Parmaksız"; + keys = [{ + fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; + }]; + }; orichter = { email = "richter-oliver@gmx.net"; github = "ORichterSec"; @@ -13541,6 +13949,12 @@ githubId = 6931743; name = "pasqui23"; }; + passivelemon = { + email = "jeremyseber@gmail.com"; + github = "PassiveLemon"; + githubId = 72527881; + name = "PassiveLemon"; + }; patricksjackson = { email = "patrick@jackson.dev"; github = "patricksjackson"; @@ -13568,6 +13982,11 @@ githubId = 15645854; name = "Brad Christensen"; }; + paumr = { + github = "paumr"; + name = "Michael Bergmeister"; + githubId = 53442728; + }; paveloom = { email = "paveloom@riseup.net"; github = "paveloom"; @@ -13629,6 +14048,7 @@ pbsds = { name = "Peder Bergebakken Sundt"; email = "pbsds@hotmail.com"; + matrix = "@pederbs:pvv.ntnu.no"; github = "pbsds"; githubId = 140964; }; @@ -13803,6 +14223,12 @@ githubId = 9267430; name = "Philipp Mildenberger"; }; + philiptaron = { + email = "philip.taron@gmail.com"; + github = "philiptaron"; + githubId = 43863; + name = "Philip Taron"; + }; phip1611 = { email = "phip1611@gmail.com"; github = "phip1611"; @@ -13827,6 +14253,12 @@ githubId = 301903; name = "Chip Collier"; }; + phrogg = { + name = "Phil Roggenbuck"; + email = "nixpkgs@phrogg.de"; + github = "phrogg"; + githubId = 1367949; + }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; @@ -13839,6 +14271,13 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + picnoir = { + email = "felix@alternativebit.fr"; + matrix = "@picnoir:alternativebit.fr"; + github = "picnoir"; + githubId = 1219785; + name = "Félix Baylac-Jacqué"; + }; piegames = { name = "piegames"; email = "nix@piegames.de"; @@ -13996,12 +14435,25 @@ githubId = 7839004; name = "Dmitriy Pleshevskiy"; }; + pluiedev = { + email = "hi@pluie.me"; + github = "pluiedev"; + githubId = 22406910; + name = "Leah Amelia Chen"; + }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; githubId = 13000278; name = "Maksim Bronsky"; }; + plusgut = { + name = "Carlo Jeske"; + email = "carlo.jeske+nixpkgs@webentwickler2-0.de"; + github = "plusgut"; + githubId = 277935; + matrix = "@plusgut5:matrix.org"; + }; PlushBeaver = { name = "Dmitry Kozlyuk"; email = "dmitry.kozliuk+nixpkgs@gmail.com"; @@ -14255,6 +14707,12 @@ name = "Philipp Rintz"; matrix = "@philipp:srv.icu"; }; + prit342 = { + email = "prithak342@gmail.com"; + github = "prit342"; + githubId = 20863431; + name = "Prithak S."; + }; ProducerMatt = { name = "Matthew Pherigo"; email = "ProducerMatt42@gmail.com"; @@ -14462,6 +14920,12 @@ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; + qdlmcfresh = { + name = "Philipp Urlbauer"; + email = "qdlmcfresh@gmail.com"; + github = "qdlmcfresh"; + githubId = 10837173; + }; qjoly = { email = "github@thoughtless.eu"; github = "qjoly"; @@ -14494,7 +14958,7 @@ }; quantenzitrone = { email = "quantenzitrone@protonmail.com"; - github = "Quantenzitrone"; + github = "quantenzitrone"; githubId = 74491719; matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; @@ -14576,6 +15040,12 @@ githubId = 1016742; name = "Rafael García"; }; + rafaelrc = { + email = "contact@rafaelrc.com"; + name = "Rafael Carvalho"; + github = "rafaelrc7"; + githubId = 5376043; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; @@ -14601,6 +15071,15 @@ githubId = 314564; name = "Ryan Lahfa"; }; + rake5k = { + email = "christian@harke.ch"; + github = "rake5k"; + githubId = 13007345; + name = "Christian Harke"; + keys = [{ + fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; + }]; + }; rakesh4g = { email = "rakeshgupta4u@gmail.com"; github = "Rakesh4G"; @@ -14688,6 +15167,12 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.com"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "freeman42x"; @@ -14775,6 +15260,12 @@ githubId = 816465; name = "Redvers Davies"; }; + redxtech = { + email = "gabe@gabedunn.dev"; + github = "redxtech"; + githubId = 18155001; + name = "Gabe Dunn"; + }; reedrw = { email = "reedrw5601@gmail.com"; github = "reedrw"; @@ -14841,6 +15332,12 @@ githubId = 3302; name = "Renzo Carbonara"; }; + rettetdemdativ = { + email = "michael@koeppl.dev"; + github = "rettetdemdativ"; + githubId = 5265630; + name = "Michael Köppl"; + }; revol-xut = { email = "revol-xut@protonmail.com"; name = "Tassilo Tanneberger"; @@ -14868,6 +15365,15 @@ githubId = 44014925; name = "Rexx Larsson"; }; + RGBCube = { + name = "RGBCube"; + email = "rgbsphere+nixpkgs@gmail.com"; + github = "RGBCube"; + githubId = 78925721; + keys = [{ + fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; + }]; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; @@ -15100,12 +15606,6 @@ githubId = 496447; name = "Robert Hensing"; }; - robert-manchester = { - email = "robert.manchester@gmail.com"; - github = "robert-manchester"; - githubId = 86313040; - name = "Robert Manchester"; - }; robertodr = { email = "roberto.diremigio@gmail.com"; github = "robertodr"; @@ -15160,6 +15660,12 @@ githubId = 69053978; name = "rogarb"; }; + rollf = { + email = "rolf.schroeder@limbus-medtec.com"; + github = "rollf"; + githubId = 58295931; + name = "Rolf Schröder"; + }; roman = { email = "open-source@roman-gonzalez.info"; github = "roman"; @@ -15577,6 +16083,15 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; + samuel-martineau = { + name = "Samuel Martineau"; + email = "samuel@smartineau.me"; + github = "Samuel-Martineau"; + githubId = 44237969; + keys = [{ + fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; + }]; + }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; @@ -15859,6 +16374,12 @@ githubId = 4927883; matrix = "@seirl:matrix.org"; }; + selfuryon = { + name = "Sergei Iakovlev"; + email = "siakovlev@pm.me"; + github = "selfuryon"; + githubId = 2993917; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -15963,13 +16484,6 @@ fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; }]; }; - sfr = { - email = "sol@solfisher.com"; - matrix = "@sfr:enby.space"; - github = "solfisher"; - githubId = 57151943; - name = "Sol Fisher Romanoff"; - }; sfrijters = { email = "sfrijters@gmail.com"; github = "SFrijters"; @@ -15982,6 +16496,13 @@ githubId = 75371; name = "Stig Palmquist"; }; + sg-qwt = { + email = "hello@edgerunners.eu.org"; + matrix = "@dhl:edgerunners.eu.org"; + github = "sg-qwt"; + name = "sg-qwt"; + githubId = 115715554; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; @@ -15993,6 +16514,12 @@ githubId = 543055; name = "Shadaj Laddad"; }; + shaddydc = { + email = "nixpkgs@shaddy.dev"; + github = "ShaddyDC"; + githubId = 18403034; + name = "Shaddy"; + }; shadowrz = { email = "shadowrz+nixpkgs@disroot.org"; matrix = "@ShadowRZ:matrixim.cc"; @@ -16112,6 +16639,12 @@ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; + shivaraj-bh = { + email = "sbh69840@gmail.com"; + name = "Shivaraj B H"; + github = "shivaraj-bh"; + githubId = 23645788; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -16250,6 +16783,13 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + sinanmohd = { + name = "Sinan Mohd"; + email = "sinan@firemail.cc"; + matrix = "@sinan:sinanmohd.com"; + github = "sinanmohd"; + githubId = 69694713; + }; sioodmy = { name = "Antoni Sokołowski"; github = "sioodmy"; @@ -16330,11 +16870,10 @@ githubId = 158321; name = "Stewart Mackenzie"; }; - skeidel = { - email = "svenkeidel@gmail.com"; - github = "svenkeidel"; - githubId = 266500; - name = "Sven Keidel"; + skovati = { + github = "skovati"; + githubId = 49844593; + name = "skovati"; }; skykanin = { github = "skykanin"; @@ -16456,6 +16995,16 @@ github = "SnO2WMaN"; githubId = 15155608; }; + snowflake = { + email = "snowflake@pissmail.com"; + name = "Snowflake"; + github = "snf1k"; + githubId = 149651684; + matrix = "@snowflake:mozilla.org"; + keys = [{ + fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; + }]; + }; snpschaaf = { email = "philipe.schaaf@secunet.com"; name = "Philippe Schaaf"; @@ -16525,6 +17074,12 @@ githubId = 9720532; name = "Sergei K"; }; + sontek = { + email = "sontek@gmail.com"; + github = "sontek"; + githubId = 151924; + name = "John Anderson"; + }; sophrosyne = { email = "joshuaortiz@tutanota.com"; github = "sophrosyne97"; @@ -16729,6 +17284,12 @@ githubId = 327943; name = "Scott Zhu Reeves"; }; + starzation = { + email = "nixpkgs@starzation.net"; + github = "starzation"; + githubId = 145975416; + name = "Starzation"; + }; stasjok = { name = "Stanislav Asunkin"; email = "nixpkgs@stasjok.ru"; @@ -16880,6 +17441,12 @@ githubId = 1694705; name = "Sam Stites"; }; + stnley = { + email = "michael@stnley.io"; + github = "stnley"; + githubId = 64174376; + name = "Michael Stanley"; + }; strager = { email = "strager.nds@gmail.com"; github = "strager"; @@ -17087,6 +17654,12 @@ githubId = 7075751; name = "Patrick Hilhorst"; }; + sysedwinistrator = { + email = "edwin.mowen@gmail.com"; + github = "sysedwinistrator"; + githubId = 71331875; + name = "Edwin Mackenzie-Owen"; + }; szczyp = { email = "qb@szczyp.com"; github = "Szczyp"; @@ -17212,6 +17785,12 @@ githubId = 1901799; name = "Nathan van Doorn"; }; + taranarmo = { + email = "taranarmo@gmail.com"; + github = "taranarmo"; + githubId = 11619234; + name = "Sergey Volkov"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; @@ -17282,6 +17861,11 @@ githubId = 7914437; name = "Thomas Cheronneau"; }; + tc-kaluza = { + github = "tc-kaluza"; + githubId = 101565936; + name = "Tautvydas Cerniauskas"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; @@ -18003,6 +18587,12 @@ githubId = 25440339; name = "Tom Repetti"; }; + trespaul = { + email = "paul@trespaul.com"; + github = "trespaul"; + githubId = 7453891; + name = "Paul Joubert"; + }; trevdev = { email = "trev@trevdev.ca"; matrix = "@trevdev:matrix.org"; @@ -18052,6 +18642,12 @@ github = "Trundle"; githubId = 332418; }; + tsandrini = { + email = "tomas.sandrini@seznam.cz"; + name = "Tomáš Sandrini"; + github = "tsandrini"; + githubId = 21975189; + }; tscholak = { email = "torsten.scholak@googlemail.com"; github = "tscholak"; @@ -18212,6 +18808,11 @@ githubId = 347983; name = "Udo Spallek"; }; + ufUNnxagpM = { + github = "ufUNnxagpM"; + githubId = 12422133; + name = "Chromo-residuum-opec"; + }; ulrikstrid = { email = "ulrik.strid@outlook.com"; github = "ulrikstrid"; @@ -18406,6 +19007,12 @@ githubId = 223408; name = "Varun Madiath"; }; + vancluever = { + email = "chrism@vancluevertech.com"; + github = "vancluever"; + githubId = 10704423; + name = "Chris Marchesi"; + }; vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; @@ -18694,6 +19301,12 @@ githubId = 7038383; name = "Vojta Káně"; }; + volfyd = { + email = "lb.nix@lisbethmail.com"; + github = "volfyd"; + githubId = 3578382; + name = "Leif Huhn"; + }; volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; @@ -18712,6 +19325,12 @@ githubId = 367185; name = "Jan Votava"; }; + vpetersson = { + email = "vpetersson@screenly.io"; + github = "vpetersson"; + githubId = 357664; + name = "Viktor Petersson"; + }; vq = { email = "vq@erq.se"; github = "vq"; @@ -18799,6 +19418,13 @@ fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; }]; }; + wamirez = { + email = "wamirez@protonmail.com"; + matrix = "@wamirez:matrix.org"; + github = "wamirez"; + githubId = 24505474; + name = "Daniel Ramirez"; + }; wamserma = { name = "Markus S. Wamser"; email = "github-dev@mail2013.wamser.eu"; @@ -18914,6 +19540,12 @@ fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; }]; }; + whiteley = { + email = "mattwhiteley@gmail.com"; + github = "whiteley"; + githubId = 2215; + name = "Matt Whiteley"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -19027,11 +19659,17 @@ githubId = 168610; name = "Ricardo M. Correia"; }; - wjlroe = { - email = "willroe@gmail.com"; - github = "wjlroe"; - githubId = 43315; - name = "William Roe"; + wkral = { + email = "william.kral@gmail.com"; + github = "wkral"; + githubId = 105114; + name = "William Kral"; + }; + wladmis = { + email = "dev@wladmis.org"; + github = "wladmis"; + githubId = 5000261; + name = "Wladmis"; }; wldhx = { email = "wldhx+nixpkgs@wldhx.me"; @@ -19162,6 +19800,12 @@ githubId = 3992240; name = "Elijah Rum"; }; + x0ba = { + name = "x0ba"; + email = "dax@omg.lol"; + github = "x0ba"; + githubId = 64868985; + }; x3ro = { name = "^x3ro"; email = "nix@x3ro.dev"; @@ -19211,11 +19855,11 @@ name = "Uli Baum"; }; xfix = { - email = "konrad@borowski.pw"; + email = "kamila@borowska.pw"; matrix = "@xfix:matrix.org"; github = "xfix"; githubId = 1297598; - name = "Konrad Borowski"; + name = "Kamila Borowska"; }; xfnw = { email = "xfnw+nixos@riseup.net"; @@ -19317,6 +19961,12 @@ github = "yanganto"; githubId = 10803111; }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -19361,6 +20011,13 @@ fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; }]; }; + YellowOnion = { + name = "Daniel Hill"; + email = "daniel@gluo.nz"; + github = "YellowOnion"; + githubId = 364160; + matrix = "@woobilicious:matrix.org"; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -19506,6 +20163,12 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yunfachi = { + email = "yunfachi@gmail.com"; + github = "yunfachi"; + githubId = 73419713; + name = "Yunfachi"; + }; yureien = { email = "contact@sohamsen.me"; github = "Yureien"; @@ -19746,6 +20409,12 @@ github = "zmitchell"; githubId = 10246891; }; + znaniye = { + email = "zn4niye@proton.me"; + github = "znaniye"; + githubId = 134703788; + name = "Samuel Silva"; + }; znewman01 = { email = "znewman01@gmail.com"; github = "znewman01"; diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 5573e5e5afc6..8b4f798cc543 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) getEvalBuilds NoHydraSlownessWorkaround id = - hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"] + hydraJSONQuery mempty ["eval", showT id, "builds"] getEvalBuilds HydraSlownessWorkaround id = do Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] forM builds $ \buildId -> do @@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do hydraJSONQuery mempty [ "build", showT buildId ] hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) -hydraQuery responseType option query = - responseBody - <$> req - GET - (foldl' (/:) (https "hydra.nixos.org") query) - NoReqBody - responseType - (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option) +hydraQuery responseType option query = do + let customHeaderOpt = + header + "User-Agent" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes + opts = customHeaderOpt <> customTimeoutOpt <> option + url = foldl' (/:) (https "hydra.nixos.org") query + responseBody <$> req GET url NoReqBody responseType opts hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a hydraJSONQuery = hydraQuery jsonResponse @@ -381,22 +382,22 @@ data BuildState icon :: BuildState -> Text icon = \case - Failed -> ":x:" - DependencyFailed -> ":heavy_exclamation_mark:" - OutputLimitExceeded -> ":warning:" + Failed -> "❌" + DependencyFailed -> "❗" + OutputLimitExceeded -> "⚠️" Unknown x -> "unknown code " <> showT x - TimedOut -> ":hourglass::no_entry_sign:" - Canceled -> ":no_entry_sign:" - Unfinished -> ":hourglass_flowing_sand:" - HydraFailure -> ":construction:" - Success -> ":heavy_check_mark:" + TimedOut -> "⌛🚫" + Canceled -> "🚫" + Unfinished -> "⏳" + HydraFailure -> "🚧" + Success -> "✅" platformIcon :: Platform -> Text platformIcon (Platform x) = case x of - "x86_64-linux" -> ":penguin:" - "aarch64-linux" -> ":iphone:" - "x86_64-darwin" -> ":apple:" - "aarch64-darwin" -> ":green_apple:" + "x86_64-linux" -> "🐧" + "aarch64-linux" -> "📱" + "x86_64-darwin" -> "🍎" + "aarch64-darwin" -> "🍏" _ -> x platformIsOS :: OS -> Platform -> Bool @@ -625,7 +626,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList (failedDeps summary)) <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList (unknownErr summary)) <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) - <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] + <> ["","*⤴️: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] <> footer where footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] @@ -650,7 +651,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = brokenLine :: (PkgName, Int) -> Text brokenLine (PkgName name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> - ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + ") ⤴️ " <> Text.pack (show rdeps) <> " " numSummary = statusToNumSummary summary @@ -732,7 +733,7 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = , Text.pack ( if summaryReverseDeps entry > 0 then - " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <> + " ⤴️ " <> show (summaryUnbrokenReverseDeps entry) <> " | " <> show (summaryReverseDeps entry) else "" ) @@ -749,9 +750,9 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = ) tldr = case (errors, warnings) of - ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - _ -> [":red_circle: **Branch not mergeable**"] + ([],[]) -> ["🟢 **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],_) -> ["🟡 **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + _ -> ["🔴 **Branch not mergeable**"] warnings = if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 86fecbc3d87c..9130941a5366 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -39,5 +39,5 @@ fi package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") -curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv echo diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index f03ef4fa09c9..1a581a450c26 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -12,20 +12,19 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 -ferris.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque +fzy,,,,,,mrcjkb gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -41,7 +40,7 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -50,6 +49,7 @@ lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, lua-resty-openssl,,,,,, lua-resty-session,,,,,, +lua-rtoml,https://github.com/lblasc/lua-rtoml,,,,,lblasc lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, @@ -74,6 +74,7 @@ luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, luarocks-build-rust-mlua,,,,,,mrcjkb luasec,,,,,,flosse +luasnip,,,,,, luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, @@ -83,29 +84,30 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc -magick,,,,,,donovanglover +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn -nui-nvim,,,,,,mrcjkb +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, +rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 52e9af399709..cc0f4ef742d1 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -26,7 +26,7 @@ import urllib.parse import urllib.request import xml.etree.ElementTree as ET from dataclasses import asdict, dataclass -from datetime import datetime +from datetime import UTC, datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path @@ -468,6 +468,7 @@ class Editor: "--input-names", "-i", dest="input_file", + type=Path, default=self.default_in, help="A list of plugins in the form owner/repo", ) @@ -476,6 +477,7 @@ class Editor: "-o", dest="outfile", default=self.default_out, + type=Path, help="Filename to save generated nix code", ) common.add_argument( @@ -786,11 +788,16 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - from datetime import date - editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - updated = date.today().strftime('%m-%d-%Y') - - commit(editor.nixpkgs_repo, f"{editor.attr_path}: updated the {updated}", [args.outfile]) + try: + repo = git.Repo(os.getcwd()) + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') + print(args.outfile) + commit(repo, + f"{editor.attr_path}: update on {updated}", [args.outfile] + ) + except git.InvalidGitRepositoryError as e: + print(f"Not in a git repository: {e}", file=sys.stderr) + sys.exit(1) if redirects: update() diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages deleted file mode 100755 index 32c2b44260b3..000000000000 --- a/maintainers/scripts/update-luarocks-packages +++ /dev/null @@ -1,224 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-luarocks-shell.nix -i python3 - -# format: -# $ nix run nixpkgs#python3Packages.black -- update.py -# type-check: -# $ nix run nixpkgs#python3Packages.mypy -- update.py -# linted: -# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py - -import inspect -import os -import tempfile -import shutil -from dataclasses import dataclass -import subprocess -import csv -import logging -import textwrap -from multiprocessing.dummy import Pool - -from typing import List, Tuple, Optional -from pathlib import Path - -log = logging.getLogger() -log.addHandler(logging.StreamHandler()) - -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore -import pluginupdate -from pluginupdate import update_plugins, FetchConfig, CleanEnvironment - -PKG_LIST = "maintainers/scripts/luarocks-packages.csv" -TMP_FILE = "$(mktemp)" -GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG = "maintainers/scripts/luarocks-config.lua" - -HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! -Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages - -You can customize the generated packages in pkgs/development/lua-modules/overrides.nix -*/ -""".format( - GENERATED_NIXFILE=GENERATED_NIXFILE -) - -FOOTER = """ -} -/* GENERATED - do not edit this file */ -""" - - -@dataclass -class LuaPlugin: - name: str - """Name of the plugin, as seen on luarocks.org""" - src: str - """address to the git repository""" - ref: Optional[str] - """git reference (branch name/tag)""" - version: Optional[str] - """Set it to pin a package """ - server: Optional[str] - """luarocks.org registers packages under different manifests. - Its value can be 'http://luarocks.org/dev' - """ - luaversion: Optional[str] - """Attribue of the lua interpreter if a package is available only for a specific lua version""" - maintainers: Optional[str] - """ Optional string listing maintainers separated by spaces""" - - @property - def normalized_name(self) -> str: - return self.name.replace(".", "-") - - -# rename Editor to LangUpdate/ EcosystemUpdater -class LuaEditor(pluginupdate.Editor): - def get_current_plugins(self): - return [] - - def load_plugin_spec(self, input_file) -> List[LuaPlugin]: - luaPackages = [] - csvfilename = input_file - log.info("Loading package descriptions from %s", csvfilename) - - with open(csvfilename, newline="") as csvfile: - reader = csv.DictReader( - csvfile, - ) - for row in reader: - # name,server,version,luaversion,maintainers - plugin = LuaPlugin(**row) - luaPackages.append(plugin) - return luaPackages - - def update(self, args): - update_plugins(self, args) - - def generate_nix(self, results: List[Tuple[LuaPlugin, str]], outfilename: str): - with tempfile.NamedTemporaryFile("w+") as f: - f.write(HEADER) - header2 = textwrap.dedent( - # header2 = inspect.cleandoc( - """ - { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: - final: prev: - { - """ - ) - f.write(header2) - for plugin, nix_expr in results: - f.write(f"{plugin.normalized_name} = {nix_expr}") - f.write(FOOTER) - f.flush() - - # if everything went fine, move the generated file to its destination - # using copy since move doesn't work across disks - shutil.copy(f.name, outfilename) - - print(f"updated {outfilename}") - - @property - def attr_path(self): - return "luaPackages" - - def get_update(self, input_file: str, outfile: str, config: FetchConfig): - _prefetch = generate_pkg_nix - - def update() -> dict: - plugin_specs = self.load_plugin_spec(input_file) - sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) - - try: - pool = Pool(processes=config.proc) - results = pool.map(_prefetch, sorted_plugin_specs) - finally: - pass - - self.generate_nix(results, outfile) - - redirects = {} - return redirects - - return update - - def rewrite_input(self, input_file: str, *args, **kwargs): - # vim plugin reads the file before update but that shouldn't be our case - # not implemented yet - # fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers'] - # input_file = "toto.csv" - # with open(input_file, newline='') as csvfile: - # writer = csv.DictWriter(csvfile, fieldnames=fieldnames) - # writer.writeheader() - # for row in reader: - # # name,server,version,luaversion,maintainers - # plugin = LuaPlugin(**row) - # luaPackages.append(plugin) - pass - - -def generate_pkg_nix(plug: LuaPlugin): - """ - Generate nix expression for a luarocks package - Our cache key associates "p.name-p.version" to its rockspec - """ - log.debug("Generating nix expression for %s", plug.name) - custom_env = os.environ.copy() - custom_env["LUAROCKS_CONFIG"] = LUAROCKS_CONFIG - - # we add --dev else luarocks wont find all the "scm" (=dev) versions of the - # packages - # , "--dev" - cmd = ["luarocks", "nix"] - - if plug.maintainers: - cmd.append(f"--maintainers={plug.maintainers}") - - # if plug.server == "src": - if plug.src != "": - if plug.src is None: - msg = ( - "src must be set when 'version' is set to \"src\" for package %s" - % plug.name - ) - log.error(msg) - raise RuntimeError(msg) - log.debug("Updating from source %s", plug.src) - cmd.append(plug.src) - # update the plugin from luarocks - else: - cmd.append(plug.name) - if plug.version and plug.version != "src": - cmd.append(plug.version) - - if plug.server != "src" and plug.server: - cmd.append(f"--only-server={plug.server}") - - if plug.luaversion: - cmd.append(f"--lua-version={plug.luaversion}") - - log.debug("running %s", " ".join(cmd)) - - output = subprocess.check_output(cmd, env=custom_env, text=True) - output = "callPackage(" + output.strip() + ") {};\n\n" - return (plug, output) - - -def main(): - editor = LuaEditor( - "lua", - ROOT, - "", - default_in=ROOT.joinpath(PKG_LIST), - default_out=ROOT.joinpath(GENERATED_NIXFILE), - ) - - editor.run() - - -if __name__ == "__main__": - main() - -# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix deleted file mode 100644 index 346b0319b08c..000000000000 --- a/maintainers/scripts/update-luarocks-shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ nixpkgs ? import ../.. { } -}: -with nixpkgs; -let - pyEnv = python3.withPackages(ps: [ ps.gitpython ]); -in -mkShell { - packages = [ - pyEnv - luarocks-nix - nix-prefetch-scripts - ]; -} diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 85a6227634f1..389aca1123b6 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -127,14 +127,6 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - chia = { - members = [ - lourkeur - ]; - scope = "Maintain the Chia blockchain and its dependencies"; - shortName = "Chia Blockchain"; - }; - coq = { members = [ cohencyril @@ -219,7 +211,6 @@ with lib.maintainers; { cole-h grahamc hoverbear - lheckemann ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; @@ -323,13 +314,19 @@ with lib.maintainers; { geospatial = { members = [ + das-g imincik - sikmir nh2 + nialov + sikmir willcohen ]; + githubTeams = [ + "geospatial" + ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; + enableFeatureFreezePing = true; }; gitlab = { @@ -394,6 +391,7 @@ with lib.maintainers; { cdepillabout expipiplus1 maralorn + ncfavier sternenseemann ]; githubTeams = [ @@ -407,7 +405,6 @@ with lib.maintainers; { home-assistant = { members = [ fab - globin hexa mic92 ]; @@ -431,6 +428,7 @@ with lib.maintainers; { members = [ cleeyv ryantm + lassulus ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; @@ -440,6 +438,7 @@ with lib.maintainers; { members = [ GaetanLepage natsukium + thomasjm ]; scope = "Maintain Jupyter and related packages."; shortName = "Jupyter"; @@ -672,18 +671,6 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - numtide = { - members = [ - mic92 - flokli - jfroche - tazjin - zimbatm - ]; - scope = "Group registration for Numtide team members who collectively maintain packages."; - shortName = "Numtide team"; - }; - ocaml = { members = [ alizter @@ -742,7 +729,6 @@ with lib.maintainers; { aanderse drupol etu - globin ma27 talyz ]; @@ -912,7 +898,6 @@ with lib.maintainers; { tts = { members = [ - hexa mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; @@ -933,7 +918,6 @@ with lib.maintainers; { wdz = { members = [ n0emis - netali vidister johannwagner yuka |