3 files changed, 49 insertions, 26 deletions
diff --git a/development/neovim/README b/development/neovim/README
index f5294d4ff6..f20d90a7a8 100644
--- a/development/neovim/README
+++ b/development/neovim/README
@@ -9,5 +9,3 @@ Optional run-time dependencies:
 * python3-neovim and python2-neovim: for python 3/2 plugin support;
 * xclip or xsel: for X11 clipboard support;
 * wl-clipboard: for clipboard support on wayland
-
-lua, lua-mpack, lua-lpeg, LuaBitOp are needed only at build time.
diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild
index 09b6b4a417..2fc53993eb 100644
--- a/development/neovim/neovim.SlackBuild
+++ b/development/neovim/neovim.SlackBuild
@@ -27,11 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=neovim
-VERSION=${VERSION:-0.9.5}
-LuaJIT=03c31124cc3b521ef54fe398e10fa55660a5057d
-luv="1.45.0-0"
-luacompat53="0.9"
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.10.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -77,12 +74,25 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 mkdir -p $PRGNAM-$VERSION/.deps/build/src
 
 cd $PRGNAM-$VERSION/.deps/build/src
-tar xvf $CWD/LuaJIT-$LuaJIT.tar.gz
-mv LuaJIT-$LuaJIT luajit
-tar xvf $CWD/luv-$luv.tar.gz
-mv luv-$luv luv
-tar xvf $CWD/lua-compat-5.3-$luacompat53.tar.gz
-mv lua-compat-5.3-$luacompat53 lua-compat-5.3
+for d in LuaJIT-*.tar.gz luv-*.tar.gz lua-compat-5.3-*.tar.gz \
+  tree-sitter-bash-*.tar.gz tree-sitter-c-*.tar.gz \
+  tree-sitter-lua-*.tar.gz tree-sitter-markdown-*.tar.gz \
+  tree-sitter-python-*.tar.gz tree-sitter-query-*.tar.gz \
+  tree-sitter-vimdoc-*.tar.gz tree-sitter-vim-*.tar.gz
+do
+  tar xvf $CWD/$d
+done
+mv LuaJIT-* luajit
+mv luv-* luv
+mv lua-compat-5.3-* lua_compat53
+mv tree-sitter-bash-* treesitter_bash
+mv tree-sitter-c-* treesitter_c
+mv tree-sitter-lua-* treesitter_lua
+mv tree-sitter-markdown-* treesitter_markdown
+mv tree-sitter-python-* treesitter_python
+mv tree-sitter-query-* treesitter_query
+mv tree-sitter-vimdoc-* treesitter_vimdoc
+mv tree-sitter-vim-* treesitter_vim
 
 cd $TMP/$PRGNAM-$VERSION
 
@@ -103,12 +113,11 @@ make \
     -DUSE_EXISTING_SRC_DIR=ON \
     -DUSE_BUNDLED=OFF \
     -DUSE_BUNDLED_LUV=ON \
-    -DUSE_BUNDLED_LUAJIT=ON" \
+    -DUSE_BUNDLED_LUAJIT=ON \
+    -DUSE_BUNDLED_TS_PARSERS=ON" \
   CMAKE_BUILD_TYPE=Release
 make install DESTDIR=$PKG
 
-rmdir $PKG/usr/lib${LIBDIRSUFFIX}/nvim $PKG/usr/lib${LIBDIRSUFFIX}
-
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info
index cc1632f7d2..fb656b64e7 100644
--- a/development/neovim/neovim.info
+++ b/development/neovim/neovim.info
@@ -1,16 +1,32 @@
 PRGNAM="neovim"
-VERSION="0.9.5"
+VERSION="0.10.0"
 HOMEPAGE="https://neovim.io"
-DOWNLOAD="https://github.com/neovim/neovim/archive/v0.9.5/neovim-0.9.5.tar.gz \
-          https://github.com/LuaJIT/LuaJIT/archive/03c3112/LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz \
-          https://github.com/luvit/luv/archive/1.45.0-0/luv-1.45.0-0.tar.gz \
-          https://github.com/keplerproject/lua-compat-5.3/archive/v0.9/lua-compat-5.3-0.9.tar.gz"
-MD5SUM="106932337799a21cf8d28d488c7fc702 \
-        b795ec5d435b01e00d8378ace040c382 \
-        dacbb69541c8d30705c5bb138cd204e0 \
-        7c0530123479804e40971b069ea6b0da"
+DOWNLOAD="https://github.com/neovim/neovim/archive/v0.10.0/neovim-0.10.0.tar.gz \
+          https://github.com/LuaJIT/LuaJIT/archive/75e9277/LuaJIT-75e92777988017fe47c5eb290998021bbf972d1f.tar.gz \
+          https://github.com/luvit/luv/archive/1.48.0-2/luv-1.48.0-2.tar.gz \
+          https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13/lua-compat-5.3-0.13.tar.gz \
+          https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0/tree-sitter-bash-0.21.0.tar.gz \
+          https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0/tree-sitter-c-0.21.0.tar.gz \
+          https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0/tree-sitter-lua-0.1.0.tar.gz \
+          https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3/tree-sitter-markdown-0.2.3.tar.gz \
+          https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0/tree-sitter-python-0.21.0.tar.gz \
+          https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0/tree-sitter-query-0.3.0.tar.gz \
+          https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1/tree-sitter-vimdoc-2.5.1.tar.gz \
+          https://github.com/neovim/tree-sitter-vim/archive/v0.4.0/tree-sitter-vim-0.4.0.tar.gz"
+MD5SUM="b5ad54391b6a1a30930c1ab392d506ec \
+        aee865a769321f40b28067c3568e92ef \
+        8efb4574249415a888a4197468529a9b \
+        4b53edbd6222230a50f58ca8f9a98d18 \
+        3afd19bcf08cfbc16a8d0ab8d6b59967 \
+        88647250b19636fe4d1a99456674d69a \
+        14eff66b003bb77623f111fe3528f224 \
+        b6ea171a2c434992d9ddb965361513c2 \
+        229538336d4d052c301ea63cd33c8486 \
+        f50c1885b101d392b106dac75bb0536e \
+        74b91692ada89a1e5904bc4d5f60943f \
+        8f3d1c3319673e20b83da6c23962dc45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua-mpack lua-lpeg LuaBitOp msgpack-c-c libtermkey libvterm tree-sitter"
+REQUIRES="lua-lpeg msgpack-c-c libtermkey libvterm tree-sitter"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"