git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110837 from rvolosatovs/update/neovim

neovim: 0.4.4 -> 0.5.0

commita143a6dd34cd72fe24962988c7eccb97b1173fac authorBernardo Meurer <bernardo@meurer.org> dateFri 2 Jul 2021, 11:54 (5 years ago) parent920b9f258ba227
2 files changed+6−6
compare with master
unifiedsplit
pkgs/applications/editors/neovim/default.nix+5−2 pkgs/top-level/all-packages.nix+1−4
pkgs/applications/editors/neovim/default.nix+5−2
@@ -2,6 +2,7 @@
22, libuv, lua, ncurses, pkg-config
33, unibilium, xsel, gperf
44, libvterm-neovim
5+, tree-sitter
56, glibcLocales ? null, procps ? null
67
78# now defaults to false because some tests can be flaky (clipboard etc)
@@ -31,13 +32,13 @@ let
3132in
3233 stdenv.mkDerivation rec {
3334 pname = "neovim-unwrapped";
34− version = "0.4.4";
35+ version = "0.5.0";
3536
3637 src = fetchFromGitHub {
3738 owner = "neovim";
3839 repo = "neovim";
3940 rev = "v${version}";
40− sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m";
41+ sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";
4142 };
4243
4344 patches = [
@@ -58,6 +59,7 @@ in
5859 msgpack
5960 ncurses
6061 neovimLuaEnv
62+ tree-sitter
6163 unibilium
6264 ] ++ optional stdenv.isDarwin libiconv
6365 ++ optionals doCheck [ glibcLocales procps ]
@@ -96,6 +98,7 @@ in
9698 "-DGPERF_PRG=${gperf}/bin/gperf"
9799 "-DLUA_PRG=${neovimLuaEnv.interpreter}"
98100 "-DLIBLUV_LIBRARY=${luvpath}"
101+ "-DUSE_BUNDLED=OFF"
99102 ]
100103 ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
101104 ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
pkgs/top-level/all-packages.nix+1−4
@@ -27446,10 +27446,7 @@ in
2744627446 wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
2744727447 wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
2744827448 neovim-unwrapped = callPackage ../applications/editors/neovim {
27449− lua =
27450− # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879
27451− if stdenv.isAarch64 then lua5_1 else
27452− luajit;
27449+ lua = luajit;
2745327450 };
2745427451
2745527452 neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };