Unverified Commit d94c20a4 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #252900: luajit_2_*: update 

...into staging-next
parents 72404a8f 01901b6d

pkgs/development/interpreters/luajit/2.0.nix

+6 −4
Original line number Diff line number Diff line 
{ 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

pkgs/development/interpreters/luajit/2.1.nix

+6 −4
Original line number Diff line number Diff line 
{ 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;

pkgs/development/interpreters/luajit/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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"

  ;