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

Merge #43141: lua-5.3 and lpeg updates

Browse Source
This commit is contained in:
Vladimír Čunát 2018-07-21 21:11:24 +02:00
commit bddcd35e1d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/lua-5/5.3.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lua-${version}"; name = "lua-${version}";
luaversion = "5.3"; luaversion = "5.3";
version = "${luaversion}.4"; version = "${luaversion}.5";
src = fetchurl { src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz"; url = "https://www.lua.org/ftp/${name}.tar.gz";
sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
}; };
buildInputs = [ readline ]; buildInputs = [ readline ];

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

@ -7336,6 +7336,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;

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

@ -14,6 +14,7 @@
let let
isLua52 = lua.luaversion == "5.2"; isLua52 = lua.luaversion == "5.2";
isLua53 = lua.luaversion == "5.3";
isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
platformString = platformString =
@ -82,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
''; '';
@ -219,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";
@ -499,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";
@ -620,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 ];
@ -655,11 +660,11 @@ let
lpeg = buildLuaPackage rec { lpeg = buildLuaPackage rec {
name = "lpeg-${version}"; name = "lpeg-${version}";
version = "0.12"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz";
sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b";
}; };
preBuild = '' preBuild = ''