diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 02966703f44..e80e3f08f7d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -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,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1cf47fe2222..c2a1e36cd7b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -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"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bc8d6313579..83ec4cdb4e6 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -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";