From db157224ef26d088b66d30b62a50f602ef526545 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 31 Oct 2020 15:52:24 +0100 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bf8bc78cab..7cf33ee0a740 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23984,7 +23984,7 @@ in # more usecases when wrapping neovim. The interface is being actively worked on # so expect breakage. use wrapNeovim instead if you want a stable alternative 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 { lua = # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879