Skip to content

luaPlugins.lua-resty-lrucache: init at 0.13; luaPlugins.lua-resty-core: init at 0.1.24 #206813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 3 commits into from
Dec 30, 2022
Merged

luaPlugins.lua-resty-lrucache: init at 0.13; luaPlugins.lua-resty-core: init at 0.1.24 #206813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
861c755
buildLuaPackage: make makeFlags expandable
SuperSandro2000 Dec 19, 2022
40ff955
luaPlugins.lua-resty-lrucache: init at 0.13
SuperSandro2000 Dec 19, 2022
e33fb74
luaPlugins.lua-resty-core: init at 0.1.24
SuperSandro2000 Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions pkgs/development/lua-modules/generic/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@

{ disabled ? false
, propagatedBuildInputs ? [ ]
, makeFlags ? [ ]
, ...
} @ attrs:

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
];
Expand Down
42 changes: 41 additions & 1 deletion pkgs/top-level/lua-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Copy link
Member

@teto teto Dec 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both are available on luarocks: https://luarocks.org/search?q=lua-resty-core+ https://luarocks.org/modules/avlubimov/lua-resty-lrucache , can we generate them instead please ? makes maintainance easier.

Copy link
Member Author

@SuperSandro2000 SuperSandro2000 Dec 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are unofficial outdated uploads. For lua-resty-lrucache the version on rocks is 0.09 and 0.13 in the repo.

Copy link
Member

@teto teto Dec 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use rockspecs from the repo too. The issue is that the repo doesn't contain any rockspec. One can pass an alternative rockspec but it would be easier for everyone if openresty/lua-resty-lrucache#42 could be merged. Maybe nudge the maintainers and ask for an update on luarocks.org while at it ?

Copy link
Member Author

@SuperSandro2000 SuperSandro2000 Dec 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but do we really need one? I have tested the package locally already and it worked.

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";
Expand Down