Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ff05703611a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 128ca1580845
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jun 7, 2019

  1. luaPackages.lpeg: 1.0.1 -> 1.0.2 

    and move to generated
    @teto
    teto authored and Matthieu Coudron committed Jun 7, 2019
    Copy the full SHA
    128ca15 View commit details
Showing with 20 additions and 29 deletions.
  1. +1 −0 maintainers/scripts/luarocks-packages.csv
  2. +19 −0 pkgs/development/lua-modules/generated-packages.nix
  3. +0 −29 pkgs/top-level/lua-packages.nix
1 change: 1 addition & 0 deletions maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ http,,,,,
inspect,,,,,
ldoc,,,,,
lgi,,,,,
lpeg,,,,,vyp
lpeg_patterns,,,,,
lpeglabel,,,,,
lpty,,,,,
19 changes: 19 additions & 0 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
29 changes: 0 additions & 29 deletions pkgs/top-level/lua-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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}";