diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/lua-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/lua-packages.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix index 80f71dc1942e..efaf06d30a22 100644 --- a/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/nixpkgs/pkgs/top-level/lua-packages.nix @@ -12,18 +12,12 @@ , fetchFromGitHub, which, writeText , pkgs , lib -}: +}@args: let packages = ( self: let - - # a function of lua_path / lua_cpath - lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { - inherit lib; - }; - callPackage = pkgs.newScope self; buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); @@ -52,11 +46,13 @@ in # helper functions for dealing with LUA_PATH and LUA_CPATH lib = luaLib; - getLuaPath = drv: luaLib.getPath drv (luaLib.luaPathList lua.luaversion) ; - getLuaCPath = drv: luaLib.getPath drv (luaLib.luaCPathList lua.luaversion) ; + getLuaPath = drv: getPath drv luaLib.luaPathList; + getLuaCPath = drv: getPath drv luaLib.luaCPathList; + inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;}) + lua-setup-hook; - inherit lua lua-setup-hook callPackage; + inherit lua callPackage; inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT requiredLuaModules toLuaModule hasLuaModule; @@ -71,6 +67,10 @@ in inherit lua lib; }; + luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { + inherit lua lib; + }; + # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; |