From 128ca1580845609a4c1c5bb78c8de1f62bcb9aff Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 13:19:05 +0900 Subject: [PATCH] luaPackages.lpeg: 1.0.1 -> 1.0.2 and move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 ++++++++++++ pkgs/top-level/lua-packages.nix | 29 ------------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e80e3f08f7d2..b958d2e72779 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -10,6 +10,7 @@ http,,,,, inspect,,,,, ldoc,,,,, lgi,,,,, +lpeg,,,,,vyp lpeg_patterns,,,,, lpeglabel,,,,, lpty,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c2a1e36cd7bd..d5641cf4ce21 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -239,6 +239,25 @@ lgi = buildLuarocksPackage { }; }; }; +lpeg = buildLuarocksPackage { + pname = "lpeg"; + version = "1.0.2-1"; + + src = fetchurl { + url = https://luarocks.org/lpeg-1.0.2-1.src.rock; + sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; + description = "Parsing Expression Grammars For Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 83ec4cdb4e69..5df75d4e4605 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -556,35 +556,6 @@ with self; { }; }; - lpeg = buildLuaPackage rec { - name = "lpeg-${version}"; - version = "1.0.1"; - - src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; - sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b"; - }; - - preBuild = '' - makeFlagsArray=(CC=$CC); - ''; - - buildFlags = platformString; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p lpeg.so $out/lib/lua/${lua.luaversion} - install -p re.lua $out/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - description = "Parsing Expression Grammars For Lua"; - homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; - }; - }; vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}";