diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 183a958b4e1f1..7f07c6602dacd 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -2,6 +2,7 @@ { disabled ? false , propagatedBuildInputs ? [ ] +, makeFlags ? [ ] , ... } @ attrs: @@ -9,18 +10,16 @@ if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else toLuaModule (lua.stdenv.mkDerivation ( - { + attrs // { + name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version; + makeFlags = [ "PREFIX=$(out)" - "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" "LUA_INC=-I${lua}/include" - ]; - } - // - attrs - // - { - name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version; + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_VERSION=${lua.luaversion}" + ] ++ makeFlags; + propagatedBuildInputs = propagatedBuildInputs ++ [ lua # propagate it for its setup-hook ]; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 73a4efae15b71..5ea0e298f0a6b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -30,7 +30,7 @@ let lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; in -{ +rec { # Dont take luaPackages from "global" pkgs scope to avoid mixing lua versions luaPackages = self; @@ -59,6 +59,46 @@ in # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; + lua-resty-core = callPackage ({ fetchFromGitHub }: buildLuaPackage rec { + pname = "lua-resty-core"; + version = "0.1.24"; + + src = fetchFromGitHub { + owner = "openresty"; + repo = "lua-resty-core"; + rev = "v${version}"; + sha256 = "sha256-obwyxHSot1Lb2c1dNqJor3inPou+UIBrqldbkNBCQQk="; + }; + + propagatedBuildInputs = [ lua-resty-lrucache ]; + + meta = with lib; { + description = "New FFI-based API for lua-nginx-module"; + homepage = "https://github.com/openresty/lua-resty-core"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }) {}; + + lua-resty-lrucache = callPackage ({ fetchFromGitHub }: buildLuaPackage rec { + pname = "lua-resty-lrucache"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "openresty"; + repo = "lua-resty-lrucache"; + rev = "v${version}"; + sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q="; + }; + + meta = with lib; { + description = "Lua-land LRU Cache based on LuaJIT FFI"; + homepage = "https://github.com/openresty/lua-resty-lrucache"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }) {}; + luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage rec { pname = "luxio"; version = "13";