diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b4835064f9..bfa7e8e2009 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -2,6 +2,7 @@ , libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim +, tree-sitter , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc) @@ -31,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; + sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; }; patches = [ @@ -58,6 +59,7 @@ in msgpack ncurses neovimLuaEnv + tree-sitter unibilium ] ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -96,6 +98,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DLIBLUV_LIBRARY=${luvpath}" + "-DUSE_BUNDLED=OFF" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6961be94b8..f9cb868165b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27446,10 +27446,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; 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 - if stdenv.isAarch64 then lua5_1 else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };