luaPackages.lua-zlib: 1.1 -> 1.2

Renamed from luazlib to luarocks name lua-zlib.
Move to generated.
This commit is contained in:
Matthieu Coudron 2019-06-06 12:00:49 +09:00
parent 7a35dcef0a
commit dbf4c8051a
6 changed files with 27 additions and 40 deletions

View File

@ -24,6 +24,7 @@ lua-lsp,,http://luarocks.org/dev,,
lua-messagepack,,,,
lua-term,,,,
lua-toml,,,,
lua-zlib,,,,
luabitop,,,,
luaevent,,,,
luacheck,,,,

1 # nix name luarocks name server version luaversion
24 lua-messagepack
25 lua-term
26 lua-toml
27 lua-zlib
28 luabitop
29 luaevent
30 luacheck

View File

@ -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";

View File

@ -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 ];

View File

@ -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";

View File

@ -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 { };

View File

@ -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}";