neovim: 0.2.0 -> 0.2.1

* neovimLibvterm: 5a748f97 -> 4ca7ebf7
* neovim ruby: 0.5.0 -> 0.5.1
* pythonPackages.neovim: 0.1.13 -> 0.2.0
* libmpack: 1.0.3-rev80bd55ea6 -> 1.0.5
* luaPackages.mpack: switched to new source location, 1.0.7_ef025224a7
* only one set of lua packages, switched to luajit

pkgs/top-level/lua-packages.nix

@@ -614,12 +614,16 @@ let
   };
 
   mpack = buildLuaPackage rec {
-    name = "lua-mpack-${libmpack.version}";
+    name = "lua-mpack-${version}";
+    version = "1.0.7_${rev}";
+    rev = "ef025224a799066b818120fb1f30a308543a6e99";
 
-    # NOTE: For updating, new Lua mpack bindings live at:
-    # https://github.com/libmpack/libmpack-lua.
-    src = libmpack.src;
-    sourceRoot = "${src.name}/binding/lua";
+    src = fetchFromGitHub {
+      owner = "libmpack";
+      repo = "libmpack-lua";
+      inherit rev;
+      sha256 = "1nydi6xbmxwl1fmi32v5v8n74msnmzblzqaqnb102w6vkinampsb";
+    };
 
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libmpack ]; # ++ [ libtool lua ];
@@ -627,19 +631,19 @@ let
 
     preInstall = ''
       mkdir -p $out/lib/lua/${lua.luaversion}
+      export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${libmpack}
     '';
 
     NIX_CFLAGS_COMPILE = "-Wno-error -fpic";
 
     installFlags = [
       "USE_SYSTEM_LUA=yes"
-      "LUA_VERSION_MAJ_MIN="
+      "USE_SYSTEM_MPACK=yes"
+      "MPACK_LUA_VERSION=${(builtins.parseDrvName lua.name).version}"
+      "LUA_INCLUDE=-I${lua}/include"
       "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
     ];
 
-    # gcc -llua fails with luajit.
-    disabled = isLuaJIT;
-
     meta = with stdenv.lib; {
       description = "Lua bindings for libmpack";
       homepage = "https://github.com/libmpack/libmpack-lua";