diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/maintainers | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/maintainers')
| -rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rw-r--r-- | nixpkgs/maintainers/team-list.nix | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index de345f0e8bf2..bb0f7c67a917 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -16112,6 +16112,12 @@ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; + shivaraj-bh = { + email = "sbh69840@gmail.com"; + name = "Shivaraj B H"; + github = "shivaraj-bh"; + githubId = 23645788; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -17212,6 +17218,12 @@ githubId = 1901799; name = "Nathan van Doorn"; }; + taranarmo = { + email = "taranarmo@gmail.com"; + github = "taranarmo"; + githubId = 11619234; + name = "Sergey Volkov"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index f03ef4fa09c9..5ad2f9431592 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -16,7 +16,6 @@ cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, fennel,,,,,,misterio77 -ferris.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, @@ -101,6 +100,7 @@ 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,,,,,, diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index 85a6227634f1..f8dbd637d77f 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -407,7 +407,6 @@ with lib.maintainers; { home-assistant = { members = [ fab - globin hexa mic92 ]; @@ -742,7 +741,6 @@ with lib.maintainers; { aanderse drupol etu - globin ma27 talyz ]; |