neovim: fix neovim.override (#124785)
* neovim: temporary revert to unbreak user configs Newly introduced "plugins" parameter is disabled until we get a better testing infrastructure to minimize breaking changes.
This commit is contained in:
parent
759e95d597
commit
c73371e04b
|
@ -54,15 +54,7 @@ let
|
||||||
|
|
||||||
|
|
||||||
configurePatched = configure // {
|
configurePatched = configure // {
|
||||||
packages.nix = {
|
customRC = pluginRc + customRC + (configure.customRC or "");
|
||||||
start = lib.filter (f: f != null)
|
|
||||||
(map (x: if x.optional == false then x.plugin else null)
|
|
||||||
pluginsNormalized);
|
|
||||||
opt = lib.filter (f: f != null)
|
|
||||||
(map (x: if x.optional == true then x.plugin else null)
|
|
||||||
pluginsNormalized);
|
|
||||||
};
|
|
||||||
customRC = pluginRc + customRC;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# A function to get the configuration string (if any) from an element of 'plugins'
|
# A function to get the configuration string (if any) from an element of 'plugins'
|
||||||
|
@ -173,11 +165,8 @@ let
|
||||||
assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages.";
|
assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages.";
|
||||||
|
|
||||||
wrapNeovimUnstable neovim (res // {
|
wrapNeovimUnstable neovim (res // {
|
||||||
wrapperArgs = lib.escapeShellArgs (
|
wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs;
|
||||||
res.wrapperArgs ++ lib.optionals (configure != {}) [
|
wrapRc = (configure != {});
|
||||||
"--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}"
|
|
||||||
]) + " " + extraMakeWrapperArgs
|
|
||||||
;
|
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,6 +36,15 @@ in
|
||||||
##################
|
##################
|
||||||
nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix;
|
nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix;
|
||||||
|
|
||||||
|
nvim_via_override = neovim.override {
|
||||||
|
configure = {
|
||||||
|
packages.foo.start = [ vimPlugins.ale ];
|
||||||
|
customRC = ''
|
||||||
|
:help ale
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
### vim tests
|
### vim tests
|
||||||
##################
|
##################
|
||||||
vim_with_vim2nix = vim_configurable.customize {
|
vim_with_vim2nix = vim_configurable.customize {
|
||||||
|
|
Loading…
Reference in a new issue