Merge pull request #68882 from rvolosatovs/update/neovim

Neovim: 0.3.8 -> 0.4.2
This commit is contained in:
Matthieu Coudron 2019-09-23 22:15:01 +09:00 committed by GitHub
commit 60f3c94965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 11 deletions

View file

@ -13,7 +13,7 @@ with stdenv.lib;
let let
neovimLuaEnv = lua.withPackages(ps: neovimLuaEnv = lua.withPackages(ps:
(with ps; [ mpack lpeg luabitop ] (with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [ ++ optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect nvim-client luv coxpcall busted luafilesystem penlight inspect
] ]
@ -21,13 +21,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neovim-unwrapped"; pname = "neovim-unwrapped";
version = "0.3.8"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "neovim"; repo = "neovim";
rev = "v${version}"; rev = "v${version}";
sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss";
}; };
patches = [ patches = [
@ -41,14 +41,15 @@ in
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
gperf
libtermkey libtermkey
libuv libuv
libvterm-neovim
lua.pkgs.luv.libluv
msgpack msgpack
ncurses ncurses
libvterm-neovim
unibilium
gperf
neovimLuaEnv neovimLuaEnv
unibilium
] ++ optional withJemalloc jemalloc ] ++ optional withJemalloc jemalloc
++ optional stdenv.isDarwin libiconv ++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ] ++ optionals doCheck [ glibcLocales procps ]
@ -77,8 +78,9 @@ in
disallowedReferences = [ stdenv.cc ]; disallowedReferences = [ stdenv.cc ];
cmakeFlags = [ cmakeFlags = [
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DGPERF_PRG=${gperf}/bin/gperf" "-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 doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libvterm-neovim"; pname = "libvterm-neovim";
version = "2018-11-26"; version = "2019-08-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "libvterm"; repo = "libvterm";
rev = "f600f523545b7d4018ebf320e3273795dbe43c8a"; rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b"; sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
}; };
buildInputs = [ perl ]; buildInputs = [ perl ];
@ -27,7 +27,7 @@ stdenv.mkDerivation {
description = "VT220/xterm/ECMA-48 terminal emulator library"; description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/; homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ rvolosatovs ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -276,8 +276,19 @@ with super;
propagatedBuildInputs = [ propagatedBuildInputs = [
pkgs.libuv pkgs.libuv
]; ];
passthru = {
libluv = self.luv.override({
preBuild = self.luv.preBuild + ''
sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
'';
});
};
}); });
rapidjson = super.rapidjson.override({ rapidjson = super.rapidjson.override({
preBuild = '' preBuild = ''
sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt