b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "luajit_openresty: init"

Browse source 
This reverts commit 0b467dfa95.
This commit is contained in:
Luka Blaskovic 2021-08-25 10:33:56 +00:00
parent 20b48c3727
commit d5fe0d2b6e
6 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/interpreters/lua-5/default.nix
View file

@ -54,9 +54,4 @@ rec {
inherit callPackage;
};
luajit_openresty = import ../luajit/openresty.nix {
self = luajit_openresty;
inherit callPackage;
};
}

2
pkgs/development/interpreters/luajit/2.0.nix
View file

@ -1,8 +1,6 @@
{ self, callPackage, lib }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
version = "2.0.5-2021-06-08";
rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46";
isStable = true;

2
pkgs/development/interpreters/luajit/2.1.nix
View file

@ -1,8 +1,6 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
owner = "LuaJIT";
repo = "LuaJIT";
version = "2.1.0-2021-06-25";
rev = "e957737650e060d5bf1c2909b741cc3dffe073ac";
isStable = false;

6
pkgs/development/interpreters/luajit/default.nix
View file

@ -1,8 +1,6 @@
{ lib, stdenv, fetchFromGitHub, buildPackages
, name ? "luajit-${version}"
, isStable
, owner
, repo
, sha256
, rev
, version
@ -43,7 +41,9 @@ in
stdenv.mkDerivation rec {
inherit name version;
src = fetchFromGitHub {
inherit owner repo sha256 rev;
owner = "LuaJIT";
repo = "LuaJIT";
inherit sha256 rev;
};
luaversion = "5.1";

10
pkgs/development/interpreters/luajit/openresty.nix
View file

@ -1,10 +0,0 @@
{ self, callPackage }:
callPackage ./default.nix rec {
inherit self;
owner = "openresty";
repo = "luajit2";
version = "2.1-20210510";
rev = "v${version}";
isStable = true;
sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd";
}

2
pkgs/top-level/all-packages.nix
View file

@ -12691,7 +12691,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_openresty 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_2_1 luajit_2_0;
lua5 = lua5_2_compat;
lua = lua5;