neovim: 0.1.3 -> 0.1.4

* removing luaMessagePack (only used by neovim)
* using libmpack (updated to latest master since they fixed a lot of packaging
  issues)
* package libmpack lua bidnings
* neovim expression now excepts luaPackages as an input and not individual
  lua packages (to avoid depending on different lua version)
This commit is contained in:
Rok Garbas
2016-06-04 17:58:01 +02:00
parent 3204c2753d
commit f878018ece
4 changed files with 52 additions and 41 deletions
+24 -18
View File
@@ -8,7 +8,7 @@
{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
, fetchFromGitHub
, fetchFromGitHub, libmpack
}:
let
@@ -101,7 +101,7 @@ let
preBuild = ''
makeFlagsArray=(
LUA_LDIR="$out/share/lua/${lua.luaversion}"
lua_ldir="$out/share/lua/${lua.luaversion}"
LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}"
EXPAT_INC="-I${expat.dev}/include");
'';
@@ -363,22 +363,6 @@ let
};
};
luaMessagePack = buildLuaPackage rec {
name = "lua-MessagePack-${version}";
version = "0.3.1";
src = fetchzip {
url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz";
sha256 = "1xlif8fkwd8bb78wrvf2z309p7apms350lbg6qavylsvz57lkjm6";
};
buildInputs = [ unzip ];
meta = {
homepage = "http://fperrad.github.io/lua-MessagePack/index.html";
hydraPlatforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
};
};
lgi = stdenv.mkDerivation rec {
name = "lgi-${version}";
version = "0.7.2";
@@ -405,6 +389,28 @@ let
'';
};
mpack = buildLuaPackage rec {
name = "lua-mpack-${libmpack.version}";
src = libmpack.src;
sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua";
buildInputs = [ libmpack ]; #libtool lua pkgconfig ];
dontBuild = true;
preInstall = ''
mkdir -p $out/lib/lua/${lua.luaversion}
'';
installFlags = [
"USE_SYSTEM_LUA=yes"
"LUA_VERSION_MAJ_MIN="
"LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
];
meta = {
description = "Simple implementation of msgpack in C Lua 5.1";
homepage = "https://github.com/tarruda/libmpack";
hydraPlatforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
};
};
vicious = stdenv.mkDerivation rec {
name = "vicious-${version}";
version = "2.1.3";