nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206812 from SuperSandro2000/luajit-openresty

Browse Source
This commit is contained in:
Sandro 2022-12-30 03:11:54 +01:00 committed by GitHub
commit 726088a964
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
};
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 {
version = "2.0.5-2022-09-13";
isStable = true;
src = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";

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

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

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

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

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