public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102605 from teto/vimAlias

Browse Source 
neovim: take into account vi(m)Alias
This commit is contained in:
Matthieu Coudron
2020-11-03 11:41:03 +01:00
committed by GitHub
parent c0d9244cc0 cd6040869a
commit 72c32ad3d7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+1
View File
@@ -178,6 +178,7 @@
# Neovim # Neovim
/pkgs/applications/editors/neovim @jonringer /pkgs/applications/editors/neovim @jonringer
/pkgs/applications/editors/neovim @teto
# VimPlugins # VimPlugins
/pkgs/misc/vim-plugins @jonringer @softinio /pkgs/misc/vim-plugins @jonringer @softinio
pkgs/applications/editors/neovim/utils.nix
+3 -4
View File
@@ -35,7 +35,7 @@ let
# for forward compability, when adding new environments, haskell etc. # for forward compability, when adding new environments, haskell etc.
, ... , ...
}: }@args:
let let
rubyEnv = bundlerEnv { rubyEnv = bundlerEnv {
name = "neovim-ruby-env"; name = "neovim-ruby-env";
@@ -99,7 +99,7 @@ let
manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
neovimRcContent = vimUtils.vimrcContent configure; neovimRcContent = vimUtils.vimrcContent configure;
in in
{ args // {
wrapperArgs = makeWrapperArgs; wrapperArgs = makeWrapperArgs;
inherit neovimRcContent; inherit neovimRcContent;
inherit manifestRc; inherit manifestRc;
@@ -142,8 +142,7 @@ let
extraPythonPackages = compatFun extraPythonPackages; extraPythonPackages = compatFun extraPythonPackages;
inherit withPython3; inherit withPython3;
extraPython3Packages = compatFun extraPython3Packages; extraPython3Packages = compatFun extraPython3Packages;
inherit withNodeJs withRuby; inherit withNodeJs withRuby viAlias vimAlias;
inherit configure; inherit configure;
}; };
in in