diff options
author | Matthieu Coudron <mcoudron@hotmail.com> | 2022-08-09 11:54:54 +0200 |
---|---|---|
committer | Matthieu Coudron <mcoudron@hotmail.com> | 2022-08-09 16:21:59 +0200 |
commit | b4d8662c4a479b7641d28fe866b018adf8d8f2e1 (patch) | |
tree | 276a41804b6f77dad44dd110264961bd99f239cc /pkgs/applications/editors/neovim | |
parent | 6bc1f400f4773244df5a00853d555ae2332571c6 (diff) | |
download | nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar.gz nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar.bz2 nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar.lz nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar.xz nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.tar.zst nixlib-b4d8662c4a479b7641d28fe866b018adf8d8f2e1.zip |
neovimUtils.makeNeovimConfig: remove mention of python2
latest neovim stopped supporting python2. We have an ellipsis as input so this should not cause any further error
Diffstat (limited to 'pkgs/applications/editors/neovim')
-rw-r--r-- | pkgs/applications/editors/neovim/utils.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 16895e73518c..44c8392df480 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -22,11 +22,7 @@ let anymore, $MYVIMRC wont be set etc */ makeNeovimConfig = - { - withPython2 ? false - /* the function you would have passed to python.withPackages */ - , extraPython2Packages ? (_: [ ]) - , withPython3 ? true + { withPython3 ? true /* the function you would have passed to python3.withPackages */ , extraPython3Packages ? (_: [ ]) , withNodeJs ? false @@ -122,7 +118,6 @@ let # we call vimrcContent without 'packages' to avoid the init.vim generation neovimRcContent = vimUtils.vimrcContent ({ beforePlugins = ""; customRC = pluginRC + customRC; packages = null; }); in - assert withPython2 -> throw "Python2 support has been removed from neovim, please remove withPython2 and extraPython2Packages."; builtins.removeAttrs args ["plugins"] // { wrapperArgs = makeWrapperArgs; @@ -145,7 +140,6 @@ let # to keep backwards compatibility for people using neovim.override legacyWrapper = neovim: { extraMakeWrapperArgs ? "" - , withPython ? false /* the function you would have passed to python.withPackages */ , extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ @@ -183,8 +177,6 @@ let inherit extraName; }; in - assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; - wrapNeovimUnstable neovim (res // { wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs; wrapRc = (configure != {}); |