summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-10-13 18:01:31 +0000
committerGitHub <noreply@github.com>2023-10-13 18:01:31 +0000
commitc68d98e9d41f96cf3d591f8d5a7abfdb2b292799 (patch)
treebe6df5adcc1528f56a1204acff4eaf2cfd1cefb6 /maintainers
parent68ba5fd2ed8be749cf1865ed9a71667dfda944a7 (diff)
parent4a7eb88e55f80623bb3ea4968ff4600814016ffb (diff)
downloadnixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.gz
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.bz2
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.lz
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.xz
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.zst
nixpkgs-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.zip
Merge staging-next into staging
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--maintainers/scripts/luarocks-packages.csv4
2 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index be3e8bb2ff9..f31993037ec 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12851,6 +12851,12 @@
     githubId = 9939720;
     name = "Philippe Nguyen";
   };
+  npulidomateo = {
+    matrix = "@npulidomateo:matrix.org";
+    github = "npulidomateo";
+    githubId = 13149442;
+    name = "Nico Pulido-Mateo";
+  };
   nrdxp = {
     email = "tim.deh@pm.me";
     matrix = "@timdeh:matrix.org";
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 3ce3f3d7343..fbe1154ab18 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -72,6 +72,7 @@ lualogging,,,,,,
 luaossl,,,,,5.1,
 luaposix,,,,34.1.1-1,,vyp lblasc
 luarepl,,,,,,
+luarocks-build-rust-mlua,,,,,,mrcjkb
 luasec,,,,,,flosse
 luasocket,,,,,,
 luasql-sqlite3,,,,,,vyp
@@ -92,6 +93,7 @@ mediator_lua,,,,,,
 middleclass,,,,,,
 mpack,,,,,,
 moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
+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
@@ -109,5 +111,7 @@ teal-language-server,,,http://luarocks.org/dev,,,
 telescope.nvim,,,,,5.1,
 telescope-manix,,,,,,
 tl,,,,,,mephistophiles
+toml,,,,,,mrcjkb
+toml-edit,,,,,5.1,mrcjkb
 vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
 vusted,,,,,,figsoda