nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 19:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #252900: luajit_2_*: update

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-09-11 17:29:27 +02:00
commit d94c20a495
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,15 @@
{ self, callPackage, fetchFromGitHub, lib, passthruFun }:
callPackage ./default.nix {
version = "2.0.5-2022-09-13";
callPackage ./default.nix rec {
# The patch version is the timestamp of the git commit,
# obtain via `cat $(nix-build -A luajit_2_0.src)/.relver`
version = "2.0.1693340858";
src = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = "46e62cd963a426e83a60f691dcbbeb742c7b3ba2";
hash = "sha256-/XR9+6NjXs2TrUVKJNkH2h970BkDNFqMDJTWcy/bswU=";
rev = "c6ee7e19d107b4f9a140bb2ccf99162e26318c69";
hash = "sha256-3/7ASZRniytw5RkOy0F9arHkZevq6dxmya+Ba3A5IIA=";
};
extraMeta = { # this isn't precise but it at least stops the useless Hydra build

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

@ -1,13 +1,15 @@
{ self, callPackage, fetchFromGitHub, passthruFun }:
callPackage ./default.nix {
version = "2.1.0-2022-10-04";
callPackage ./default.nix rec {
# The patch version is the timestamp of the git commit,
# obtain via `cat $(nix-build -A luajit_2_1.src)/.relver`
version = "2.1.1693350652";
src = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = "6c4826f12c4d33b8b978004bc681eb1eef2be977";
hash = "sha256-GMgoSVHrfIuLdk8mW9XgdemNFsAkkQR4wiGGjaAXAKg=";
rev = "41fb94defa8f830ce69a8122b03f6ac3216d392a";
hash = "sha256-iY80CA97RqJ9gF1Kl7ms/lC6m6KScjxWmljh5Gy7Brg=";
};
inherit self passthruFun;

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

@ -24,6 +24,7 @@
, enableGDBJITSupport ? false
, enableAPICheck ? false
, enableVMAssertions ? false
, enableRegisterAllocationRandomization ? false
, useSystemMalloc ? false
# Upstream generates randomized string id's by default for security reasons
# https://github.com/LuaJIT/LuaJIT/issues/626. Deterministic string id's should
@ -50,6 +51,7 @@ let
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
++ optional enableAPICheck "-DLUAJIT_USE_APICHECK"
++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
++ optional enableRegisterAllocationRandomization "-DLUAJIT_RANDOM_RA"
++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0"
;