diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-21 21:11:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-21 23:05:44 +0200 |
| commit | bddcd35e1d52161f2987736d411bc6088c6a4a45 (patch) | |
| tree | b88d8a974b713da585899c268e97a203e4f11961 /pkgs/top-level/lua-packages.nix | |
| parent | 916f096911162ea4c85f3fb2eed5af8785abf925 (diff) | |
| parent | 2c21a970e9e31d553405e59915c4519e5a9710c3 (diff) | |
| download | nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar.gz nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar.bz2 nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar.lz nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar.xz nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.tar.zst nixlib-bddcd35e1d52161f2987736d411bc6088c6a4a45.zip | |
Merge #43141: lua-5.3 and lpeg updates
Diffstat (limited to 'pkgs/top-level/lua-packages.nix')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index cb9df4382463..c7d4c18810f0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -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 = '' |