Merge #43141: lua-5.3 and lpeg updates
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
|
||||
let
|
||||
isLua52 = lua.luaversion == "5.2";
|
||||
isLua53 = lua.luaversion == "5.3";
|
||||
isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
|
||||
|
||||
platformString =
|
||||
@@ -82,6 +83,8 @@ let
|
||||
|
||||
buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
|
||||
|
||||
disabled = isLua53;
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile --replace 10.4 10.5
|
||||
'';
|
||||
@@ -219,7 +222,7 @@ let
|
||||
EXPAT_INC="-I${expat.dev}/include");
|
||||
'';
|
||||
|
||||
disabled = isLuaJIT;
|
||||
disabled = isLua53 || isLuaJIT;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SAX XML parser based on the Expat library";
|
||||
@@ -499,7 +502,7 @@ let
|
||||
patches = [ ../development/lua-modules/zip.patch ];
|
||||
|
||||
# Does not currently work under Lua 5.2 or LuaJIT.
|
||||
disabled = isLua52 || isLuaJIT;
|
||||
disabled = isLua52 || isLua53 || isLuaJIT;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lua library to read files stored inside zip files";
|
||||
@@ -620,6 +623,8 @@ let
|
||||
sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b";
|
||||
};
|
||||
|
||||
disabled = isLua53;
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
patches = [ ../development/lua-modules/luasql.patch ];
|
||||
@@ -655,11 +660,11 @@ let
|
||||
|
||||
lpeg = buildLuaPackage rec {
|
||||
name = "lpeg-${version}";
|
||||
version = "0.12";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz";
|
||||
sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg";
|
||||
sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
Reference in New Issue
Block a user