mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
Merge pull request #102605 from teto/vimAlias
neovim: take into account vi(m)Alias
This commit is contained in:
commit
72c32ad3d7
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
|
@ -178,6 +178,7 @@
|
|||
|
||||
# Neovim
|
||||
/pkgs/applications/editors/neovim @jonringer
|
||||
/pkgs/applications/editors/neovim @teto
|
||||
|
||||
# VimPlugins
|
||||
/pkgs/misc/vim-plugins @jonringer @softinio
|
||||
|
|
|
@ -35,7 +35,7 @@ let
|
|||
|
||||
# for forward compability, when adding new environments, haskell etc.
|
||||
, ...
|
||||
}:
|
||||
}@args:
|
||||
let
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "neovim-ruby-env";
|
||||
|
@ -99,7 +99,7 @@ let
|
|||
manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
|
||||
neovimRcContent = vimUtils.vimrcContent configure;
|
||||
in
|
||||
{
|
||||
args // {
|
||||
wrapperArgs = makeWrapperArgs;
|
||||
inherit neovimRcContent;
|
||||
inherit manifestRc;
|
||||
|
@ -142,8 +142,7 @@ let
|
|||
extraPythonPackages = compatFun extraPythonPackages;
|
||||
inherit withPython3;
|
||||
extraPython3Packages = compatFun extraPython3Packages;
|
||||
inherit withNodeJs withRuby;
|
||||
|
||||
inherit withNodeJs withRuby viAlias vimAlias;
|
||||
inherit configure;
|
||||
};
|
||||
in
|
||||
|
|
Loading…
Reference in a new issue