diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-18 00:13:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 00:13:30 +0000 |
| commit | 83f5ace380fe5a45869edf89c63e8cffb4baea5d (patch) | |
| tree | 31a5b64f57ae920a1227445878474999273ff675 /maintainers | |
| parent | fccc614684f2ac162ddd03409161a29e12febafa (diff) | |
| parent | 3a16c6447466f4034c2d75fe7014477142c9513e (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 30 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index daf866b4e8524..31948d66d50b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11248,6 +11248,12 @@ github = "marius851000"; githubId = 22586596; }; + mariuskimmina = { + email = "mar.kimmina@gmail.com"; + name = "Marius Kimmina"; + github = "mariuskimmina"; + githubId = 38843153; + }; markbeep = { email = "mrkswrn@gmail.com"; github = "markbeep"; @@ -11340,6 +11346,12 @@ githubId = 585424; name = "Massimo Gengarelli"; }; + matdibu = { + email = "contact@mateidibu.dev"; + github = "matdibu"; + githubId = 24750154; + name = "Matei Dibu"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -13129,6 +13141,15 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nicolas-goudry = { + email = "goudry.nicolas@gmail.com"; + github = "nicolas-goudry"; + githubId = 8753998; + name = "Nicolas Goudry"; + keys = [{ + fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; + }]; + }; nicoo = { email = "nicoo@debian.org"; github = "nbraud"; @@ -20449,6 +20470,15 @@ githubId = 1557253; name = "Lennart Eichhorn"; }; + zedseven = { + name = "Zacchary Dempsey-Plante"; + email = "zacc@ztdp.ca"; + github = "zedseven"; + githubId = 25164338; + keys = [{ + fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; + }]; + }; zendo = { name = "zendo"; email = "linzway@qq.com"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1a581a450c260..32530d3ea3cd1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -95,8 +95,8 @@ mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +nlua,,,,,,teto 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, |