diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 436 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/hydra-report.hs | 19 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh | 2 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 22 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 8 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 22 |
6 files changed, 418 insertions, 91 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a268dcc93611..205541b186b1 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"; @@ -540,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"; @@ -1210,6 +1231,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"; @@ -1510,6 +1536,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"; @@ -1554,6 +1585,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"; @@ -1733,6 +1771,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"; @@ -1844,6 +1888,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; @@ -2462,6 +2512,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"; @@ -2530,6 +2586,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"; @@ -2590,6 +2652,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"; @@ -2668,6 +2736,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"; @@ -2852,6 +2926,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"; @@ -3080,6 +3161,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"; @@ -3098,6 +3185,11 @@ githubId = 18648043; name = "Daniel Cartwright"; }; + chewblacka = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; @@ -3693,6 +3785,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"; @@ -4182,6 +4280,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"; @@ -4222,6 +4329,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"; @@ -4240,6 +4353,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"; @@ -4888,6 +5007,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"; @@ -5332,6 +5457,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"; @@ -5958,13 +6090,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"; @@ -6073,6 +6198,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"; @@ -7474,6 +7603,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; @@ -7744,6 +7880,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"; @@ -7791,6 +7933,12 @@ githubId = 41924494; name = "Ivar"; }; + ivarmedi = { + email = "ivar@larsson.me"; + github = "ivarmedi"; + githubId = 1318743; + name = "Ivar"; + }; iwanb = { email = "tracnar@gmail.com"; github = "iwanb"; @@ -7993,6 +8141,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"; @@ -8252,11 +8406,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"; @@ -8275,11 +8432,6 @@ githubId = 31008330; name = "Jann Marc Villablanca"; }; - jgarcia = { - github = "chewblacka"; - githubId = 18430320; - name = "John Garcia"; - }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; @@ -9420,6 +9572,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"; @@ -9950,6 +10108,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"; @@ -9968,6 +10133,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"; @@ -10897,6 +11071,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"; @@ -10904,6 +11084,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"; @@ -11166,6 +11352,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"; @@ -11214,6 +11406,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"; @@ -11677,6 +11875,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"; @@ -12012,6 +12216,13 @@ github = "ribosomerocker"; githubId = 46468162; }; + moni = { + email = "lythe1107@gmail.com"; + matrix = "@fortuneteller2k:matrix.org"; + github = "moni"; + githubId = 20619776; + name = "moni"; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; @@ -12417,6 +12628,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"; @@ -12460,6 +12676,11 @@ githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -12480,6 +12701,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"; @@ -12526,6 +12753,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"; @@ -12665,6 +12899,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"; @@ -12850,13 +13090,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"; @@ -12896,6 +13129,11 @@ githubId = 66913205; name = "Rick Sanchez"; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -13281,6 +13519,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; @@ -13914,6 +14158,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"; @@ -13938,6 +14188,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"; @@ -13950,6 +14206,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"; @@ -14379,6 +14642,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"; @@ -14586,6 +14855,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"; @@ -14618,7 +14893,7 @@ }; quantenzitrone = { email = "quantenzitrone@protonmail.com"; - github = "Quantenzitrone"; + github = "quantenzitrone"; githubId = 74491719; matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; @@ -14700,6 +14975,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"; @@ -14812,6 +15093,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"; @@ -15224,12 +15511,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"; @@ -15284,6 +15565,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"; @@ -16087,13 +16374,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"; @@ -16106,6 +16386,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"; @@ -16380,6 +16667,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"; @@ -16460,11 +16754,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"; @@ -18155,6 +18448,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"; @@ -18558,6 +18857,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"; @@ -18846,6 +19151,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"; @@ -19073,6 +19384,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"; @@ -19186,11 +19503,11 @@ 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"; @@ -19376,11 +19693,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"; @@ -19482,6 +19799,12 @@ github = "yanganto"; githubId = 10803111; }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -19526,6 +19849,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"; @@ -19917,6 +20247,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..2ce3ecb2ae70 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 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 5ad2f9431592..78cfca24d96b 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,8 +12,7 @@ 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 fifo,,,,,, @@ -24,7 +23,7 @@ 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 @@ -40,7 +39,7 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -49,6 +48,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,,,,,, @@ -82,30 +82,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 44a445875d91..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 @@ -788,14 +788,12 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - from datetime import date - try: repo = git.Repo(os.getcwd()) - updated = date.today().strftime('%m-%d-%Y') + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') print(args.outfile) commit(repo, - f"{editor.attr_path}: updated the {updated}", [args.outfile] + 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) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ea5f4a53e1d1..a738d33127da 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -219,7 +219,6 @@ with lib.maintainers; { cole-h grahamc hoverbear - lheckemann ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; @@ -323,13 +322,18 @@ with lib.maintainers; { geospatial = { members = [ + das-g imincik - sikmir nh2 + sikmir willcohen ]; + githubTeams = [ + "geospatial" + ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; + enableFeatureFreezePing = true; }; gitlab = { @@ -394,6 +398,7 @@ with lib.maintainers; { cdepillabout expipiplus1 maralorn + ncfavier sternenseemann ]; githubTeams = [ @@ -673,18 +678,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 @@ -912,7 +905,6 @@ with lib.maintainers; { tts = { members = [ - hexa mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; |