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

Merge #85483: luajit*: bump to 2020-03-20, GC64 mode switch

This commit is contained in:
Vladimír Čunát 2020-05-01 08:27:38 +02:00
parent 170f301990 b67cbe5a2d
commit b9f359b167
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

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

@ -1,9 +1,10 @@
{ self, callPackage, lib }: { self, callPackage, lib }:
callPackage ./default.nix { callPackage ./default.nix {
inherit self; inherit self;
version = "2.0.5"; version = "2.0.5-2020-03-20";
rev = "e613105";
isStable = true; isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; sha256 = "0k843z90s4hi0qhri6ixy8sv21nig8jwbznpqgqg845ji530kqj7";
extraMeta = { # this isn't precise but it at least stops the useless Hydra build extraMeta = { # this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: p != "aarch64-linux") platforms = with lib; filter (p: p != "aarch64-linux")
(platforms.linux ++ platforms.darwin); (platforms.linux ++ platforms.darwin);

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

@ -1,7 +1,8 @@
{ self, callPackage }: { self, callPackage }:
callPackage ./default.nix { callPackage ./default.nix {
inherit self; inherit self;
version = "2.1.0-beta3"; version = "2.1.0-2020-03-20";
rev = "9143e86";
isStable = false; isStable = false;
sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b";
} }

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

@ -1,7 +1,8 @@
{ stdenv, fetchurl, buildPackages { stdenv, fetchFromGitHub, buildPackages
, name ? "luajit-${version}" , name ? "luajit-${version}"
, isStable , isStable
, sha256 , sha256
, rev
, version , version
, extraMeta ? {} , extraMeta ? {}
, callPackage , callPackage
@ -10,6 +11,7 @@
, enableFFI ? true , enableFFI ? true
, enableJIT ? true , enableJIT ? true
, enableJITDebugModule ? enableJIT , enableJITDebugModule ? enableJIT
, enableGC64 ? stdenv.hostPlatform.isAarch64
, enable52Compat ? false , enable52Compat ? false
, enableValgrindSupport ? false , enableValgrindSupport ? false
, valgrind ? null , valgrind ? null
@ -28,6 +30,7 @@ let
optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64"
++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC"
++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND"
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
@ -37,9 +40,10 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit name version; inherit name version;
src = fetchurl { src = fetchFromGitHub {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; owner = "LuaJIT";
inherit sha256; repo = "LuaJIT";
inherit sha256 rev;
}; };
luaversion = "5.1"; luaversion = "5.1";