summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorGregory Anders <greg@gpanders.com>2021-08-19 05:52:24 -0600
committerGregory Anders <greg@gpanders.com>2021-08-19 05:52:24 -0600
commit0b467dfa956485833713374d015bc2a8dcbd9133 (patch)
tree1891ae50621c070236b93ac0594f651800fbb7d3 /pkgs/development/interpreters
parent0de79c608bc74480419e405bb7c0321b744b46e3 (diff)
luajit_openresty: init
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/lua-5/default.nix5
-rw-r--r--pkgs/development/interpreters/luajit/2.0.nix2
-rw-r--r--pkgs/development/interpreters/luajit/2.1.nix2
-rw-r--r--pkgs/development/interpreters/luajit/default.nix6
-rw-r--r--pkgs/development/interpreters/luajit/openresty.nix10
5 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 3e36f77dab43..f2b2961c4c77 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 153b11aaa5fc..ceb796f0433e 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 d11514c07c62..87976a45dfe1 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 860642b0fd2f..728161598282 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 000000000000..78e06f46f1d0
--- /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";
+}