public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua-packages: define lua53Packages 

Set up lua packages for the v5.3.x interpreter.

Blacklist the set of lua-packages (luabitop, luaexpat, luazip,
luasqlite3) whose compilation fails against 5.3.4. The rest are at least
building.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
This commit is contained in:
Philipp Gesang 2018-07-05 23:49:08 +02:00
parent e691c8e97c
commit cc5d281035
No known key found for this signature in database
GPG Key ID: 6E8F470A6873EFF1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/all-packages.nix
View File

@ -7308,6 +7308,7 @@ with pkgs;
lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; });
lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; });
lua53Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_3; });
luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; });
luaPackages = lua52Packages; luaPackages = lua52Packages;

8
pkgs/top-level/lua-packages.nix
View File

@ -83,6 +83,8 @@ let
buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
disabled = isLua53;
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile --replace 10.4 10.5 substituteInPlace Makefile --replace 10.4 10.5
''; '';
@ -220,7 +222,7 @@ let
EXPAT_INC="-I${expat.dev}/include"); EXPAT_INC="-I${expat.dev}/include");
''; '';
disabled = isLuaJIT; disabled = isLua53 || isLuaJIT;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SAX XML parser based on the Expat library"; description = "SAX XML parser based on the Expat library";
@ -500,7 +502,7 @@ let
patches = [ ../development/lua-modules/zip.patch ]; patches = [ ../development/lua-modules/zip.patch ];
# Does not currently work under Lua 5.2 or LuaJIT. # Does not currently work under Lua 5.2 or LuaJIT.
disabled = isLua52 || isLuaJIT; disabled = isLua52 || isLua53 || isLuaJIT;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lua library to read files stored inside zip files"; description = "Lua library to read files stored inside zip files";
@ -621,6 +623,8 @@ let
sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b"; sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b";
}; };
disabled = isLua53;
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
patches = [ ../development/lua-modules/luasql.patch ]; patches = [ ../development/lua-modules/luasql.patch ];