diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 724 | ||||
| -rwxr-xr-x | maintainers/scripts/check-maintainer-github-handles.sh | 18 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/test-configurations.nix | 136 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 6 | ||||
| -rwxr-xr-x | maintainers/scripts/vanity.sh | 38 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 31 |
7 files changed, 862 insertions, 93 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e73ee17d78688..1cf7513d65e83 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"; @@ -278,6 +290,12 @@ githubId = 1250775; name = "Adolfo E. García Castro"; }; + AdsonCicilioti = { + name = "Adson Cicilioti"; + email = "adson.cicilioti@live.com"; + github = "AdsonCicilioti"; + githubId = 6278398; + }; adsr = { email = "as@php.net"; github = "adsr"; @@ -351,10 +369,10 @@ name = "AmirHossein Roozbahani"; }; ahuzik = { - email = "ales.guzik@gmail.com"; - github = "alesguzik"; + email = "ah1990au@gmail.com"; + github = "alesya-h"; githubId = 209175; - name = "Ales Huzik"; + name = "Alesya Huzik"; }; aij = { email = "aij+git@mrph.org"; @@ -603,6 +621,12 @@ fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; }]; }; + amfl = { + email = "amfl@none.none"; + github = "amfl"; + githubId = 382798; + name = "amfl"; + }; amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; @@ -928,6 +952,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"; @@ -1152,6 +1182,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"; @@ -1402,6 +1443,12 @@ githubId = 251106; name = "Daniel Bergey"; }; + bergkvist = { + email = "tobias@bergkv.ist"; + github = "bergkvist"; + githubId = 410028; + name = "Tobias Bergkvist"; + }; betaboon = { email = "betaboon@0x80.ninja"; github = "betaboon"; @@ -1558,6 +1605,16 @@ githubId = 87764; name = "Ben Ford"; }; + boppyt = { + email = "boppy@nwcpz.com"; + github = "boppyt"; + githubId = 71049646; + name = "Zack A"; + keys = [{ + longkeyid = "rsa4096/0x6310C97DE31D1545"; + fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545"; + }]; + }; borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; @@ -1662,6 +1719,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"; @@ -1837,6 +1900,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"; @@ -1880,6 +1950,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"; @@ -2030,12 +2106,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"; @@ -2076,6 +2146,17 @@ githubId = 12386805; name = "Chua Hou"; }; + chuangzhu = { + name = "Chuang Zhu"; + email = "chuang@melty.land"; + matrix = "@chuangzhu:matrix.org"; + github = "chuangzhu"; + githubId = 31200881; + keys = [{ + longkeyid = "rsa4096/E838CED81CFFD3F9"; + fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; + }]; + }; chvp = { email = "nixpkgs@cvpetegem.be"; matrix = "@charlotte:vanpetegem.me"; @@ -2089,6 +2170,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"; @@ -2340,6 +2427,12 @@ githubId = 12202789; name = "CrazedProgrammer"; }; + creator54 = { + email = "hi.creator54@gmail.com"; + github = "creator54"; + githubId = 34543609; + name = "creator54"; + }; cript0nauta = { email = "shareman1204@gmail.com"; github = "cript0nauta"; @@ -2531,12 +2624,30 @@ githubId = 1298344; name = "Daniel Fullmer"; }; + danth = { + name = "Daniel Thwaites"; + email = "danthwaites30@btinternet.com"; + matrix = "@danth:matrix.org"; + github = "danth"; + githubId = 28959268; + keys = [{ + longkeyid = "rsa3072/0xD8AFC4BF05670F9D"; + fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; + }]; + }; dan4ik605743 = { email = "6057430gu@gmail.com"; github = "dan4ik605743"; githubId = 86075850; name = "Danil Danevich"; }; + darkonion0 = { + name = "Alexandre Peruggia"; + email = "darkgenius1@protonmail.com"; + matrix = "@alexoo:matrix.org"; + github = "DarkOnion0"; + githubId = 68606322; + }; das-g = { email = "nixpkgs@raphael.dasgupta.ch"; github = "das-g"; @@ -2570,6 +2681,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"; @@ -2595,6 +2712,12 @@ githubId = 91113; name = "David Kleuker"; }; + davidarmstronglewis = { + email = "davidlewis@mac.com"; + github = "davidarmstronglewis"; + githubId = 6754950; + name = "David Armstrong Lewis"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; @@ -2701,6 +2824,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"; @@ -2731,6 +2860,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"; @@ -2797,6 +2932,12 @@ githubId = 2439413; name = "Derek Gonyeo"; }; + dguenther = { + email = "dguenther9@gmail.com"; + github = "dguenther"; + githubId = 767083; + name = "Derek Guenther"; + }; dhkl = { email = "david@davidslab.com"; github = "dhl"; @@ -3032,6 +3173,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"; @@ -3043,6 +3194,18 @@ fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; }]; }; + drzoidberg = { + email = "jakob@mast3rsoft.com"; + github = "jakobneufeld"; + 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"; @@ -3193,12 +3356,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"; @@ -3290,6 +3447,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"; @@ -3302,6 +3465,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"; @@ -3400,9 +3569,9 @@ githubId = 5493775; name = "Ente"; }; - enzime = { + Enzime = { email = "enzime@users.noreply.github.com"; - github = "enzime"; + github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; }; @@ -3614,6 +3783,7 @@ }; evils = { email = "evils.devils@protonmail.com"; + matrix = "@evils:nixos.dev"; github = "evils"; githubId = 30512529; name = "Evils"; @@ -3654,6 +3824,10 @@ github = "expipiplus1"; githubId = 857308; name = "Ellie Hermaszewska"; + keys = [{ + longkeyid = "rsa4096/0xC8116E3A0C1CA76A"; + fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; + }]; }; extends = { email = "sharosari@gmail.com"; @@ -3863,6 +4037,12 @@ githubId = 183879; name = "Florian Klink"; }; + florentc = { + email = "florentc@users.noreply.github.com"; + github = "florentc"; + githubId = 1149048; + name = "Florent Ch."; + }; FlorianFranzen = { email = "Florian.Franzen@gmail.com"; github = "FlorianFranzen"; @@ -3954,12 +4134,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"; @@ -4082,6 +4256,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"; @@ -4142,6 +4326,16 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genofire = { + name = "genofire"; + email = "geno+dev@fireorbit.de"; + github = "genofire"; + githubId = 6905586; + keys = [{ + longkeyid = "rsa4096/0xFC83907C125BC2BC"; + fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; + }]; + }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; @@ -4271,6 +4465,16 @@ githubId = 1621335; name = "Andrew Trachenko"; }; + gordias = { + name = "Gordias"; + email = "gordias@disroot.org"; + github = "NotGordias"; + 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"; @@ -4612,6 +4816,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"; @@ -4682,6 +4892,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hollowman6 = { + email = "hollowman@hollowman.ml"; + github = "HollowMan6"; + githubId = 43995067; + name = "Songlin Jiang"; + }; holymonson = { email = "holymonson@gmail.com"; github = "holymonson"; @@ -4761,6 +4977,16 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + hyshka = { + name = "Bryan Hyshka"; + email = "bryan@hyshka.com"; + github = "hyshka"; + githubId = 2090758; + keys = [{ + longkeyid = "rsa2048/0xDB2D93D1BFAAA6EA"; + fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; + }]; + }; hyzual = { email = "hyzual@gmail.com"; github = "Hyzual"; @@ -4943,6 +5169,12 @@ githubId = 4085046; name = "Imuli"; }; + ineol = { + email = "leo.stefanesco@gmail.com"; + github = "ineol"; + githubId = 37965; + name = "Léo Stefanesco"; + }; infinisil = { email = "contact@infinisil.com"; matrix = "@infinisil:matrix.org"; @@ -4987,6 +5219,13 @@ fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; }]; }; + ius = { + email = "j.de.gram@gmail.com"; + name = "Joerie de Gram"; + matrix = "@ius:nltrix.net"; + github = "ius"; + githubId = 529626; + }; ivan = { email = "ivan@ludios.org"; github = "ivan"; @@ -5020,7 +5259,7 @@ }]; }; ivankovnatsky = { - email = "ikovnatsky@protonmail.ch"; + email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -5204,12 +5443,28 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jceb = { + name = "jceb"; + email = "jceb@e-jc.de"; + github = "jceb"; + githubId = 101593; + }; jchw = { email = "johnwchadwick@gmail.com"; github = "jchv"; githubId = 938744; name = "John Chadwick"; }; + jcouyang = { + email = "oyanglulu@gmail.com"; + github = "jcouyang"; + githubId = 1235045; + name = "Jichao Ouyang"; + keys = [{ + longkeyid = "rsa2048/0xDA8B833B52604E63"; + fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; + }]; + }; jcumming = { email = "jack@mudshark.org"; github = "jcumming"; @@ -5734,6 +5989,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"; @@ -5832,6 +6093,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"; @@ -5883,6 +6151,12 @@ githubId = 3831860; name = "Arnold Krille"; }; + kanashimia = { + email = "chad@redpilled.dev"; + github = "kanashimia"; + githubId = 56224949; + name = "Mia Kanashi"; + }; karantan = { name = "Gasper Vozel"; email = "karantan@gmail.com"; @@ -6095,6 +6369,12 @@ email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; }; + klden = { + name = "Kenzyme Le"; + email = "kl@kenzymele.com"; + github = "klDen"; + githubId = 5478260; + }; klntsky = { email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; @@ -6126,7 +6406,7 @@ }; kmein = { - email = "kieran.meinhardt@gmail.com"; + email = "kmein@posteo.de"; name = "Kierán Meinhardt"; github = "kmein"; githubId = 10352507; @@ -6179,6 +6459,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"; @@ -6293,6 +6579,13 @@ githubId = 449813; name = "Roman Kuznetsov"; }; + kvark = { + name = "Dzmitry Malyshau"; + email = "kvark@fastmail.com"; + matrix = "@kvark:matrix.org"; + github = "kvark"; + githubId = 107301; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; @@ -6355,6 +6648,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"; @@ -6484,12 +6783,16 @@ githubId = 4158274; name = "Michiel Leenaars"; }; - legendofmiracles = { + lom = { email = "legendofmiracles@protonmail.com"; matrix = "@legendofmiracles:matrix.org"; github = "legendofmiracles"; githubId = 30902201; name = "legendofmiracles"; + keys = [{ + longkeyid = "rsa4096/0x19B082B3DEFE5451"; + fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; + }]; }; lejonet = { email = "daniel@kuehn.se"; @@ -6666,6 +6969,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenzleutgeb = { + email = "lorenz@leutgeb.xyz"; + github = "lorenzleutgeb"; + githubId = 542154; + name = "Lorenz Leutgeb"; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; @@ -6884,6 +7193,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"; @@ -6947,6 +7262,12 @@ githubId = 109141; name = "Georges Dubus"; }; + Madouura = { + email = "madouura@gmail.com"; + github = "Madouura"; + githubId = 93990818; + name = "Madoura"; + }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; @@ -7085,6 +7406,12 @@ githubId = 623509; name = "Martijn Vermaat"; }; + martinetd = { + email = "f.ktfhrvnznqxacf@noclue.notk.org"; + github = "martinetd"; + githubId = 1729331; + name = "Dominique Martinet"; + }; martingms = { email = "martin@mg.am"; github = "martingms"; @@ -7196,6 +7523,16 @@ githubId = 95194; name = "Mauricio Scheffer"; }; + max-niederman = { + email = "max@maxniederman.com"; + github = "max-niederman"; + githubId = 19580458; + name = "Max Niederman"; + keys = [{ + longkeyid = "rsa3072/0x9AED881481D8444E"; + fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; + }]; + }; maxdamantus = { email = "maxdamantus@gmail.com"; github = "Maxdamantus"; @@ -7496,6 +7833,12 @@ githubId = 21156022; name = "Michal Minář"; }; + michzappa = { + email = "me@michzappa.com"; + github = "michzappa"; + githubId = 59343378; + name = "Michael Zappa"; + }; mickours = { email = "mickours@gmail.com<"; github = "mickours"; @@ -7541,12 +7884,24 @@ fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; }]; }; + milahu = { + email = "milahu@gmail.com"; + github = "milahu"; + githubId = 12958815; + name = "Milan Hauth"; + }; milesbreslin = { email = "milesbreslin@gmail.com"; github = "milesbreslin"; 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"; @@ -7784,6 +8139,12 @@ githubId = 99988; name = "Maarten Hoogendoorn"; }; + MoritzBoehme = { + email = "mail@moritzboeh.me"; + github = "MoritzBoehme"; + githubId = 42215704; + name = "Moritz Böhme"; + }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; @@ -7934,6 +8295,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"; @@ -8069,6 +8436,17 @@ githubId = 56316606; name = "Amneesh Singh"; }; + nazarewk = { + name = "Krzysztof Nazarewski"; + email = "3494992+nazarewk@users.noreply.github.com"; + matrix = "@nazarewk:matrix.org"; + github = "nazarewk"; + githubId = 3494992; + keys = [{ + longkeyid = "rsa4096/0x916D8B67241892AE"; + fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; + }]; + }; nbren12 = { email = "nbren12@gmail.com"; github = "nbren12"; @@ -8152,10 +8530,10 @@ name = "Xinhao Luo"; }; newam = { - email = "alexmgit@protonmail.com"; + email = "alex@thinglab.org"; github = "newAM"; githubId = 7845120; - name = "Alex M."; + name = "Alex Martens"; }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; @@ -8322,6 +8700,12 @@ githubId = 7588406; name = "Andrew R. M."; }; + nkalupahana = { + email = "hello@nisa.la"; + github = "nkalupahana"; + githubId = 7347290; + name = "Nisala Kalupahana"; + }; nloomans = { email = "noah@nixos.noahloomans.com"; github = "nloomans"; @@ -8373,7 +8757,7 @@ }; noreferences = { email = "norkus@norkus.net"; - github = "noreferences"; + github = "jozuas"; githubId = 13085275; name = "Juozas Norkus"; }; @@ -8553,6 +8937,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"; @@ -8625,6 +9015,12 @@ githubId = 101514; name = "Orivej Desh"; }; + ornxka = { + email = "ornxka@littledevil.sh"; + github = "ornxka"; + githubId = 52086525; + name = "ornxka"; + }; oro = { email = "marco@orovecchia.at"; github = "oro"; @@ -8784,7 +9180,7 @@ name = "pasqui23"; }; patryk27 = { - email = "wychowaniec.patryk@gmail.com"; + email = "pwychowaniec@pm.me"; github = "Patryk27"; githubId = 3395477; name = "Patryk Wychowaniec"; @@ -8811,6 +9207,12 @@ githubId = 116740; name = "Paweł Pacana"; }; + pb- = { + email = "pbaecher@gmail.com"; + github = "pb-"; + githubId = 84886; + name = "Paul Baecher"; + }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; @@ -8835,12 +9237,6 @@ githubId = 8641; name = "Pierre Carrier"; }; - pengmeiyu = { - email = "pengmyu@gmail.com"; - github = "pmeiyu"; - githubId = 8529551; - name = "Peng Mei Yu"; - }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; @@ -8951,12 +9347,6 @@ githubId = 301903; name = "Chip Collier"; }; - phreedom = { - email = "phreedom@yandex.ru"; - github = "phreedom"; - githubId = 62577; - name = "Evgeny Egorochkin"; - }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; @@ -9116,6 +9506,12 @@ githubId = 178496; name = "Philipp Middendorf"; }; + pmy = { + email = "pmy@xqzp.net"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; @@ -9190,6 +9586,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"; @@ -9444,6 +9846,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"; @@ -9617,6 +10026,16 @@ githubId = 500703; name = "Tadas Barzdžius"; }; + revol-xut = { + email = "revol-xut@protonmail.com"; + name = "Tassilo Tanneberger"; + github = "revol-xut"; + githubId = 32239737; + keys = [{ + longkeyid = "rsa4096/B966009D57E69CC6"; + fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; + }]; + }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; @@ -9677,6 +10096,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"; @@ -9695,6 +10121,12 @@ githubId = 37246692; name = "Riley Inman"; }; + riotbib = { + email = "github-nix@lnrt.de"; + github = "riotbib"; + githubId = 43172581; + name = "Lennart Mühlenmeier"; + }; ris = { email = "code@humanleg.org.uk"; github = "risicle"; @@ -9718,12 +10150,6 @@ } ]; }; - rittelle = { - email = "rittelle@posteo.de"; - github = "rittelle"; - githubId = 33598633; - name = "Lennart Rittel"; - }; rixed = { email = "rixed-github@happyleptic.org"; github = "rixed"; @@ -9908,6 +10334,12 @@ githubId = 592876; name = "Robert W. Pearce"; }; + rprecenth = { + email = "rasmus@precenth.eu"; + github = "Prillan"; + githubId = 1675190; + name = "Rasmus Précenth"; + }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; @@ -10074,6 +10506,17 @@ github = "s1341"; githubId = 5682183; }; + sagikazarmark = { + name = "Mark Sagi-Kazar"; + email = "mark.sagikazar@gmail.com"; + matrix = "@mark.sagikazar:matrix.org"; + github = "sagikazarmark"; + githubId = 1226384; + keys = [{ + longkeyid = "rsa4096/0xF251ADDC9D041C7E"; + fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; + }]; + }; samalws = { email = "sam@samalws.com"; name = "Sam Alws"; @@ -10191,6 +10634,12 @@ githubId = 720864; name = "Sébastien Bourdeauducq"; }; + sbellem = { + email = "sbellem@gmail.com"; + github = "sbellem"; + githubId = 125458; + name = "Sylvain Bellemare"; + }; sbond75 = { name = "sbond75"; email = "43617712+sbond75@users.noreply.github.com"; @@ -10415,6 +10864,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"; @@ -10451,6 +10910,12 @@ githubId = 251028; name = "Shell Turner"; }; + shikanime = { + name = "William Phetsinorath"; + email = "deva.shikanime@protonmail.com"; + github = "shikanime"; + githubId = 22115108; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -10667,6 +11132,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"; @@ -10723,6 +11194,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"; @@ -10849,6 +11327,12 @@ githubId = 7512804; name = "Martin Langlotz"; }; + steamwalker = { + email = "steamwalker@xs4all.nl"; + github = "steamwalker"; + githubId = 94006354; + name = "steamwalker"; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; @@ -11154,6 +11638,16 @@ githubId = 321799; name = "Paul Colomiets"; }; + taikx4 = { + email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion"; + github = "taikx4"; + githubId = 94917129; + name = "taikx4"; + keys = [{ + longkeyid = "ed25519/0xCCD52C7B37BB837E"; + fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; + }]; + }; takagiy = { email = "takagiy.4dev@gmail.com"; github = "takagiy"; @@ -11240,6 +11734,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"; @@ -11276,6 +11776,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"; @@ -11471,6 +11977,13 @@ githubId = 1618946; name = "Tiago Castro"; }; + tilcreator = { + name = "Tilman Jackel"; + email = "contact.nixos@tc-j.de"; + matrix = "@tilcreator:matrix.org"; + github = "TilCreator"; + githubId = 18621411; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; @@ -11535,6 +12048,12 @@ fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; }]; }; + tmarkovski = { + email = "tmarkovski@gmail.com"; + github = "tmarkovski"; + githubId = 1280118; + name = "Tomislav Markovski"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -11698,12 +12217,24 @@ 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"; githubId = 1568873; name = "Torsten Scholak"; }; + tshaynik = { + email = "tshaynik@protonmail.com"; + github = "tshaynik"; + githubId = 15064765; + name = "tshaynik"; + }; tstrobel = { email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; name = "Thomas Strobel"; @@ -11830,6 +12361,12 @@ githubId = 122319; name = "Renato Alves"; }; + unrooted = { + name = "Konrad Klawikowski"; + email = "konrad.root.klawikowski@gmail.com"; + github = "unrooted"; + githubId = 30440603; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -12263,6 +12800,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"; @@ -12273,12 +12816,18 @@ githubId = 6016963; name = "Patrick Winter"; }; - winterqt = { + winter = { email = "nixos@winter.cafe"; github = "winterqt"; githubId = 78392041; name = "Winter"; }; + wintrmvte = { + name = "Jakub Lutczyn"; + email = "kubalutczyn@gmail.com"; + github = "wintrmvte"; + githubId = 41823252; + }; wirew0rm = { email = "alex@wirew0rm.de"; github = "wirew0rm"; @@ -12357,6 +12906,12 @@ githubId = 28888242; name = "WORLDofPEACE"; }; + wr0belj = { + name = "Jakub Wróbel"; + email = "wrobel.jakub@protonmail.com"; + github = "wr0belj"; + githubId = 40501814; + }; wscott = { email = "wsc9tt@gmail.com"; github = "wscott"; @@ -12497,6 +13052,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"; @@ -12516,12 +13077,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"; @@ -12534,6 +13089,12 @@ githubId = 11229748; name = "Lin Yinfeng"; }; + ylecornec = { + email = "yves.stan.lecornec@tweag.io"; + github = "ylecornec"; + githubId = 5978566; + name = "Yves-Stan Le Cornec"; + }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; @@ -12756,12 +13317,6 @@ githubId = 1772064; name = "Tim Zook"; }; - zoomulator = { - email = "zoomulator@gmail.com"; - github = "zoomulator"; - githubId = 1069303; - name = "Kim Simmons"; - }; zopieux = { email = "zopieux@gmail.com"; github = "zopieux"; @@ -13080,6 +13635,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"; @@ -13096,4 +13657,45 @@ github = "zupo"; githubId = 311580; }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; + vdot0x23 = { + name = "Victor Büttner"; + email = "nix.victor@0x23.dk"; + github = "vdot0x23"; + githubId = 40716069; + }; + jpagex = { + name = "Jérémy Pagé"; + email = "contact@jeremypage.me"; + 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/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh index 879a2e452cb33..a5555ca9e909e 100755 --- a/maintainers/scripts/check-maintainer-github-handles.sh +++ b/maintainers/scripts/check-maintainer-github-handles.sh @@ -4,20 +4,19 @@ # Example how to work with the `lib.maintainers` attrset. # Can be used to check whether all user handles are still valid. -set -e - -# nixpkgs='<nixpkgs>' -# if [ -n "$1" ]; then +set -o errexit -o noclobber -o nounset -o pipefail +shopt -s failglob inherit_errexit function checkCommits { - local user="$1" - local tmp=$(mktemp) + local ret status tmp user + user="$1" + tmp=$(mktemp) curl --silent -w "%{http_code}" \ "https://github.com/NixOS/nixpkgs/commits?author=$user" \ > "$tmp" # the last line of tmp contains the http status - local status=$(tail -n1 "$tmp") - local ret= + status=$(tail -n1 "$tmp") + ret= case $status in 200) if <"$tmp" grep -i "no commits found" > /dev/null; then ret=1 @@ -31,7 +30,7 @@ function checkCommits { checkCommits "$user" ret=$? ;; - *) printf "BAD STATUS: $(tail -n1 $tmp) for %s\n" "$user"; ret=1 + *) printf "BAD STATUS: $(tail -n1 "$tmp") for %s\n" "$user"; ret=1 ret=1 ;; esac @@ -63,4 +62,5 @@ nix-instantiate -A lib.maintainers --eval --strict --json \ | jq -r '.[]|.github|select(.)' \ | parallel -j5 checkUser +# To check some arbitrary users: # parallel -j100 checkUser ::: "eelco" "profpatsch" "Profpatsch" "a" diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix new file mode 100644 index 0000000000000..12287896b50df --- /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/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d4a5f83d011b8..23303d22c471a 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -73,7 +73,7 @@ lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, mpack,,,,,, -moonscript,,,,,,arobyn +moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 2a9a2d4c0a23d..af0376213a395 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -305,7 +305,7 @@ class CleanEnvironment(object): def get_current_plugins(editor: Editor) -> List[Plugin]: with CleanEnvironment(): - cmd = ["nix", "eval", "--json", 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) @@ -385,7 +385,7 @@ def check_results( sys.exit(1) def parse_plugin_line(line: str) -> PluginDesc: - branch = "master" + branch = "HEAD" alias = None name, repo = line.split("/") if " as " in repo: @@ -401,6 +401,8 @@ 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]" diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index aa7d4ec967daf..b879488165dfa 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -30,7 +30,7 @@ fetchGithubName () { curl https://github.com/NixOS/nixpkgs/commit/"$commitid" 2>/dev/null | grep committed -B10 | grep 'href="/' | sed -re 's@.* href="/@@; s@".*@@' | - grep -v "/commit/" + grep -v "/commit/" )"; echo "$userid" } @@ -38,7 +38,7 @@ fetchGithubName () { [ -n "$NIXPKGS_GITHUB_NAME_CACHE" ] && { echo "$emails" | while read email; do line="$(grep "$email " "$NIXPKGS_GITHUB_NAME_CACHE")" - [ -z "$line" ] && { + [ -z "$line" ] && { echo "$email $(fetchGithubName "$email")" >> \ "$NIXPKGS_GITHUB_NAME_CACHE" } @@ -47,11 +47,11 @@ fetchGithubName () { # For RDF normalize_name () { - sed -e 's/%/%25/g; s/ /%20/g; s/'\''/%27/g; s/"/%22/g; s/`/%60/g; s/\^/%5e/g; ' + sed -e 's/%/%25/g; s/ /%20/g; s/'\''/%27/g; s/"/%22/g; s/`/%60/g; s/\^/%5e/g; ' } denormalize_name () { - sed -e 's/%20/ /g; s/%27/'\''/g; s/%22/"/g; s/%60/`/g; s/%5e/^/g; s/%25/%/g;'; + sed -e 's/%20/ /g; s/%27/'\''/g; s/%22/"/g; s/%60/`/g; s/%5e/^/g; s/%25/%/g;'; } n3="$(mktemp --suffix .n3)" @@ -75,22 +75,22 @@ echo "$maintainers" | cut -f 2 | sed -e 's@.*@<my://name/&> <my://is-name> <my:/ # Get transitive closure sparql="$(nix-build '<nixpkgs>' -Q -A apache-jena --no-out-link)/bin/sparql" name_list="$( - "$sparql" --results=TSV --data="$n3" " - select ?x ?y ?g where { - ?x <my://can-be>+ ?y. - ?x <my://is-name> ?g. + "$sparql" --results=TSV --data="$n3" " + select ?x ?y ?g where { + ?x <my://can-be>+ ?y. + ?x <my://is-name> ?g. } - " | tail -n +2 | - sed -re 's@<my://name/@@g; s@<my://@@g; s@>@@g;' | - sort -k 2,3 -t ' ' + " | tail -n +2 | + sed -re 's@<my://name/@@g; s@<my://@@g; s@>@@g;' | + sort -k 2,3 -t ' ' )" github_name_list="$( - "$sparql" --results=TSV --data="$n3" " - select ?x ?y where { - ?x (<my://can-be>+ / <my://at-github>) ?y. + "$sparql" --results=TSV --data="$n3" " + select ?x ?y where { + ?x (<my://can-be>+ / <my://at-github>) ?y. } - " | tail -n +2 | - sed -re 's@<my://(name|github)/@@g; s@<my://@@g; s@>@@g;' + " | tail -n +2 | + sed -re 's@<my://(name|github)/@@g; s@<my://@@g; s@>@@g;' )" # Take first spelling option for every person @@ -104,10 +104,10 @@ if [ -n "$NIXPKGS_GITHUB_NAME_CACHE" ]; then github_adder_script="$(mktemp)" echo "$github_name_list" | grep -E "$(echo "$name_list_canonical" | cut -f 2 | - tr '\n' '|' )" | - sort | uniq | + tr '\n' '|' )" | + sort | uniq | sed -re 's/(.*)\t(.*)/s| \1$| \1\t\2|g;/' | - denormalize_name > "$github_adder_script" + denormalize_name > "$github_adder_script" else github_adder_script='/dev/null' fi diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fecea9e414835..0743c80ec4f62 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -29,6 +29,20 @@ with lib.maintainers; { scope = "Maintain ACME-related packages and modules."; }; + bazel = { + members = [ + mboes + marsam + uri-canva + cbley + olebedev + groodt + aherrmann + ylecornec + ]; + scope = "Bazel build tool & related tools https://bazel.build/"; + }; + beam = { members = [ ankhers @@ -93,7 +107,6 @@ with lib.maintainers; { cstrahan Frostman kalbasit - mdlayher mic92 orivej rvolosatovs @@ -234,6 +247,15 @@ with lib.maintainers; { scope = "Maintain Podman and CRI-O related packages and modules."; }; + redcodelabs = { + members = [ + unrooted + wr0belj + wintrmvte + ]; + scope = "Maintain Red Code Labs related packages and modules."; + }; + sage = { members = [ timokau @@ -260,4 +282,11 @@ with lib.maintainers; { ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; }; + + xfce = { + members = [ + romildo + ]; + scope = "Maintain Xfce desktop environment and related packages."; + }; } |