diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 18:01:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-21 18:01:53 +0000 |
commit | f4afba201428530fdb713fda18d055bd99daf333 (patch) | |
tree | a760cddec5bad37433f29f2c1c2c75b6fba8d05d /maintainers | |
parent | b52540749224057bb31cfb20168fe71474cf2116 (diff) | |
parent | a01279cf2329f710bb84f3aa64d32ea87a8c4124 (diff) | |
download | nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar.gz nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar.bz2 nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar.lz nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar.xz nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.tar.zst nixpkgs-f4afba201428530fdb713fda18d055bd99daf333.zip |
Merge staging-next into staging
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 28 | ||||
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38a7a79c48a..f2c4835e3ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1274,6 +1274,9 @@ github = "antonmosich"; githubId = 27223336; name = "Anton Mosich"; + keys = [ { + fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; + } ]; }; antono = { email = "self@antono.info"; @@ -3874,6 +3877,12 @@ githubId = 50051176; name = "Daniel Rolls"; }; + danielsidhion = { + email = "nixpkgs@sidhion.com"; + github = "DanielSidhion"; + githubId = 160084; + name = "Daniel Sidhion"; + }; daniyalsuri6 = { email = "daniyal.suri@gmail.com"; github = "daniyalsuri6"; @@ -7225,6 +7234,7 @@ }; hubble = { name = "Hubble the Wolverine"; + email = "hubblethewolverine@gmail.com"; matrix = "@hubofeverything:bark.lgbt"; github = "the-furry-hubofeverything"; githubId = 53921912; @@ -10929,6 +10939,12 @@ githubId = 29855073; name = "Michael Colicchia"; }; + massimogengarelli = { + email = "massimo.gengarelli@gmail.com"; + github = "massix"; + githubId = 585424; + name = "Massimo Gengarelli"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -13916,6 +13932,12 @@ githubId = 610615; name = "Chih-Mao Chen"; }; + pks = { + email = "ps@pks.im"; + github = "pks-t"; + githubId = 4056630; + name = "Patrick Steinhardt"; + }; plabadens = { name = "Pierre Labadens"; email = "labadens.pierre+nixpkgs@gmail.com"; @@ -17810,6 +17832,12 @@ githubId = 858790; name = "Tobias Mayer"; }; + tochiaha = { + email = "tochiahan@proton.me"; + github = "Tochiaha"; + githubId = 74688871; + name = "Tochukwu Ahanonu"; + }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5897948a9f8..f03ef4fa09c 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -16,6 +16,7 @@ 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, |