diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8bca91e101da..a6fbcd5a0beb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -54,6 +54,7 @@ luassert,,,,, luasystem,,,,, luautf8,,,,,pstn luazip,,,,, +lua-yajl,,,,,pstn luuid,,,,, luv,,,,, markdown,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f503219b6c0d..5adc23979393 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1145,6 +1145,26 @@ luazip = buildLuarocksPackage { }; }; }; +lua-yajl = buildLuarocksPackage { + pname = "lua-yajl"; + version = "2.0-1"; + + src = fetchurl { + url = https://luarocks.org/lua-yajl-2.0-1.src.rock; + sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://github.com/brimworks/lua-yajl"; + description = "Integrate the yajl JSON library with Lua."; + maintainers = with maintainers; [ pstn ]; + license = { + fullName = "MIT/X11"; + }; + }; +}; luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a4c1c7fa324e..233503c2eca8 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -235,6 +235,12 @@ with super; ]; }); + lua-yajl = super.lua-yajl.override({ + buildInputs = [ + pkgs.yajl + ]; + }); + luuid = super.luuid.override(old: { externalDeps = [ { name = "LIBUUID"; dep = pkgs.libuuid; }