vim-utils: fix dependency graph (#140118)
* neovim.tests: ensure the graph is pulled
We'll change the plugin name to ensure the plugin is correctly pulled by
vim-plug config generation.
* neovim.tests: ensure nvim exit with error
* Revert "fix: remove trailing '/.' from vim-plug plugin paths"
The root cause if fixed by
https://github.com/nixOS/nixpkgs/commit/761b2c6ff342425388db38b86f1c49cbdb232514#diff-e4b94db9201d58bd9410739dddf92bef74e0b5f5e596c804a84ee7c580ae3f71R9
This reverts commit d9d1a11aed1761bc3a9d95dd2b8d154c44d4feec.
commit9cb5337fde7c530df0cfbea514ffb17842501654
authorArthur Gautier <baloo@superbaloo.net>
dateThu 7 Oct 2021, 22:26 (5 years ago)
parent3618726
pkgs/applications/editors/neovim/tests.nix+2−2
@@ -87,7 +87,7 @@ rec {
8787 nvim_with_plug = neovim.override {
8888 extraName = "-with-plug";
8989 configure.plug.plugins = with pkgs.vimPlugins; [
90− base16-vim
90+ (base16-vim.overrideAttrs(old: { pname = old.pname + "-unique-for-tests-please-dont-use"; }))
9191 ];
9292 configure.customRC = ''
9393 color base16-tomorrow-night
@@ -97,7 +97,7 @@ rec {
9797
9898 run_nvim_with_plug = runTest nvim_with_plug ''
9999 export HOME=$TMPDIR
100− ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit!
100+ ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e
101101 '';
102102
103103
pkgs/misc/vim-plugins/vim-utils.nix+1−3
@@ -292,14 +292,12 @@ let
292292
293293 /* vim-plug is an extremely popular vim plugin manager.
294294 */
295− /* Remove repeated "/." suffixes from a path */
296− stripDots = path: lib.head (builtins.split "(/\\.)*$" path);
297295 plugImpl =
298296 (''
299297 source ${vimPlugins.vim-plug.rtp}/plug.vim
300298 silent! call plug#begin('/dev/null')
301299
302− '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${stripDots pkg.rtp}'") plug.plugins) + ''
300+ '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
303301
304302 call plug#end()
305303 '');