From cc0ff183c6afe9951c8fdbf468ea26a9f6920f52 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 9 Aug 2022 14:17:19 +0200 Subject: [PATCH] neovimUtils: remove the compatibility layer introduced in 2018 removed compatFun, we need to make the code clearer --- pkgs/applications/editors/neovim/utils.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 44c8392df480..c3e41966534e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -154,10 +154,6 @@ let , extraName ? "" }: let - /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ - compatFun = funOrList: (if builtins.isList funOrList then - (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) - else funOrList); # we convert from the old configure.format to plugins = if builtins.hasAttr "plug" configure then @@ -169,7 +165,7 @@ let res = makeNeovimConfig { inherit withPython3; - extraPython3Packages = compatFun extraPython3Packages; + inherit extraPython3Packages; inherit extraLuaPackages; inherit withNodeJs withRuby viAlias vimAlias; customRC = configure.customRC or "";