diff options
-rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/2.0.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/2.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/openresty.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 3e36f77dab43a..f2b2961c4c771 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -54,4 +54,9 @@ rec { inherit callPackage; }; + luajit_openresty = import ../luajit/openresty.nix { + self = luajit_openresty; + inherit callPackage; + }; + } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 153b11aaa5fc3..ceb796f0433e9 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,6 +1,8 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.0.5-2021-06-08"; rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index d11514c07c625..87976a45dfe17 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,6 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.1.0-2021-06-25"; rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 860642b0fd2f1..7281615982824 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable +, owner +, repo , sha256 , rev , version @@ -41,9 +43,7 @@ in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; - inherit sha256 rev; + inherit owner repo sha256 rev; }; luaversion = "5.1"; diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix new file mode 100644 index 0000000000000..78e06f46f1d04 --- /dev/null +++ b/pkgs/development/interpreters/luajit/openresty.nix @@ -0,0 +1,10 @@ +{ self, callPackage }: +callPackage ./default.nix rec { + inherit self; + owner = "openresty"; + repo = "luajit2"; + version = "2.1-20210510"; + rev = "v${version}"; + isStable = true; + sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c530a38ae0a8..58340229fb4b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12663,7 +12663,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; |