git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #102605 from teto/vimAlias

neovim: take into account vi(m)Alias

commit72c32ad3d70d4fe2f12db6b23ed504eb4d52ece2 authorMatthieu Coudron <mattator@gmail.com> dateTue 3 Nov 2020, 11:41 (6 years ago) parentc0d9244cd60408
2 files changed+4−4
.github/CODEOWNERS+1 pkgs/applications/editors/neovim/utils.nix+3−4
.github/CODEOWNERS+1
@@ -178,6 +178,7 @@
178178
179179# Neovim
180180/pkgs/applications/editors/neovim @jonringer
181+/pkgs/applications/editors/neovim @teto
181182
182183# VimPlugins
183184/pkgs/misc/vim-plugins @jonringer @softinio
pkgs/applications/editors/neovim/utils.nix+3−4
@@ -35,7 +35,7 @@ let
3535
3636 # for forward compability, when adding new environments, haskell etc.
3737 , ...
38− }:
38+ }@args:
3939 let
4040 rubyEnv = bundlerEnv {
4141 name = "neovim-ruby-env";
@@ -99,7 +99,7 @@ let
9999 manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
100100 neovimRcContent = vimUtils.vimrcContent configure;
101101 in
102− {
102+ args // {
103103 wrapperArgs = makeWrapperArgs;
104104 inherit neovimRcContent;
105105 inherit manifestRc;
@@ -142,8 +142,7 @@ let
142142 extraPythonPackages = compatFun extraPythonPackages;
143143 inherit withPython3;
144144 extraPython3Packages = compatFun extraPython3Packages;
145− inherit withNodeJs withRuby;
146−
145+ inherit withNodeJs withRuby viAlias vimAlias;
147146 inherit configure;
148147 };
149148 in