diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 479 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/test-configurations.nix | 136 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 192 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 12 |
4 files changed, 712 insertions, 107 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 00c7446b7d5..d0a90fa4cfe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -95,6 +95,12 @@ githubId = 7414843; name = "Nicholas von Klitzing"; }; + _13r0ck = { + name = "Brock Szuszczewicz"; + email = "bnr@tuta.io"; + github = "13r0ck"; + githubId = 58987761; + }; _3noch = { email = "eacameron@gmail.com"; github = "3noch"; @@ -119,6 +125,12 @@ githubId = 241628; name = "Adam Russell"; }; + aadibajpai = { + email = "hello@aadibajpai.com"; + github = "aadibajpai"; + githubId = 27063113; + name = "Aadi Bajpai"; + }; aanderse = { email = "aaron@fosslib.net"; matrix = "@aanderse:nixos.dev"; @@ -501,10 +513,6 @@ githubId = 38869148; name = "Alex Eyre"; }; - algorith = { - email = "dries_van_daele@telenet.be"; - name = "Dries Van Daele"; - }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; @@ -940,6 +948,12 @@ githubId = 59696216; name = "Arnold Farkas"; }; + arnoutkroeze = { + email = "nixpkgs@arnoutkroeze.nl"; + github = "arnoutkroeze"; + githubId = 37151054; + name = "Arnout Kroeze"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; @@ -1164,6 +1178,17 @@ githubId = 56650223; name = "Artturi N"; }; + azahi = { + email = "azahi@teknik.io"; + matrix = "@azahi:matrix.org"; + github = "azahi"; + githubId = 22211000; + name = "Azat Bahawi"; + keys = [{ + longkeyid = "rsa2048/0xB40FCB6608BBE3B6"; + fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6"; + }]; + }; ayazhafiz = { email = "ayaz.hafiz.1@gmail.com"; github = "ayazhafiz"; @@ -1690,6 +1715,12 @@ fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; }]; }; + broke = { + email = "broke@in-fucking.space"; + github = "broke"; + githubId = 1071610; + name = "Gunnar Nitsche"; + }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; matrix = "@bryanasdev000:matrix.org"; @@ -1865,6 +1896,13 @@ githubId = 495429; name = "Claas Augner"; }; + cawilliamson = { + email = "home@chrisaw.com"; + github = "cawilliamson"; + githubId = 1141769; + matrix = "@cawilliamson:nixos.dev"; + name = "Christopher A. Williamson"; + }; cbley = { email = "claudio.bley@gmail.com"; github = "avdv"; @@ -1876,12 +1914,10 @@ github = "cburstedde"; githubId = 109908; name = "Carsten Burstedde"; - keys = [ - { - longkeyid = "rsa2048/0x0704CD9E550A6BCD"; - fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; - } - ]; + keys = [{ + longkeyid = "rsa2048/0x0704CD9E550A6BCD"; + fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; + }]; }; cdepillabout = { email = "cdep.illabout@gmail.com"; @@ -1908,6 +1944,12 @@ githubId = 543423; name = "Alex Wied"; }; + cfhammill = { + email = "cfhammill@gmail.com"; + github = "cfhammill"; + githubId = 7467038; + name = "Chris Hammill"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -2058,12 +2100,6 @@ githubId = 399718; name = "Chris Martin"; }; - chrisaw = { - email = "home@chrisaw.com"; - github = "cawilliamson"; - githubId = 1141769; - name = "Christopher A. Williamson"; - }; chrisjefferson = { email = "chris@bubblescope.net"; github = "chrisjefferson"; @@ -2128,6 +2164,12 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + cirno-999 = { + email = "reverene@protonmail.com"; + github = "cirno-999"; + githubId = 73712874; + name = "cirno-999"; + }; citadelcore = { email = "alex@arctarus.co.uk"; github = "citadelcore"; @@ -2243,6 +2285,12 @@ githubId = 34317; name = "Corey O'Connor"; }; + CodeLongAndProsper90 = { + github = "CodeLongAndProsper90"; + githubId = 50145141; + email = "jupiter@m.rdis.dev"; + name = "Scott Little"; + }; codsl = { email = "codsl@riseup.net"; github = "codsl"; @@ -2640,6 +2688,12 @@ email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + datafoo = { + email = "34766150+datafoo@users.noreply.github.com"; + github = "datafoo"; + githubId = 34766150; + name = "datafoo"; + }; davhau = { email = "d.hauer.it@gmail.com"; name = "David Hauer"; @@ -2777,6 +2831,12 @@ email = "d4delta@outlook.fr"; name = "Delta"; }; + deltadelta = { + email = "contact@libellules.eu"; + name = "Dara Ly"; + github = "tournemire"; + githubId = 20159432; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; @@ -2807,6 +2867,12 @@ githubId = 706758; name = "Christian Gerbrandt"; }; + derekcollison = { + email = "derek@nats.io"; + github = "derekcollison"; + githubId = 90097; + name = "Derek Collison"; + }; DerGuteMoritz = { email = "moritz@twoticketsplease.de"; github = "DerGuteMoritz"; @@ -3114,6 +3180,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + drperceptron = { + email = "92106371+drperceptron@users.noreply.github.com"; + github = "drperceptron"; + githubId = 92106371; + name = "Dr Perceptron"; + keys = [{ + longkeyid = "rsa4096/0x95EB6DFF26D1CEB0"; + fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; + }]; + }; drupol = { name = "Pol Dellaiera"; email = "pol.dellaiera@protonmail.com"; @@ -3131,6 +3207,12 @@ githubId = 24791219; name = "Jakob Neufeld"; }; + dsalaza4 = { + email = "podany270895@gmail.com"; + github = "dsalaza4"; + githubId = 11205987; + name = "Daniel Salazar"; + }; dschrempf = { name = "Dominik Schrempf"; email = "dominik.schrempf@gmail.com"; @@ -3281,12 +3363,6 @@ github = "edlimerkaj"; githubId = 71988351; }; - edibopp = { - email = "eduard.bopp@aepsil0n.de"; - github = "edibopp"; - githubId = 3098430; - name = "Eduard Bopp"; - }; emantor = { email = "rouven+nixos@czerwinskis.de"; github = "emantor"; @@ -3378,6 +3454,12 @@ githubId = 4742; name = "Aaron Bull Schaefer"; }; + elatov = { + email = "elatov@gmail.com"; + github = "elatov"; + githubId = 7494394; + name = "Karim Elatov"; + }; eleanor = { email = "dejan@proteansec.com"; github = "proteansec"; @@ -3390,6 +3472,12 @@ githubId = 103082; name = "Ed Brindley"; }; + elliot = { + email = "hack00mind@gmail.com"; + github = "Eliot00"; + githubId = 18375468; + name = "Elliot Xu"; + }; elliottvillars = { email = "elliottvillars@gmail.com"; github = "elliottvillars"; @@ -3458,7 +3546,7 @@ name = "Leo Maroni"; }; emmanuelrosa = { - email = "emmanuel_rosa@aol.com"; + email = "emmanuelrosa@protonmail.com"; matrix = "@emmanuelrosa:matrix.org"; github = "emmanuelrosa"; githubId = 13485450; @@ -4053,12 +4141,6 @@ githubId = 7551358; name = "Frede Emil"; }; - freepotion = { - email = "42352817+freepotion@users.noreply.github.com"; - github = "freepotion"; - githubId = 42352817; - name = "Free Potion"; - }; freezeboy = { email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; @@ -4181,6 +4263,16 @@ githubId = 1313787; name = "Gabriel Gonzalez"; }; + gador = { + email = "florian.brandes@posteo.de"; + github = "gador"; + githubId = 1883533; + name = "Florian Brandes"; + keys = [{ + longkeyid = "rsa4096/0xBBB3E40E53797FD9"; + fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; + }]; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; @@ -4380,6 +4472,16 @@ githubId = 1621335; name = "Andrew Trachenko"; }; + gordias = { + name = "Gordias"; + email = "gordias@disroot.org"; + github = "gordiasdot"; + githubId = 94724133; + keys = [{ + longkeyid = "ed25519/0x5D47284830FAA4FA"; + fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; + }]; + }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; @@ -4470,6 +4572,12 @@ githubId = 343415; name = "Greg Roodt"; }; + gruve-p = { + email = "groestlcoin@gmail.com"; + github = "gruve-p"; + githubId = 11212268; + name = "gruve-p"; + }; gschwartz = { email = "gsch@pennmedicine.upenn.edu"; github = "GregorySchwartz"; @@ -4721,6 +4829,12 @@ github = "higebu"; githubId = 733288; }; + hiljusti = { + name = "J.R. Hill"; + email = "hiljusti@so.dang.cool"; + github = "hiljusti"; + githubId = 17605298; + }; hinton = { email = "t@larkery.com"; name = "Tom Hinton"; @@ -5602,6 +5716,24 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + jmc-figueira = { + email = "business+nixos@jmc-figueira.dev"; + github = "jmc-figueira"; + githubId = 6634716; + name = "João Figueira"; + keys = [ + # GitHub signing key + { + longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; + fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; + } + # Email encryption + { + longkeyid = "ed25519/0x197F9A632D139E30"; + fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; + } + ]; + }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; @@ -5853,6 +5985,13 @@ githubId = 107689; name = "Josh Holland"; }; + jsierles = { + email = "joshua@hey.com"; + matrix = "@jsierles:matrix.org"; + name = "Joshua Sierles"; + github = "jsierles"; + githubId = 82; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -5888,6 +6027,12 @@ githubId = 11947756; name = "Julien Dehos"; }; + julienmalka = { + email = "julien.malka@me.com"; + github = "JulienMalka"; + githubId = 1792886; + name = "Julien Malka"; + }; julm = { email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; @@ -5924,6 +6069,16 @@ githubId = 2396926; name = "Justin Woo"; }; + jvanbruegge = { + email = "supermanitu@gmail.com"; + github = "jvanbruegge"; + githubId = 1529052; + name = "Jan van Brügge"; + keys = [{ + longkeyid = "rsa4096/0x366572BE7D6C78A2"; + fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; + }]; + }; jwatt = { email = "jwatt@broken.watch"; github = "jjwatt"; @@ -5986,6 +6141,13 @@ github = "k4leg"; githubId = 39882583; }; + k900 = { + name = "Ilya K."; + email = "me@0upti.me"; + github = "K900"; + githubId = 386765; + matrix = "@k900:0upti.me"; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -6227,7 +6389,7 @@ keys = [{ longkeyid = "rsa4096/0x7248991EFA8EFBEE"; fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE"; - }]; + }]; }; kiwi = { email = "envy1988@gmail.com"; @@ -6292,7 +6454,7 @@ }; kmein = { - email = "kieran.meinhardt@gmail.com"; + email = "kmein@posteo.de"; name = "Kierán Meinhardt"; github = "kmein"; githubId = 10352507; @@ -6345,6 +6507,12 @@ githubId = 15692230; name = "Muhammad Herdiansyah"; }; + koozz = { + email = "koozz@linux.com"; + github = "koozz"; + githubId = 264372; + name = "Jan van den Berg"; + }; koral = { email = "koral@mailoo.org"; github = "k0ral"; @@ -6369,6 +6537,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kradalby = { + name = "Kristoffer Dalby"; + email = "kristoffer@dalby.cc"; + github = "kradalby"; + githubId = 98431; + }; kraem = { email = "me@kraem.xyz"; github = "kraem"; @@ -6484,7 +6658,7 @@ }; kylesferrazza = { name = "Kyle Sferrazza"; - email = "kyle.sferrazza@gmail.com"; + email = "nixpkgs@kylesferrazza.com"; github = "kylesferrazza"; githubId = 6677292; @@ -6528,6 +6702,12 @@ githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + lammermann = { + email = "k.o.b.e.r@web.de"; + github = "lammermann"; + githubId = 695526; + name = "Benjamin Kober"; + }; larsr = { email = "Lars.Rasmusson@gmail.com"; github = "larsr"; @@ -6668,6 +6848,17 @@ fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; }]; }; + leixb = { + email = "abone9999+nixpkgs@gmail.com"; + matrix = "@leix_b:matrix.org"; + github = "LeixB"; + githubId = 17183803; + name = "Aleix Boné"; + keys = [{ + longkeyid = "rsa4096/0xFC035BB2BB28E15D"; + fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; + }]; + }; lejonet = { email = "daniel@kuehn.se"; github = "lejonet"; @@ -6855,6 +7046,12 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + lunarequest = { + email = "nullarequest@vivlaid.net"; + github = "Lunarequest"; + githubId = 30698906; + name = "Luna D Dragon"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; @@ -7044,6 +7241,12 @@ githubId = 13791; name = "Luke Gorrie"; }; + luker = { + email = "luker@fenrirproject.org"; + github = "LucaFulchir"; + githubId = 2486026; + name = "Luca Fulchir"; + }; lumi = { email = "lumi@pew.im"; github = "lumi-me-not"; @@ -7061,6 +7264,12 @@ fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; }]; }; + lux = { + email = "lux@lux.name"; + githubId = 1208273; + matrix = "@lux:ontheblueplanet.com"; + name = "Lux"; + }; luz = { email = "luz666@daum.net"; github = "Luz"; @@ -7089,6 +7298,12 @@ email = "wheatdoge@gmail.com"; name = "Tim Liou"; }; + m00wl = { + name = "Moritz Lumme"; + email = "moritz.lumme@gmail.com"; + github = "m00wl"; + githubId = 46034439; + }; m1cr0man = { email = "lucas+nix@m1cr0man.com"; github = "m1cr0man"; @@ -7758,6 +7973,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milibopp = { + email = "contact@ebopp.de"; + github = "milibopp"; + githubId = 3098430; + name = "Emilia Bopp"; + }; millerjason = { email = "mailings-github@millerjason.com"; github = "millerjason"; @@ -8151,6 +8372,12 @@ githubId = 4996739; name = "Masayuki Takeda"; }; + mtesseract = { + email = "moritz@stackrox.com"; + github = "mtesseract"; + githubId = 11706080; + name = "Moritz Clasmeier"; + }; MtP = { email = "marko.nixos@poikonen.de"; github = "MtP76"; @@ -8380,10 +8607,16 @@ name = "Xinhao Luo"; }; newam = { - email = "alexmgit@protonmail.com"; + email = "alex@thinglab.org"; github = "newAM"; githubId = 7845120; - name = "Alex M."; + name = "Alex Martens"; + }; + nialov = { + email = "nikolasovaskainen@gmail.com"; + github = "nialov"; + githubId = 47318483; + name = "Nikolas Ovaskainen"; }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; @@ -8607,7 +8840,7 @@ }; noreferences = { email = "norkus@norkus.net"; - github = "noreferences"; + github = "jozuas"; githubId = 13085275; name = "Juozas Norkus"; }; @@ -8787,6 +9020,12 @@ githubId = 72201; name = "Ole Jørgen Brønner"; }; + ollieB = { + email = "1237862+oliverbunting@users.noreply.github.com"; + github = "oliverbunting"; + githubId = 1237862; + name = "Ollie Bunting"; + }; olynch = { email = "owen@olynch.me"; github = "olynch"; @@ -9430,6 +9669,12 @@ fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; + ppom = { + name = "Paco Pompeani"; + email = "paco@ecomail.io"; + github = "aopom"; + githubId = 38916722; + }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; @@ -9684,6 +9929,13 @@ githubId = 1016742; name = "Rafael García"; }; + raitobezarius = { + email = "ryan@lahfa.xyz"; + matrix = "@raitobezarius:matrix.org"; + github = "RaitoBezarius"; + githubId = 314564; + name = "Ryan Lahfa"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; @@ -9927,6 +10179,13 @@ githubId = 16779; name = "Rickard Nilsson"; }; + ricochet = { + email = "behayes2@gmail.com"; + github = "ricochet"; + githubId = 974323; + matrix = "@ricochetcode:matrix.org"; + name = "Bailey Hayes"; + }; riey = { email = "creeper844@gmail.com"; github = "Riey"; @@ -10395,14 +10654,20 @@ name = "Samuel Dionne-Riel"; }; samuelgrf = { - email = "git@samuelgrf.com"; + email = "s@muel.gr"; github = "samuelgrf"; githubId = 67663538; name = "Samuel Gräfenstein"; - keys = [{ - longkeyid = "rsa4096/0xEF76A063F15C63C8"; - fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; - }]; + keys = [ + { + longkeyid = "rsa4096/0xDE75F92E318123F0"; + fingerprint = "6F2E 2A90 423C 8111 BFF2 895E DE75 F92E 3181 23F0"; + } + { + longkeyid = "rsa4096/0xEF76A063F15C63C8"; + fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; + } + ]; }; samuelrivas = { email = "samuelrivas@gmail.com"; @@ -10688,6 +10953,16 @@ githubId = 6720672; name = "Shane Pearlman"; }; + shanesveller = { + email = "shane@sveller.dev"; + github = "shanesveller"; + githubId = 831; + keys = [{ + longkeyid = "rsa4096/0x9210C218023C15CD"; + fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD"; + }]; + name = "Shane Sveller"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "shawndellysse"; @@ -10801,7 +11076,7 @@ name = "Yann Hodique"; }; sikmir = { - email = "sikmir@gmail.com"; + email = "sikmir@disroot.org"; github = "sikmir"; githubId = 688044; name = "Nikolay Korotkiy"; @@ -10946,6 +11221,12 @@ fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; }]; }; + smasher164 = { + email = "aindurti@gmail.com"; + github = "smasher164"; + githubId = 12636891; + name = "Akhil Indurti"; + }; smironov = { email = "grrwlf@gmail.com"; github = "grwlf"; @@ -11002,6 +11283,13 @@ githubId = 26806; name = "Scott Olson"; }; + SomeoneSerge = { + email = "sergei.kozlukov@aalto.fi"; + matrix = "@ss:someonex.net"; + github = "SomeoneSerge"; + githubId = 9720532; + name = "Sergei K"; + }; sondr3 = { email = "nilsen.sondre@gmail.com"; github = "sondr3"; @@ -11128,6 +11416,12 @@ githubId = 7512804; name = "Martin Langlotz"; }; + steamwalker = { + email = "steamwalker@xs4all.nl"; + github = "steamwalker"; + githubId = 94006354; + name = "steamwalker"; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; @@ -11254,10 +11548,10 @@ name = "Justus K"; }; SubhrajyotiSen = { - email = "subhrajyoti12@gmail.com"; - github = "SubhrajyotiSen"; - githubId = 12984845; - name = "Subhrajyoti Sen"; + email = "subhrajyoti12@gmail.com"; + github = "SubhrajyotiSen"; + githubId = 12984845; + name = "Subhrajyoti Sen"; }; suhr = { email = "suhr@i2pmail.org"; @@ -11529,6 +11823,12 @@ githubId = 2389333; name = "Andy Tockman"; }; + techknowlogick = { + email = "techknowlogick@gitea.io"; + github = "techknowlogick"; + githubId = 164197; + name = "techknowlogick"; + }; Technical27 = { email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; @@ -11565,6 +11865,12 @@ githubId = 280235; name = "Terje Larsen"; }; + terrorjack = { + email = "astrohavoc@gmail.com"; + github = "TerrorJack"; + githubId = 3889585; + name = "Cheng Shao"; + }; tesq0 = { email = "mikolaj.galkowski@gmail.com"; github = "tesq0"; @@ -11602,6 +11908,12 @@ githubId = 378734; name = "TG ⊗ Θ"; }; + tgunnoe = { + email = "t@gvno.net"; + github = "tgunnoe"; + githubId = 7254833; + name = "Taylor Gunnoe"; + }; th0rgal = { email = "thomas.marchand@tuta.io"; github = "Th0rgal"; @@ -11760,6 +12072,13 @@ githubId = 1618946; name = "Tiago Castro"; }; + tilcreator = { + name = "TilCreator"; + email = "contact.nixos@tc-j.de"; + matrix = "@tilcreator:matrix.org"; + github = "TilCreator"; + githubId = 18621411; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; @@ -11851,6 +12170,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; + matrix = "@toastal:matrix.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -11993,6 +12313,12 @@ githubId = 1183303; name = "Jakob Klepp"; }; + trundle = { + name = "Andreas Stührk"; + email = "andy@hammerhartes.de"; + github = "Trundle"; + githubId = 332418; + }; tscholak = { email = "torsten.scholak@googlemail.com"; github = "tscholak"; @@ -12478,6 +12804,16 @@ githubId = 3889405; name = "vyp"; }; + wackbyte = { + name = "wackbyte"; + email = "wackbyte@pm.me"; + github = "wackbyte"; + githubId = 29505620; + keys = [{ + longkeyid = "rsa4096/0x937F2AE5CCEFBF59"; + fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; + }]; + }; wakira = { name = "Sheng Wang"; email = "sheng@a64.work"; @@ -12510,6 +12846,12 @@ email = "kirill.wedens@gmail.com"; name = "wedens"; }; + wegank = { + name = "Weijia Wang"; + email = "contact@weijia.wang"; + github = "wegank"; + githubId = 9713184; + }; weihua = { email = "luwh364@gmail.com"; github = "weihua-lu"; @@ -12570,6 +12912,12 @@ email = "tim.williams.public@gmail.com"; name = "Tim Philip Williams"; }; + willcohen = { + email = "willcohen@users.noreply.github.com"; + github = "willcohen"; + githubId = 5185341; + name = "Will Cohen"; + }; winden = { email = "windenntw@gmail.com"; name = "Antonio Vargas Gonzalez"; @@ -12816,6 +13164,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yana = { + email = "yana@riseup.net"; + github = "alpakido"; + githubId = 1643293; + name = "Yana Timoshenko"; + }; yarny = { email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; @@ -12835,12 +13189,6 @@ githubId = 73759599; name = "Lara A."; }; - yegortimoshenko = { - email = "yegortimoshenko@riseup.net"; - github = "yegortimoshenko"; - githubId = 1643293; - name = "Yegor Timoshenko"; - }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -13399,6 +13747,12 @@ github = "zeri42"; githubId = 68825133; }; + zombiezen = { + name = "Ross Light"; + email = "ross@zombiezen.com"; + github = "zombiezen"; + githubId = 181535; + }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; @@ -13433,4 +13787,27 @@ github = "jpagex"; githubId = 635768; }; + portothree = { + name = "Gustavo Porto"; + email = "gustavoporto@ya.ru"; + github = "portothree"; + githubId = 3718120; + }; + pwoelfel = { + name = "Philipp Woelfel"; + email = "philipp.woelfel@gmail.com"; + github = "PhilippWoelfel"; + githubId = 19400064; + }; + qbit = { + name = "Aaron Bieber"; + email = "aaron@bolddaemon.com"; + github = "qbit"; + githubId = 68368; + matrix = "@qbit:tapenet.org"; + keys = [{ + longkeyid = "rsa4096/0x1F81112D62A9ADCE"; + fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; + }]; + }; } diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix new file mode 100644 index 00000000000..12287896b50 --- /dev/null +++ b/maintainers/scripts/haskell/test-configurations.nix @@ -0,0 +1,136 @@ +/* Nix expression to test for regressions in the Haskell configuration overlays. + + test-configurations.nix determines all attributes touched by given Haskell + configuration overlays (i. e. pkgs/development/haskell-modules/configuration-*.nix) + and builds all derivations (or at least a reasonable subset) affected by + these overrides. + + By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can + invoke it like this: + + nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going + + It is possible to specify other configurations: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --arg files '[ "configuration-ghc-9.0.x.nix" "configuration-ghc-9.2.x.nix" ]' \ + --keep-going + + You can also just supply a single string: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --argstr files "configuration-arm.nix" --keep-going + + You can even supply full paths which is handy, as it allows for tab-completing + the configurations: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --argstr files pkgs/development/haskell-modules/configuration-arm.nix \ + --keep-going + + By default, derivation that fail to evaluate are skipped, unless they are + “just” marked as broken. You can check for other eval errors like this: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --arg skipEvalErrors false --keep-going + + You can also disable checking broken packages by passing a nixpkgs config: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --arg config '{ allowBroken = false; }' --keep-going + + By default the haskell.packages.ghc*Binary sets used for bootstrapping GHC + are _not_ tested. You can change this using: + + nix-build maintainers/scripts/haskell/test-configurations.nix \ + --arg skipBinaryGHCs false --keep-going + +*/ +{ files ? [ + "configuration-common.nix" + "configuration-nix.nix" + "configuration-ghc-8.10.x.nix" + ] +, nixpkgsPath ? ../../.. +, config ? { allowBroken = true; } +, skipEvalErrors ? true +, skipBinaryGHCs ? true +}: + +let + pkgs = import nixpkgsPath { inherit config; }; + inherit (pkgs) lib; + + # see usage explanation for the input format `files` allows + files' = builtins.map builtins.baseNameOf ( + if !builtins.isList files then [ files ] else files + ); + + setsForFile = fileName: + let + # extract the unique part of the config's file name + configName = builtins.head ( + builtins.match "configuration-(.+).nix" fileName + ); + # match the major and minor version of the GHC the config is intended for, if any + configVersion = lib.concatStrings ( + builtins.match "ghc-([0-9]+).([0-9]+).x" configName + ); + # return all package sets under haskell.packages matching the version components + setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) ( + builtins.filter (setName: + lib.hasPrefix "ghc${configVersion}" setName + && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName)) + ) ( + builtins.attrNames pkgs.haskell.packages + ) + ); + + defaultSets = [ pkgs.haskellPackages ]; + in { + # use plain haskellPackages for the version-agnostic files + # TODO(@sternenseemann): also consider currently selected versioned sets + "common" = defaultSets; + "nix" = defaultSets; + "arm" = defaultSets; + "darwin" = defaultSets; + }.${configName} or setsForVersion; + + # attribute set that has all the attributes of haskellPackages set to null + availableHaskellPackages = builtins.listToAttrs ( + builtins.map (attr: lib.nameValuePair attr null) ( + builtins.attrNames pkgs.haskellPackages + ) + ); + + # evaluate a configuration and only return the attributes changed by it, + # pass availableHaskellPackages as super in case intersectAttrs is used + overriddenAttrs = fileName: builtins.attrNames ( + lib.fix (self: + import (nixpkgsPath + "/pkgs/development/haskell-modules/${fileName}") { + haskellLib = pkgs.haskell.lib.compose; + inherit pkgs; + } self availableHaskellPackages + ) + ); + + # list of derivations that are affected by overrides in the given configuration + # overlays. For common, nix, darwin etc. only the derivation from the default + # package set will be emitted. + packages = builtins.filter (v: + lib.warnIf (v.meta.broken or false) "${v.pname} is marked as broken" ( + v != null + && (skipEvalErrors -> (builtins.tryEval (v.outPath or v)).success) + ) + ) ( + lib.concatMap (fileName: + let + sets = setsForFile fileName; + attrs = overriddenAttrs fileName; + in + lib.concatMap (set: builtins.map (attr: set.${attr}) attrs) sets + ) files' + ); +in + +packages diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index f19cd8638e2..de85b88da3f 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -81,29 +81,71 @@ def make_request(url: str) -> urllib.request.Request: headers["Authorization"] = f"token {token}" return urllib.request.Request(url, headers=headers) -@dataclass -class PluginDesc: - owner: str - repo: str - branch: str - alias: Optional[str] - - class Repo: def __init__( - self, owner: str, name: str, branch: str, alias: Optional[str] + self, uri: str, branch: str, alias: Optional[str] ) -> None: - self.owner = owner - self.name = name + self.uri = uri + '''Url to the repo''' self.branch = branch self.alias = alias self.redirect: Dict[str, str] = {} - def url(self, path: str) -> str: - return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) + @property + def name(self): + return self.uri.split('/')[-1] def __repr__(self) -> str: - return f"Repo({self.owner}, {self.name})" + return f"Repo({self.name}, {self.uri})" + + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def has_submodules(self) -> bool: + return True + + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) + def latest_commit(self) -> Tuple[str, datetime]: + loaded = self._prefetch(None) + updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z") + + return loaded['rev'], updated + + def _prefetch(self, ref: Optional[str]): + cmd = ["nix-prefetch-git", "--quiet", "--fetch-submodules", self.uri] + if ref is not None: + cmd.append(ref) + log.debug(cmd) + data = subprocess.check_output(cmd) + loaded = json.loads(data) + return loaded + + def prefetch(self, ref: Optional[str]) -> str: + loaded = self._prefetch(ref) + return loaded["sha256"] + + def as_nix(self, plugin: "Plugin") -> str: + return f'''fetchgit {{ + url = "{self.uri}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}"; + }}''' + + +class RepoGitHub(Repo): + def __init__( + self, owner: str, repo: str, branch: str, alias: Optional[str] + ) -> None: + self.owner = owner + self.repo = repo + '''Url to the repo''' + super().__init__(self.url(""), branch, alias) + log.debug("Instantiating github repo %s/%s", self.owner, self.repo) + + @property + def name(self): + return self.repo + + def url(self, path: str) -> str: + return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: @@ -122,7 +164,7 @@ class Repo: commit_url = self.url(f"commits/{self.branch}.atom") commit_req = make_request(commit_url) with urllib.request.urlopen(commit_req, timeout=10) as req: - self.check_for_redirect(commit_url, req) + self._check_for_redirect(commit_url, req) xml = req.read() root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) @@ -137,7 +179,7 @@ class Repo: updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") return Path(str(url.path)).name, updated - def check_for_redirect(self, url: str, req: http.client.HTTPResponse): + def _check_for_redirect(self, url: str, req: http.client.HTTPResponse): response_url = req.geturl() if url != response_url: new_owner, new_name = ( @@ -150,11 +192,13 @@ class Repo: new_plugin = plugin_line.format(owner=new_owner, name=new_name) self.redirect[old_plugin] = new_plugin - def prefetch_git(self, ref: str) -> str: - data = subprocess.check_output( - ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] - ) - return json.loads(data)["sha256"] + + def prefetch(self, commit: str) -> str: + if self.has_submodules(): + sha256 = super().prefetch(commit) + else: + sha256 = self.prefetch_github(commit) + return sha256 def prefetch_github(self, ref: str) -> str: data = subprocess.check_output( @@ -162,6 +206,33 @@ class Repo: ) return data.strip().decode("utf-8") + def as_nix(self, plugin: "Plugin") -> str: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + return f'''fetchFromGitHub {{ + owner = "{self.owner}"; + repo = "{self.repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}''' + + +@dataclass +class PluginDesc: + repo: Repo + branch: str + alias: Optional[str] + + @property + def name(self): + if self.alias is None: + return self.repo.name + else: + return self.alias + class Plugin: def __init__( @@ -193,6 +264,7 @@ class Plugin: return copy + class Editor: """The configuration of the update script.""" @@ -241,9 +313,9 @@ class Editor: def create_parser(self): parser = argparse.ArgumentParser( - description=( - f"Updates nix derivations for {self.name} plugins" - f"By default from {self.default_in} to {self.default_out}" + description=(f""" + Updates nix derivations for {self.name} plugins.\n + By default from {self.default_in} to {self.default_out}""" ) ) parser.add_argument( @@ -273,7 +345,7 @@ class Editor: dest="proc", type=int, default=30, - help="Number of concurrent processes to spawn.", + help="Number of concurrent processes to spawn. Export GITHUB_API_TOKEN allows higher values.", ) parser.add_argument( "--no-commit", "-n", action="store_true", default=False, @@ -305,7 +377,7 @@ class CleanEnvironment(object): def get_current_plugins(editor: Editor) -> List[Plugin]: with CleanEnvironment(): - cmd = ["nix", "eval", "--impure", "--json", "--expr", editor.get_plugins] + cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins] log.debug("Running command %s", cmd) out = subprocess.check_output(cmd) data = json.loads(out) @@ -320,26 +392,24 @@ def prefetch_plugin( p: PluginDesc, cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: - user, repo_name, branch, alias = p.owner, p.repo, p.branch, p.alias - log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}") - repo = Repo(user, repo_name, branch, alias) + repo, branch, alias = p.repo, p.branch, p.alias + name = alias or p.repo.name + commit = None + log.info(f"Fetching last commit for plugin {name} from {repo.uri}@{branch}") commit, date = repo.latest_commit() - has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cache else None if cached_plugin is not None: log.debug("Cache hit !") - cached_plugin.name = alias or repo_name + cached_plugin.name = name cached_plugin.date = date return cached_plugin, repo.redirect - print(f"prefetch {user}/{repo_name}") - if has_submodules: - sha256 = repo.prefetch_git(commit) - else: - sha256 = repo.prefetch_github(commit) + has_submodules = repo.has_submodules() + print(f"prefetch {name}") + sha256 = repo.prefetch(commit) return ( - Plugin(alias or repo_name, commit, has_submodules, sha256, date=date), + Plugin(name, commit, has_submodules, sha256, date=date), repo.redirect, ) @@ -360,16 +430,17 @@ def print_download_error(plugin: str, ex: Exception): def check_results( - results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]] -) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]: + results: List[Tuple[PluginDesc, Union[Exception, Plugin], Dict[str, str]]] +) -> Tuple[List[Tuple[PluginDesc, Plugin]], Dict[str, str]]: + ''' ''' failures: List[Tuple[str, Exception]] = [] plugins = [] redirects: Dict[str, str] = {} - for (owner, name, result, redirect) in results: + for (pdesc, result, redirect) in results: if isinstance(result, Exception): - failures.append((name, result)) + failures.append((pdesc.name, result)) else: - plugins.append((owner, name, result)) + plugins.append((pdesc, result)) redirects.update(redirect) print(f"{len(results) - len(failures)} plugins were checked", end="") @@ -384,28 +455,38 @@ def check_results( sys.exit(1) +def make_repo(uri, branch, alias) -> Repo: + '''Instantiate a Repo with the correct specialization depending on server (gitub spec)''' + # dumb check to see if it's of the form owner/repo (=> github) or https://... + res = uri.split('/') + if len(res) <= 2: + repo = RepoGitHub(res[0], res[1], branch, alias) + else: + repo = Repo(uri.strip(), branch, alias) + return repo + def parse_plugin_line(line: str) -> PluginDesc: branch = "HEAD" alias = None - name, repo = line.split("/") - if " as " in repo: - repo, alias = repo.split(" as ") + uri = line + if " as " in uri: + uri, alias = uri.split(" as ") alias = alias.strip() - if "@" in repo: - repo, branch = repo.split("@") + if "@" in uri: + uri, branch = uri.split("@") + + repo = make_repo(uri.strip(), branch.strip(), alias) - return PluginDesc(name.strip(), repo.strip(), branch.strip(), alias) + return PluginDesc(repo, branch.strip(), alias) def load_plugin_spec(plugin_file: str) -> List[PluginDesc]: plugins = [] with open(plugin_file) as f: for line in f: + if line.startswith("#"): + continue plugin = parse_plugin_line(line) - if not plugin.owner: - msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" - print(msg, file=sys.stderr) - sys.exit(1) plugins.append(plugin) return plugins @@ -465,14 +546,13 @@ class Cache: def prefetch( pluginDesc: PluginDesc, cache: Cache -) -> Tuple[str, str, Union[Exception, Plugin], dict]: - owner, repo = pluginDesc.owner, pluginDesc.repo +) -> Tuple[PluginDesc, Union[Exception, Plugin], dict]: try: plugin, redirect = prefetch_plugin(pluginDesc, cache) cache[plugin.commit] = plugin - return (owner, repo, plugin, redirect) + return (pluginDesc, plugin, redirect) except Exception as e: - return (owner, repo, e, {}) + return (pluginDesc, e, {}) def rewrite_input( diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0743c80ec4f..361be88045f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -166,6 +166,17 @@ with lib.maintainers; { scope = "Maintain Jitsi."; }; + kubernetes = { + members = [ + johanot + offline + saschagrunert + srhb + zowoq + ]; + scope = "Maintain the Kubernetes package and module"; + }; + kodi = { members = [ aanderse @@ -229,6 +240,7 @@ with lib.maintainers; { php = { members = [ aanderse + drupol etu globin ma27 |