colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luajit_openresty: init at 2.1-20220915

Browse Source
This commit is contained in:
Sandro Jäckel 2022-12-19 08:40:49 +01:00
parent 1e4b811793
commit 56acc4566e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
6 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/lua-5/default.nix
View File

@ -163,4 +163,8 @@ rec {
inherit callPackage fetchFromGitHub passthruFun; inherit callPackage fetchFromGitHub passthruFun;
}; };
luajit_openresty = import ../luajit/openresty.nix {
self = luajit_openresty;
inherit callPackage fetchFromGitHub passthruFun;
};
} }

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

@ -2,7 +2,7 @@
callPackage ./default.nix { callPackage ./default.nix {
version = "2.0.5-2022-09-13"; version = "2.0.5-2022-09-13";
isStable = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LuaJIT"; owner = "LuaJIT";
repo = "LuaJIT"; repo = "LuaJIT";

3
pkgs/development/interpreters/luajit/2.1.nix
View File

@ -1,7 +1,8 @@
{ self, callPackage, fetchFromGitHub, passthruFun }: { self, callPackage, fetchFromGitHub, passthruFun }:
callPackage ./default.nix { callPackage ./default.nix {
version = "2.1.0-2022-10-04"; version = "2.1.0-2022-10-04";
isStable = false;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LuaJIT"; owner = "LuaJIT";
repo = "LuaJIT"; repo = "LuaJIT";

10
pkgs/development/interpreters/luajit/default.nix
View File

@ -2,7 +2,6 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, buildPackages , buildPackages
, isStable
, version , version
, src , src
, extraMeta ? { } , extraMeta ? { }
@ -71,7 +70,7 @@ stdenv.mkDerivation rec {
} >> src/luaconf.h } >> src/luaconf.h
''; '';
configurePhase = false; dontConfigure = true;
buildInputs = lib.optional enableValgrindSupport valgrind; buildInputs = lib.optional enableValgrindSupport valgrind;
@ -91,8 +90,9 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
( cd "$out/include"; ln -s luajit-*/* . ) ( cd "$out/include"; ln -s luajit-*/* . )
ln -s "$out"/bin/luajit-* "$out"/bin/lua ln -s "$out"/bin/luajit-* "$out"/bin/lua
'' + lib.optionalString (!isStable) '' if [[ ! -e "$out"/bin/luajit ]]; then
ln -s "$out"/bin/luajit-* "$out"/bin/luajit ln -s "$out"/bin/luajit* "$out"/bin/luajit
fi
''; '';
LuaPathSearchPaths = luaPackages.luaLib.luaPathList; LuaPathSearchPaths = luaPackages.luaLib.luaPathList;
@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "High-performance JIT compiler for Lua 5.1"; description = "High-performance JIT compiler for Lua 5.1";
homepage = "http://luajit.org"; homepage = "https://luajit.org/";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628 # See https://github.com/LuaJIT/LuaJIT/issues/628

14
pkgs/development/interpreters/luajit/openresty.nix Normal file
View File

@ -0,0 +1,14 @@
{ self, callPackage, fetchFromGitHub, passthruFun }:
callPackage ./default.nix rec {
version = "2.1-20220915";
src = fetchFromGitHub {
owner = "openresty";
repo = "luajit2";
rev = "v${version}";
hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s=";
};
inherit self passthruFun;
}

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

@ -15993,7 +15993,7 @@ with pkgs;
### LUA interpreters ### LUA interpreters
luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; 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_2_1 luajit_2_0 luajit_openresty;
lua5 = lua5_2_compat; lua5 = lua5_2_compat;
lua = lua5; lua = lua5;