about summary refs log tree commit diff
path: root/pkgs/applications/editors/vim
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2022-08-06 22:41:58 +0200
committerMatthieu Coudron <mcoudron@hotmail.com>2022-08-09 16:21:59 +0200
commit6bc1f400f4773244df5a00853d555ae2332571c6 (patch)
tree4953fef4560b2633360309b6cd4d183c683b6573 /pkgs/applications/editors/vim
parentcda1f8ae46869c429971323717d622d5b17d9854 (diff)
downloadnixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar.gz
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar.bz2
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar.lz
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar.xz
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.tar.zst
nixlib-6bc1f400f4773244df5a00853d555ae2332571c6.zip
update requirePlugins
Diffstat (limited to 'pkgs/applications/editors/vim')
-rw-r--r--pkgs/applications/editors/vim/plugins/vim-utils.nix19
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix
index 2f2e7cc00cb5..d11d638f4a02 100644
--- a/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@@ -409,25 +409,20 @@ rec {
   # used to figure out which python dependencies etc. neovim needs
   requiredPlugins = {
     packages ? {},
-    givenKnownPlugins ? null,
-    vam ? null,
-    pathogen ? null,
     plug ? 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;
-      vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries));
-      nonNativePlugins = (lib.optionals (vam != null) vamPlugins)
-                      ++ (lib.optionals (plug != null) plug.plugins);
       nativePluginsConfigs = lib.attrsets.attrValues packages;
-      nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs;
+      nonNativePlugins = (lib.optionals (plug != null) plug.plugins);
+      nativePlugins = lib.concatMap (requiredPluginsForPackage) nativePluginsConfigs;
     in
       nativePlugins ++ nonNativePlugins;
 
+
+  # figures out which python dependencies etc. is needed for one vim package
+  requiredPluginsForPackage = { start ? [], opt ? []}:
+    start ++ opt;
+
   toVimPlugin = drv:
     drv.overrideAttrs(oldAttrs: {
       # dont move the "doc" folder since vim expects it