Merge pull request #62751 from teto/luazlib
Luazlib renamed to lua-zlib + update + move to generated
This commit is contained in:
commit
8b3d0b00d5
@ -1,46 +1,47 @@
|
||||
# nix name, luarocks name, server, version,luaversion
|
||||
ansicolors,,,,
|
||||
argparse,,,,
|
||||
basexx,,,,
|
||||
binaryheap,,,,
|
||||
digestif,,http://luarocks.org/dev,,lua5_3
|
||||
dkjson,,,,
|
||||
fifo,,,,
|
||||
http,,,,
|
||||
inspect,,,,
|
||||
ldoc,,,,
|
||||
lgi,,,,
|
||||
lpeg_patterns,,,,
|
||||
lpeglabel,,,,
|
||||
lpty,,,,
|
||||
lrexlib-gnu,,,,
|
||||
lrexlib-posix,,,,
|
||||
ltermbox,,,,
|
||||
cjson,lua-cjson,,,
|
||||
lua-cmsgpack,,,,
|
||||
lua_cliargs,,,,
|
||||
lua-iconv,,,,
|
||||
lua-lsp,,http://luarocks.org/dev,,
|
||||
lua-messagepack,,,,
|
||||
lua-term,,,,
|
||||
lua-toml,,,,
|
||||
luabitop,,,,
|
||||
luaevent,,,,
|
||||
luacheck,,,,
|
||||
luaffi,,http://luarocks.org/dev,,
|
||||
luazip,,,,
|
||||
luuid,,,,
|
||||
markdown,,,,
|
||||
penlight,,,,
|
||||
rapidjson,,,,
|
||||
say,,,,
|
||||
std__debug,std._debug,,,
|
||||
std_normalize,std.normalize,,,
|
||||
luv,,,,
|
||||
luasystem,,,,
|
||||
mediator_lua,,http://luarocks.org/manifests/teto,,
|
||||
mpack,,http://luarocks.org/manifests/teto,,
|
||||
nvim-client,,,,
|
||||
busted,,http://luarocks.org/manifests/teto,,
|
||||
luassert,,,,
|
||||
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,
|
||||
# nix name, luarocks name, server, version,luaversion,maintainers
|
||||
ansicolors,,,,,
|
||||
argparse,,,,,
|
||||
basexx,,,,,
|
||||
binaryheap,,,,,vcunat
|
||||
digestif,,http://luarocks.org/dev,,lua5_3,
|
||||
dkjson,,,,,
|
||||
fifo,,,,,
|
||||
http,,,,,
|
||||
inspect,,,,,
|
||||
ldoc,,,,,
|
||||
lgi,,,,,
|
||||
lpeg_patterns,,,,,
|
||||
lpeglabel,,,,,
|
||||
lpty,,,,,
|
||||
lrexlib-gnu,,,,,
|
||||
lrexlib-posix,,,,,
|
||||
ltermbox,,,,,
|
||||
cjson,lua-cjson,,,,
|
||||
lua-cmsgpack,,,,,
|
||||
lua_cliargs,,,,,
|
||||
lua-iconv,,,,,
|
||||
lua-lsp,,http://luarocks.org/dev,,,
|
||||
lua-messagepack,,,,,
|
||||
lua-term,,,,,
|
||||
lua-toml,,,,,
|
||||
lua-zlib,,,,,koral
|
||||
luabitop,,,,,
|
||||
luaevent,,,,,
|
||||
luacheck,,,,,
|
||||
luaffi,,http://luarocks.org/dev,,,
|
||||
luazip,,,,,
|
||||
luuid,,,,,
|
||||
markdown,,,,,
|
||||
penlight,,,,,
|
||||
rapidjson,,,,,
|
||||
say,,,,,
|
||||
std__debug,std._debug,,,,
|
||||
std_normalize,std.normalize,,,,
|
||||
luv,,,,,
|
||||
luasystem,,,,,
|
||||
mediator_lua,,http://luarocks.org/manifests/teto,,,
|
||||
mpack,,http://luarocks.org/manifests/teto,,,
|
||||
nvim-client,,,,,
|
||||
busted,,http://luarocks.org/manifests/teto,,,
|
||||
luassert,,,,,
|
||||
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,,
|
||||
|
|
@ -528,6 +528,25 @@ lua-toml = buildLuarocksPackage {
|
||||
};
|
||||
};
|
||||
};
|
||||
lua-zlib = buildLuarocksPackage {
|
||||
pname = "lua-zlib";
|
||||
version = "1.2-0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://luarocks.org/lua-zlib-1.2-0.src.rock;
|
||||
sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2";
|
||||
};
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/brimworks/lua-zlib";
|
||||
description = "Simple streaming interface to zlib for Lua.";
|
||||
license = {
|
||||
fullName = "MIT";
|
||||
};
|
||||
};
|
||||
};
|
||||
luabitop = buildLuarocksPackage {
|
||||
pname = "luabitop";
|
||||
version = "1.0.2-3";
|
||||
|
@ -32,6 +32,10 @@ with super;
|
||||
lrexlib-gnu = super.lrexlib-gnu.override({
|
||||
buildInputs = [ pkgs.gnulib ];
|
||||
});
|
||||
lua-zlib = super.lua-zlib.override({
|
||||
buildInputs = [ pkgs.zlib.dev ];
|
||||
disabled=luaOlder "5.1" || luaAtLeast "5.4";
|
||||
});
|
||||
luaevent = super.luaevent.override({
|
||||
buildInputs = with pkgs; [ libevent.dev libevent ];
|
||||
propagatedBuildInputs = [ luasocket ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
|
||||
, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec
|
||||
, harfbuzz, icu, lpeg, luaexpat, lua-zlib, luafilesystem, luasocket, luasec
|
||||
, fontconfig, lua, libiconv
|
||||
, makeFontsConf, gentium, gentium-book-basic, dejavu_fonts
|
||||
}:
|
||||
@ -8,7 +8,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
libs = [ lpeg luaexpat luazlib luafilesystem luasocket luasec ];
|
||||
libs = [ lpeg luaexpat lua-zlib luafilesystem luasocket luasec ];
|
||||
getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
|
||||
getLuaPath = lib : getPath lib "lua";
|
||||
getLuaCPath = lib : getPath lib "so";
|
||||
|
@ -5838,7 +5838,7 @@ in
|
||||
silc_server = callPackage ../servers/silc-server { };
|
||||
|
||||
sile = callPackage ../tools/typesetting/sile {
|
||||
inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec;
|
||||
inherit (lua52Packages) lua luaexpat lua-zlib luafilesystem lpeg luasocket luasec;
|
||||
};
|
||||
|
||||
silver-searcher = callPackage ../tools/text/silver-searcher { };
|
||||
|
@ -482,43 +482,6 @@ with self; {
|
||||
};
|
||||
};
|
||||
|
||||
luazlib = buildLuaPackage rec {
|
||||
name = "zlib-${version}";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brimworks";
|
||||
repo = "lua-zlib";
|
||||
rev = "v${version}";
|
||||
sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile --replace gcc cc --replace "-llua" ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(
|
||||
${platformString}
|
||||
LUAPATH="$out/share/lua/${lua.luaversion}"
|
||||
LUACPATH="$out/lib/lua/${lua.luaversion}"
|
||||
INCDIR="-I${lua}/include"
|
||||
LIBDIR="-L${lua}/lib");
|
||||
'';
|
||||
|
||||
preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple streaming interface to zlib for Lua";
|
||||
homepage = https://github.com/brimworks/lua-zlib;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
luastdlib = buildLuaPackage rec {
|
||||
name = "stdlib-${version}";
|
||||
|
Loading…
x
Reference in New Issue
Block a user