diff options
author | Matthieu Coudron <teto@users.noreply.github.com> | 2023-03-16 01:09:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-16 01:09:57 +0100 |
commit | 1e00cab35a33a7efa4b9a6668aa3399b2ec1c8b0 (patch) | |
tree | 99502c85639ef7e439164dc7efb62d0f3bf2a1c1 /pkgs | |
parent | 41214830851cf31c75a23a30d8361f5c37afcfac (diff) | |
parent | b9220710d109a9b03400d183cf08c22c4d6aead3 (diff) |
Merge pull request #220474 from Leixb/fixDocsNvim
lua-rocks-move-data: fix missing doc tags on luaPackages neovim plugins
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/neovim/tests/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/interpreters/lua-5/hooks/luarocks-move-data.sh | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 8a4e86ef6551b..707a310b632ad 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -157,6 +157,28 @@ rec { ''; }); + # check that the vim-doc hook correctly generates the tag + # for neovim packages from luaPackages + # we know for a fact gitsigns-nvim has a doc folder and comes from luaPackages + checkForTagsLuaPackages = vimPlugins.gitsigns-nvim.overrideAttrs(oldAttrs: { + doInstallCheck = true; + installCheckPhase = '' + [ -f $out/doc/tags ] + ''; + }); + + nvim_with_gitsigns_plugin = neovim.override { + extraName = "-with-gitsigns-plugin"; + configure.packages.plugins = { + start = [ + vimPlugins.gitsigns-nvim + ]; + }; + }; + checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin '' + export HOME=$TMPDIR + ${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e + ''; # nixpkgs should detect that no wrapping is necessary nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; diff --git a/pkgs/development/interpreters/lua-5/hooks/luarocks-move-data.sh b/pkgs/development/interpreters/lua-5/hooks/luarocks-move-data.sh index 9870c9976eae5..df143ecbf9b34 100644 --- a/pkgs/development/interpreters/lua-5/hooks/luarocks-move-data.sh +++ b/pkgs/development/interpreters/lua-5/hooks/luarocks-move-data.sh @@ -12,4 +12,4 @@ luarocksMoveDataHook () { } echo "Using luarocksMoveDataHook" -preDistPhases+=" luarocksMoveDataHook" +preFixupHooks+=(luarocksMoveDataHook) |