Merge pull request #62756 from teto/luaposix

Luaposix and mpack updates
This commit is contained in:
Matthieu Coudron 2019-06-06 15:14:01 +09:00 committed by GitHub
commit 6cd4281c5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 75 deletions

View file

@ -29,6 +29,7 @@ luabitop,,,,,
luaevent,,,,,
luacheck,,,,,
luaffi,,http://luarocks.org/dev,,,
luaposix,,,,,vyp lblasc
luazip,,,,,
luuid,,,,,
markdown,,,,,
@ -40,7 +41,7 @@ std_normalize,std.normalize,,,,
luv,,,,,
luasystem,,,,,
mediator_lua,,http://luarocks.org/manifests/teto,,,
mpack,,http://luarocks.org/manifests/teto,,,
mpack,,,,,
nvim-client,,,,,
busted,,http://luarocks.org/manifests/teto,,,
luassert,,,,,

1 # nix name luarocks name server version luaversion maintainers
29 luaevent
30 luacheck
31 luaffi http://luarocks.org/dev
32 luaposix vyp lblasc
33 luazip
34 luuid
35 markdown
41 luv
42 luasystem
43 mediator_lua http://luarocks.org/manifests/teto
44 mpack http://luarocks.org/manifests/teto
45 nvim-client
46 busted http://luarocks.org/manifests/teto
47 luassert

View file

@ -633,6 +633,25 @@ luaffi = buildLuarocksPackage {
};
};
};
luaposix = buildLuarocksPackage {
pname = "luaposix";
version = "34.0.4-1";
src = fetchurl {
url = https://luarocks.org/luaposix-34.0.4-1.src.rock;
sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ bit32 lua std_normalize ];
meta = {
homepage = "http://github.com/luaposix/luaposix/";
description = "Lua bindings for POSIX";
license = {
fullName = "MIT/X11";
};
};
};
luazip = buildLuarocksPackage {
pname = "luazip";
version = "1.2.7-1";
@ -857,11 +876,17 @@ mpack = buildLuarocksPackage {
pname = "mpack";
version = "1.0.7-0";
knownRockspec = (fetchurl {
url = https://luarocks.org/mpack-1.0.7-0.rockspec;
sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz";
}).outPath;
src = fetchurl {
url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock;
sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7";
url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz;
sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8";
};
meta = {
homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz";
description = "Lua binding to libmpack";

View file

@ -345,40 +345,6 @@ with self; {
};
};
luaposix = buildLuaPackage rec {
name = "posix-${version}";
version = "34.0.4";
src = fetchFromGitHub {
owner = "luaposix";
repo = "luaposix";
rev = "release-v${version}";
sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z";
};
propagatedBuildInputs = [ std_normalize bit32 ];
buildPhase = ''
${lua}/bin/lua build-aux/luke \
package="luaposix" \
version="${version}"
'';
installPhase = ''
${lua}/bin/lua build-aux/luke install --quiet \
INST_LIBDIR="$out/lib/lua/${lua.luaversion}" \
INST_LUADIR="$out/share/lua/${lua.luaversion}"
'';
meta = with stdenv.lib; {
description = "Lua bindings for POSIX API";
homepage = "https://github.com/luaposix/luaposix";
license = licenses.mit;
maintainers = with maintainers; [ vyp lblasc ];
platforms = platforms.unix;
};
};
luasec = buildLuaPackage rec {
name = "sec-0.8";
@ -620,44 +586,6 @@ with self; {
};
};
mpack = buildLuaPackage rec {
name = "mpack-${version}";
version = "1.0.7";
src = fetchFromGitHub {
owner = "libmpack";
repo = "libmpack-lua";
rev = version;
sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libmpack ];
dontBuild = true;
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
'';
installFlags = [
"USE_SYSTEM_LUA=yes"
"USE_SYSTEM_MPACK=yes"
"MPACK_LUA_VERSION=${lua.version}"
"LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}"
];
hardeningDisable = [ "fortify" ];
meta = with stdenv.lib; {
description = "Lua bindings for libmpack";
homepage = "https://github.com/libmpack/libmpack-lua";
license = licenses.mit;
maintainers = with maintainers; [ vyp ];
platforms = with platforms; linux ++ darwin;
};
};
vicious = toLuaModule(stdenv.mkDerivation rec {
name = "vicious-${version}";
version = "2.3.1";