diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-09-11 17:29:27 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-09-11 17:29:27 +0200 |
commit | d94c20a495e9fb889af04977ef8f503076c74189 (patch) | |
tree | e3c477dd01ef794b411cd7867b71cdfc9aa99e7b | |
parent | 72404a8fe86a2ccf73b0d920ec5e8fc675b0017d (diff) | |
parent | 01901b6df5fa0fe69d7410e3e73afe81e4693e59 (diff) | |
download | nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar.gz nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar.bz2 nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar.lz nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar.xz nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.tar.zst nixpkgs-d94c20a495e9fb889af04977ef8f503076c74189.zip |
Merge #252900: luajit_2_*: update
...into staging-next
-rw-r--r-- | pkgs/development/interpreters/luajit/2.0.nix | 10 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/2.1.nix | 10 | ||||
-rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 78abb742c40..29ad88f0ec1 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -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 diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 8efb86ab017..cf8531b7352 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -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; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 16c2876f9f2..28493cc48ae 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -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" ; |