BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #24353 from edanaher/fix-vim-knownplugins

Browse source 
vim-utils: Handle overriding knownPlugins betters.
This commit is contained in:
Jude Taylor 2017-03-28 14:08:35 -07:00 committed by GitHub
commit 7ebc75a9a6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/misc/vim-plugins/vim-utils.nix
View file

@ -412,11 +412,16 @@ rec {
} // a);
requiredPlugins = {
knownPlugins ? vimPlugins,
givenKnownPlugins ? null,
vam ? null,
pathogen ? null, ...
}:
let
# This is probably overcomplicated, but I don't understand this well enough to know what's necessary.
knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else
if vam != null && vam ? knownPlugins then vam.knownPlugins else
if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
vimPlugins;
pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
names = (lib.optionals (pathogen != null) pathogenNames) ++