neovim: restore neovim.override

the compatibility layer for `wrapNeovim` introduced in https://github.com/NixOS/nixpkgs/pull/101265
broke the recommended way of configuration:
https://nixos.org/manual/nixpkgs/stable/#custom-configuration
https://nixos.wiki/wiki/Vim#Customizations

restore the old ways.
This commit is contained in:
Matthieu Coudron 2020-10-31 15:52:24 +01:00
parent 95702fe6d2
commit db157224ef

View file

@ -23984,7 +23984,7 @@ in
# more usecases when wrapping neovim. The interface is being actively worked on # more usecases when wrapping neovim. The interface is being actively worked on
# so expect breakage. use wrapNeovim instead if you want a stable alternative # so expect breakage. use wrapNeovim instead if you want a stable alternative
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
wrapNeovim = neovimUtils.legacyWrapper; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim { neovim-unwrapped = callPackage ../applications/editors/neovim {
lua = lua =
# neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879