diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-09-23 22:15:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 22:15:01 +0900 |
| commit | 60f3c94965f036c9afa6284f99eb13d794bd3057 (patch) | |
| tree | 9c74152abea41bdc187fc9736d495ed304f57af8 /pkgs/applications/editors/neovim | |
| parent | 5b387aa676c362345c0902c9da91f5bf86511f54 (diff) | |
| parent | 824869c3fc01bb2081d2e41206156fd91ee37557 (diff) | |
| download | nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar.gz nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar.bz2 nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar.lz nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar.xz nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.tar.zst nixlib-60f3c94965f036c9afa6284f99eb13d794bd3057.zip | |
Merge pull request #68882 from rvolosatovs/update/neovim
Neovim: 0.3.8 -> 0.4.2
Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 7d558dfb8937..6808d7115c57 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let neovimLuaEnv = lua.withPackages(ps: - (with ps; [ mpack lpeg luabitop ] + (with ps; [ lpeg luabitop mpack ] ++ optionals doCheck [ nvim-client luv coxpcall busted luafilesystem penlight inspect ] @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.3.8"; + version = "0.4.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; + sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"; }; patches = [ @@ -41,14 +41,15 @@ in enableParallelBuilding = true; buildInputs = [ + gperf libtermkey libuv + libvterm-neovim + lua.pkgs.luv.libluv msgpack ncurses - libvterm-neovim - unibilium - gperf neovimLuaEnv + unibilium ] ++ optional withJemalloc jemalloc ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -77,8 +78,9 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DGPERF_PRG=${gperf}/bin/gperf" + "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" + "-DLUA_PRG=${neovimLuaEnv.interpreter}" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" |