@@ -4,7 +4,6 @@
44, neovim-unwrapped
55, bundlerEnv
66, ruby
7−, pythonPackages
87, python3Packages
98, writeText
109, wrapNeovimUnstable
@@ -48,12 +47,6 @@ let
4847 requiredPlugins = vimUtils.requiredPlugins configure;
4948 getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
5049
51− pluginPython2Packages = getDeps "pythonDependencies" requiredPlugins;
52− python2Env = pythonPackages.python.withPackages (ps:
53− [ ps.pynvim ]
54− ++ (extraPython2Packages ps)
55− ++ (lib.concatMap (f: f ps) pluginPython2Packages));
56−
5750 pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
5851 python3Env = python3Packages.python.withPackages (ps:
5952 [ ps.pynvim ]
@@ -69,7 +62,6 @@ let
6962 # While the latter tells nvim that this provider is not available
7063 hostprog_check_table = {
7164 node = withNodeJs;
72− python = withPython2;
7365 python3 = withPython3;
7466 ruby = withRuby;
7567 };
@@ -99,11 +91,12 @@ let
9991 manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
10092 neovimRcContent = vimUtils.vimrcContent configure;
10193 in
94+ assert withPython2 -> throw "Python2 support has been removed from neovim, please remove withPython2 and extraPython2Packages.";
95+
10296 args // {
10397 wrapperArgs = makeWrapperArgs;
10498 inherit neovimRcContent;
10599 inherit manifestRc;
106− inherit python2Env;
107100 inherit python3Env;
108101 inherit withNodeJs;
109102 } // lib.optionalAttrs withRuby {
@@ -120,7 +113,7 @@ let
120113 # to keep backwards compatibility
121114 legacyWrapper = neovim: {
122115 extraMakeWrapperArgs ? ""
123− , withPython ? true
116+ , withPython ? false
124117 /* the function you would have passed to python.withPackages */
125118 , extraPythonPackages ? (_: [])
126119 /* the function you would have passed to python.withPackages */
@@ -138,14 +131,14 @@ let
138131 else funOrList);
139132
140133 res = makeNeovimConfig {
141− withPython2 = withPython;
142− extraPythonPackages = compatFun extraPythonPackages;
143134 inherit withPython3;
144135 extraPython3Packages = compatFun extraPython3Packages;
145136 inherit withNodeJs withRuby viAlias vimAlias;
146137 inherit configure;
147138 };
148139 in
140+ assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages.";
141+
149142 wrapNeovimUnstable neovim (res // {
150143 wrapperArgs = lib.escapeShellArgs (
151144 res.wrapperArgs ++ lib.optionals (configure != {}) [