diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 353 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/merge-and-open-pr.sh | 4 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/update-stackage.sh | 5 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 8 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 6 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 13 |
6 files changed, 348 insertions, 41 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5da600c84d2b..ec9a82415038 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -388,6 +388,12 @@ fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; }]; }; + adam248 = { + email = "adamjbutler091@gmail.com"; + github = "adam248"; + githubId = 85082674; + name = "Adam J. Butler"; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -528,7 +534,7 @@ name = "James Alexander Feldman-Crough"; }; afontain = { - email = "antoine.fontaine@epfl.ch"; + email = "afontain@posteo.net"; github = "necessarily-equal"; githubId = 59283660; name = "Antoine Fontaine"; @@ -557,6 +563,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahirner = { + email = "a.hirner+nixpkgs@gmail.com"; + github = "ahirner"; + githubId = 6055037; + name = "Alexander Hirner"; + }; ahoneybun = { email = "aaron@system76.com"; github = "ahoneybun"; @@ -587,6 +599,16 @@ githubId = 4732885; name = "Ivan Jager"; }; + aikooo7 = { + name = "Diogo Fernandes"; + email = "prozinhopro1973@gmail.com"; + matrix = "@aikoo7:matrix.org"; + github = "aikooo7"; + githubId = 79667753; + keys = [{ + fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; + }]; + }; aiotter = { email = "git@aiotter.com"; github = "aiotter"; @@ -705,6 +727,15 @@ githubId = 20405311; name = "Aksh Gupta"; }; + al3xtjames = { + email = "nix@alextjam.es"; + github = "al3xtjames"; + githubId = 5672538; + name = "Alex James"; + keys = [{ + fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; + }]; + }; alanpearce = { email = "alan@alanpearce.eu"; github = "alanpearce"; @@ -896,12 +927,15 @@ name = "Alma Cemerlic"; }; Alper-Celik = { - email = "dev.alpercelik@gmail.com"; + email = "alper@alper-celik.dev"; name = "Alper Çelik"; github = "Alper-Celik"; githubId = 110625473; keys = [{ fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; + } + { + fingerprint = "DF68 C500 4024 23CC F9C5 E6CA 3D17 C832 4696 FE70"; }]; }; alternateved = { @@ -1254,6 +1288,7 @@ a-n-n-a-l-e-e = { github = "a-n-n-a-l-e-e"; githubId = 150648636; + matrix = "@a-n-n-a-l-e-e:matrix.org"; name = "annalee"; }; anoa = { @@ -1275,9 +1310,11 @@ githubId = 6060545; matrix = "@anpin:matrix.org"; name = "Pavel Anpin"; - keys = [{ - fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; - }]; + keys = [ + { fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; } + # compare with https://keybase.io/anpin/pgp_keys.asc + { fingerprint = "DADF F3EA 06DC 8C1B 100A 24DB 312E 8F17 91C5 DA8C"; } + ]; }; anpryl = { email = "anpryl@gmail.com"; @@ -2046,6 +2083,12 @@ githubId = 80325; name = "Benjamin Andresen"; }; + barab-i = { + email = "barab_i@outlook.com"; + github = "barab-i"; + githubId = 92919899; + name = "Barab I"; + }; baracoder = { email = "baracoder@googlemail.com"; github = "baracoder"; @@ -2479,6 +2522,12 @@ githubId = 5700358; name = "Thomas Blank"; }; + blinry = { + name = "blinry"; + email = "mail@blinry.org"; + github = "blinry"; + githubId = 81277; + }; blitz = { email = "js@alien8.de"; matrix = "@js:ukvly.org"; @@ -2615,6 +2664,12 @@ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; + br337 = { + email = "brian.porumb@proton.me"; + github = "br337"; + githubId = 49288125; + name = "Brian Porumb"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -2813,12 +2868,6 @@ githubId = 382011; name = "c4605"; }; - caadar = { - email = "v88m@posteo.net"; - github = "caadar"; - githubId = 15320726; - name = "Car Cdr"; - }; caarlos0 = { name = "Carlos A Becker"; email = "carlos@becker.software"; @@ -2961,6 +3010,12 @@ fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; }]; }; + carloscraveiro = { + email = "carlos.craveiro@usp.br"; + github = "CarlosCraveiro"; + githubId = 85318248; + name = "Carlos Henrique Craveiro Aquino Veras"; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -3351,8 +3406,7 @@ }; chuangzhu = { name = "Chuang Zhu"; - email = "chuang@melty.land"; - matrix = "@chuangzhu:matrix.org"; + email = "nixos@chuang.cz"; github = "chuangzhu"; githubId = 31200881; keys = [{ @@ -3829,6 +3883,12 @@ githubId = 6821729; github = "criyle"; }; + crschnick = { + email = "crschnick@xpipe.io"; + name = "Christopher Schnick"; + github = "crschnick"; + githubId = 72509152; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; @@ -3945,6 +4005,12 @@ githubId = 217899; name = "Cyryl Płotnicki"; }; + d3vil0p3r = { + name = "Antonio Voza"; + email = "vozaanthony@gmail.com"; + github = "D3vil0p3r"; + githubId = 83867734; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -4174,6 +4240,15 @@ githubId = 118536343; name = "David Hamelin"; }; + david-r-cox = { + email = "david@integrated-reasoning.com"; + github = "david-r-cox"; + githubId = 4259949; + name = "David Cox"; + keys = [{ + fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; + }]; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; @@ -4644,6 +4719,15 @@ fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; }]; }; + dixslyf = { + name = "Dixon Sean Low Yan Feng"; + email = "dixonseanlow@protonmail.com"; + github = "dixslyf"; + githubId = 56017218; + keys = [{ + fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; + }]; + }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -5138,6 +5222,12 @@ matrix = "@edrex:matrix.org"; name = "Eric Drechsel"; }; + edswordsmith = { + email = "eduardo.espadeiro@tecnico.ulisboa.pt"; + github = "EdSwordsmith"; + githubId = 22300113; + name = "Eduardo Espadeiro"; + }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; @@ -6653,7 +6743,7 @@ }; getpsyched = { name = "Priyanshu Tripathi"; - email = "priyanshutr@proton.me"; + email = "priyanshu@getpsyched.dev"; matrix = "@getpsyched:matrix.org"; github = "getpsyched"; githubId = 43472218; @@ -7472,6 +7562,16 @@ githubId = 362833; name = "Hongchang Wu"; }; + honnip = { + name = "Jung seungwoo"; + email = "me@honnip.page"; + matrix = "@honnip:matrix.org"; + github = "honnip"; + githubId = 108175486; + keys = [{ + fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; + }]; + }; hoppla20 = { email = "privat@vincentcui.de"; github = "hoppla20"; @@ -7576,6 +7676,12 @@ githubId = 51334444; name = "Akshat Agarwal"; }; + hummeltech = { + email = "hummeltech2024@gmail.com"; + github = "hummeltech"; + githubId = 6109326; + name = "David Hummel"; + }; huyngo = { email = "huyngo@disroot.org"; github = "Huy-Ngo"; @@ -8210,6 +8316,12 @@ github = "Janik-Haag"; githubId = 80165193; }; + jankaifer = { + name = "Jan Kaifer"; + email = "jan@kaifer.cz"; + github = "jankaifer"; + githubId = 12820484; + }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; @@ -9233,6 +9345,12 @@ githubId = 5124422; name = "Julien Urraca"; }; + justanotherariel = { + email = "ariel@ebersberger.io"; + github = "justanotherariel"; + githubId = 31776703; + name = "Ariel Ebersberger"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; @@ -10183,6 +10301,12 @@ githubId = 21087104; name = "Laurent Fainsin"; }; + lavafroth = { + email = "lavafroth@protonmail.com"; + github = "lavafroth"; + githubId = 107522312; + name = "Himadri Bhattacharjee"; + }; layus = { email = "layus.on@gmail.com"; github = "layus"; @@ -10924,6 +11048,12 @@ githubId = 2486026; name = "Luca Fulchir"; }; + luleyleo = { + email = "git@leopoldluley.de"; + github = "luleyleo"; + githubId = 10746692; + name = "Leopold Luley"; + }; lumi = { email = "lumi@pew.im"; github = "lumi-me-not"; @@ -11021,9 +11151,6 @@ github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; - keys = [{ - fingerprint = "62B9 9C26 F046 721E 26B0 04F6 D006 A998 C6AB FDF1"; - }]; }; ma9e = { email = "sean@lfo.team"; @@ -11332,6 +11459,12 @@ githubId = 458783; name = "Martin Gammelsæter"; }; + martinjlowm = { + email = "martin@martinjlowm.dk"; + github = "martinjlowm"; + githubId = 110860; + name = "Martin Jesper Low Madsen"; + }; martinramm = { email = "martin-ramm@gmx.de"; github = "MartinRamm"; @@ -11492,6 +11625,12 @@ githubId = 279868; name = "Matti Kariluoma"; }; + mattpolzin = { + email = "matt.polzin@gmail.com"; + github = "mattpolzin"; + githubId = 2075353; + name = "Matt Polzin"; + }; matt-snider = { email = "matt.snider@protonmail.com"; github = "matt-snider"; @@ -11806,6 +11945,12 @@ github = "Mephistophiles"; githubId = 4850908; }; + mevatron = { + email = "mevatron@gmail.com"; + name = "mevatron"; + github = "mevatron"; + githubId = 714585; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -12946,6 +13091,12 @@ githubId = 77314501; name = "Maurice Zhou"; }; + Nebucatnetzer = { + email = "andreas+nixpkgs@zweili.ch"; + github = "Nebucatnetzer"; + githubId = 2287221; + name = "Andreas Zweili"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -13217,6 +13368,13 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + niklaskorz = { + name = "Niklas Korz"; + email = "niklas@niklaskorz.de"; + matrix = "@niklaskorz:korz.dev"; + github = "niklaskorz"; + githubId = 590517; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; @@ -13485,6 +13643,13 @@ githubId = 13149442; name = "Nico Pulido-Mateo"; }; + nrabulinski = { + email = "1337-nix@nrab.lol"; + matrix = "@niko:nrab.lol"; + github = "nrabulinski"; + githubId = 24574288; + name = "Nikodem Rabuliński"; + }; nrdxp = { email = "tim.deh@pm.me"; matrix = "@timdeh:matrix.org"; @@ -13522,6 +13687,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + nudelsalat = { + email = "nudelsalat@clouz.de"; + name = "Fabian Dreßler"; + github = "Noodlesalat"; + githubId = 12748782; + }; nukaduka = { email = "ksgokte@gmail.com"; github = "NukaDuka"; @@ -13813,10 +13984,10 @@ name = "Sandro Stikić"; }; OPNA2608 = { - email = "christoph.neidahl@gmail.com"; + email = "opna2608@protonmail.com"; github = "OPNA2608"; githubId = 23431373; - name = "Christoph Neidahl"; + name = "Cosima Neidahl"; }; orbekk = { email = "kjetil.orbekk@gmail.com"; @@ -13961,6 +14132,12 @@ github = "p3psi-boo"; githubId = 43925055; }; + pabloaul = { + email = "contact@nojus.org"; + github = "pabloaul"; + githubId = 35423980; + name = "Nojus Dulskis"; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "Pablo1107"; @@ -14116,6 +14293,18 @@ githubId = 15645854; name = "Brad Christensen"; }; + patwid = { + email = "patrick.widmer@tbwnet.ch"; + github = "patwid"; + githubId = 25278658; + name = "Patrick Widmer"; + }; + paulsmith = { + email = "paulsmith@pobox.com"; + github = "paulsmith"; + name = "Paul Smith"; + githubId = 1210; + }; paumr = { github = "paumr"; name = "Michael Bergmeister"; @@ -14527,6 +14716,12 @@ githubId = 610615; name = "Chih-Mao Chen"; }; + pkosel = { + name = "pkosel"; + email = "philipp.kosel@gmail.com"; + github = "pkosel"; + githubId = 170943; + }; pks = { email = "ps@pks.im"; github = "pks-t"; @@ -14542,15 +14737,6 @@ fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; }]; }; - PlayerNameHere = { - name = "Dixon Sean Low Yan Feng"; - email = "dixonseanlow@protonmail.com"; - github = "dixslyf"; - githubId = 56017218; - keys = [{ - fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; - }]; - }; plchldr = { email = "mail@oddco.de"; github = "plchldr"; @@ -14870,6 +15056,12 @@ githubId = 18549627; name = "Proglodyte"; }; + proglottis = { + email = "proglottis@gmail.com"; + github = "proglottis"; + githubId = 74465; + name = "James Fargher"; + }; progval = { email = "progval+nix@progval.net"; github = "progval"; @@ -15661,6 +15853,12 @@ githubId = 7221768; name = "Andika Demas Riyandi"; }; + rjpcasalino = { + email = "ryan@rjpc.net"; + github = "rjpcasalino"; + githubId = 12821230; + name = "Ryan J.P. Casalino"; + }; rkitover = { email = "rkitover@gmail.com"; github = "rkitover"; @@ -15984,7 +16182,7 @@ }; running-grass = { name = "Leo Liu"; - email = "467195537@qq.com"; + email = "hi@grass.show"; github = "running-grass"; githubId = 17241154; keys = [{ @@ -16708,6 +16906,12 @@ }]; name = "Shane Sveller"; }; + shard7 = { + email = "sh7user@gmail.com"; + github = "shard77"; + githubId = 106669955; + name = "Léon Gessner"; + }; shardy = { email = "shardul@baral.ca"; github = "shardulbee"; @@ -16906,6 +17110,12 @@ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; + Silver-Golden = { + name = "Brendan Golden"; + email = "github+nixpkgs@brendan.ie"; + github = "Silver-Golden"; + githubId = 7858375; + }; simarra = { name = "simarra"; email = "loic.martel@protonmail.com"; @@ -16924,6 +17134,11 @@ githubId = 50401154; name = "Simone Ruffini"; }; + simonhammes = { + github = "simonhammes"; + githubId = 10352679; + name = "Simon Hammes"; + }; simonkampe = { email = "simon.kampe+nix@gmail.com"; github = "simonkampe"; @@ -17039,6 +17254,17 @@ githubId = 3789764; name = "skykanin"; }; + skyrina = { + email = "sorryu02@gmail.com"; + github = "skyrina"; + githubId = 116099351; + name = "Skylar"; + }; + slam-bert = { + github = "slam-bert"; + githubId = 106779009; + name = "Slambert"; + }; slbtty = { email = "shenlebantongying@gmail.com"; github = "shenlebantongying"; @@ -17119,6 +17345,12 @@ fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; }]; }; + smrehman = { + name = "Syed Moiz Ur Rehman"; + email = "smrehman@proton.me"; + github = "syedmoizurrehman"; + githubId = 17818950; + }; sna = { email = "abouzahra.9@wright.edu"; github = "S-NA"; @@ -17239,6 +17471,13 @@ githubId = 151924; name = "John Anderson"; }; + soopyc = { + name = "Cassie Cheung"; + email = "me@soopy.moe"; + github = "soopyc"; + githubId = 13762043; + matrix = "@sophie:nue.soopy.moe"; + }; sophrosyne = { email = "joshuaortiz@tutanota.com"; github = "sophrosyne97"; @@ -18030,6 +18269,12 @@ githubId = 2389333; name = "Andy Tockman"; }; + teatwig = { + email = "nix@teatwig.net"; + name = "tea"; + github = "teatwig"; + githubId = 18734648; + }; techknowlogick = { email = "techknowlogick@gitea.com"; github = "techknowlogick"; @@ -18202,6 +18447,15 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + theaninova = { + name = "Thea Schöbl"; + email = "dev@theaninova.de"; + github = "Theaninova"; + githubId = 19289296; + keys = [{ + fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; + }]; + }; the-argus = { email = "i.mcfarlane2002@gmail.com"; github = "the-argus"; @@ -18947,6 +19201,13 @@ matrix = "@ty:tjll.net"; name = "Tyler Langlois"; }; + tylervick = { + email = "nix@tylervick.com"; + github = "tylervick"; + githubId = 1395852; + name = "Tyler Vick"; + matrix = "@tylervick:matrix.org"; + }; tymscar = { email = "oscar@tymscar.com"; github = "tymscar"; @@ -18967,10 +19228,16 @@ }; uakci = { name = "uakci"; - email = "uakci@uakci.pl"; + email = "git@uakci.space"; github = "uakci"; githubId = 6961268; }; + uartman = { + name = "Anton Gusev"; + email = "uartman@mail.ru"; + github = "UARTman"; + githubId = 21099202; + }; udono = { email = "udono@virtual-things.biz"; github = "udono"; @@ -19463,7 +19730,15 @@ githubId = 13259982; name = "Vanessa McHale"; }; - + vncsb = { + email = "viniciusbernardino1@hotmail.com"; + github = "vncsb"; + githubId = 19562240; + name = "Vinicius Bernardino"; + keys = [{ + fingerprint = "F0D3 920C 722A 541F 0CCD 66E3 A7BA BA05 3D78 E7CA"; + }]; + }; voidless = { email = "julius.schmitt@yahoo.de"; github = "voidIess"; @@ -20038,7 +20313,7 @@ xfix = { email = "kamila@borowska.pw"; matrix = "@xfix:matrix.org"; - github = "xfix"; + github = "KamilaBorowska"; githubId = 1297598; name = "Kamila Borowska"; }; @@ -20132,7 +20407,7 @@ }; yana = { email = "yana@riseup.net"; - github = "yanalunaterra"; + github = "yanateras"; githubId = 1643293; name = "Yana Timoshenko"; }; @@ -20650,6 +20925,12 @@ githubId = 81353; name = "Alexandre Macabies"; }; + zoriya = { + email = "zoe.roux@zoriya.dev"; + github = "zoriya"; + githubId = 32224410; + name = "Zoe Roux"; + }; zowoq = { github = "zowoq"; githubId = 59103226; @@ -20661,6 +20942,12 @@ githubId = 8100652; name = "David Mell"; }; + zshipko = { + email = "zachshipko@gmail.com"; + github = "zshipko"; + githubId = 332534; + name = "Zach Shipko"; + }; ztzg = { email = "dd@crosstwine.com"; github = "ztzg"; diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index cdba24f0c207..62565d24d623 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -54,8 +54,8 @@ if ! gh auth status 2>/dev/null ; then fi # Make sure this is configured before we start doing anything -push_remote="$(git config branch.haskell-updates.pushRemote \ - || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.')" +push_remote="$(git config branch.haskell-updates.pushRemote)" \ + || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.' # Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. echo "Fetching origin..." diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 881cf5fd4837..5dc52abdd668 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -7,8 +7,11 @@ set -eu -o pipefail # Stackage solver to use, LTS or Nightly # (should be capitalized like the display name) SOLVER=LTS +# Stackage solver verson, if any. Use latest if empty +VERSION=21 TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER +readonly VERSION readonly TMP_TEMPLATE toLower() { @@ -23,7 +26,7 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac trap 'rm "${tmpfile}" "${tmpfile_new}"' 0 touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors. -curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile" +curl -L -s "https://stackage.org/$(toLower "$SOLVER")${VERSION:+-$VERSION}/cabal.config" >"$tmpfile" old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g') version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")" diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 32530d3ea3cd..8e1c5275401d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -7,7 +7,7 @@ binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque -compat53,,,,0.7-1,,vcunat +compat53,,,,,,vcunat cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat @@ -15,12 +15,14 @@ cyan,,,,,, digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 +fidget.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque fzy,,,,,,mrcjkb gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat +image.nvim,,,,,,teto inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, @@ -54,7 +56,7 @@ lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, lua-zlib,,,,,,koral -lua_cliargs,https://github.com/amireh/lua_cliargs.git,,,,, +lua_cliargs,,,,,, luabitop,https://github.com/teto/luabitop.git,,,,, luacheck,,,,,, luacov,,,,,, @@ -85,7 +87,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn lua-iconv,,,,7.0.0,, -luuid,,,,,, +luuid,,,,20120509-2,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index cc0f4ef742d1..056abda85bfd 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -17,6 +17,7 @@ import http import json import logging import os +import re import subprocess import sys import time @@ -192,6 +193,11 @@ class RepoGitHub(Repo): with urllib.request.urlopen(commit_req, timeout=10) as req: self._check_for_redirect(commit_url, req) xml = req.read() + + # Filter out illegal XML characters + illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]") + xml = illegal_xml_regex.sub(b"", xml) + root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) assert latest_entry is not None, f"No commits found in repository {self}" diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0f0485a55bba..c5b37437ddb2 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -96,6 +96,16 @@ with lib.maintainers; { shortName = "Blockchains"; }; + buildbot = { + members = [ + lopsided98 + mic92 + zowoq + ]; + scope = "Maintain Buildbot CI framework"; + shortName = "Buildbot"; + }; + c = { members = [ matthewbauer @@ -319,6 +329,7 @@ with lib.maintainers; { imincik nh2 nialov + r-burns sikmir willcohen ]; @@ -523,7 +534,6 @@ with lib.maintainers; { dtzWill ericson2314 lovek323 - primeos qyliss raitobezarius rrbutani @@ -766,7 +776,6 @@ with lib.maintainers; { podman = { members = [ - adisbladis saschagrunert vdemeester ]; |