diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7084b0a5fd2..36ca2cf6f966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7308,6 +7308,7 @@ with pkgs; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); 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; }); luaPackages = lua52Packages; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 311bb1eb63f0..8f109c0fcb7d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -83,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 ''; @@ -220,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"; @@ -500,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"; @@ -621,6 +623,8 @@ let sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b"; }; + disabled = isLua53; + buildInputs = [ sqlite ]; patches = [ ../development/lua-modules/luasql.patch ];