From ca80cf922aa9182367f441bf1599b528098291e0 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Tue, 30 Apr 2019 08:35:29 +0000 Subject: [PATCH] lua: add rapidjson, lua-toml and lua-messagepack to generated packages --- maintainers/scripts/luarocks-packages.csv | 3 + .../lua-modules/generated-packages.nix | 60 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 7 +++ 3 files changed, 70 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8dc70b2469da..c51c663a5413 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -14,13 +14,16 @@ ltermbox, lua-cmsgpack, lua_cliargs, lua-iconv, +lua-messagepack, lua-term, +lua-toml, luabitop, luaevent, luacheck luaffi,,http://luarocks.org/dev, luuid, penlight, +rapidjson, say, std__debug,std._debug, std_normalize,std.normalize, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 24e8555900de..c8fc051f7a97 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -320,6 +320,26 @@ lua-iconv = buildLuarocksPackage { }; }; }; +lua-messagepack = buildLuarocksPackage { + pname = "lua-messagepack"; + version = "0.5.1-2"; + + src = fetchurl { + url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "http://fperrad.frama.io/lua-MessagePack/"; + description="a pure Lua implementation of the MessagePack serialization format"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -346,6 +366,26 @@ lua-term = buildLuarocksPackage { }; }; }; +lua-toml = buildLuarocksPackage { + pname = "lua-toml"; + version = "2.0-1"; + + src = fetchurl { + url = https://luarocks.org/lua-toml-2.0-1.src.rock; + sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "https://github.com/jonstoler/lua-toml"; + description="toml decoder/encoder for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -482,6 +522,26 @@ penlight = buildLuarocksPackage { }; }; }; +rapidjson = buildLuarocksPackage { + pname = "rapidjson"; + version = "0.5.1-1"; + + src = fetchurl { + url = https://luarocks.org/rapidjson-0.5.1-1.src.rock; + sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + buildType = "cmake"; + + meta = { + homepage = "https://github.com/xpol/lua-rapidjson"; + description="Json module based on the very fast RapidJSON."; + license = { + fullName = "MIT"; + }; + }; +}; say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a0ea365c7a56..0cf0c70faa10 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -68,4 +68,11 @@ with super; platforms = pkgs.lib.platforms.linux; }; }); + + rapidjson = super.rapidjson.overrideAttrs(oa: { + preBuild = '' + sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt + sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt + ''; + }); }