swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144966 from lblasc/luajit-bump

Browse source 
luajit_2_0: 2.0.5-2021-07-27 -> 2.0.5-2021-10-02, luajit_2_1: 2.1.0-2021-08-12 -> 2.1.0-2021-10-27
This commit is contained in:
Bernardo Meurer 2021-11-08 10:48:04 -08:00 committed by GitHub
parent e0df70e22d 5c411a4995
commit 3119a60230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/luajit/2.0.nix
View file

@ -1,10 +1,10 @@
{ self, callPackage, lib }:
callPackage ./default.nix {
inherit self;
version = "2.0.5-2021-07-27";
rev = "3a654999c6f00de4cb9e61232d23579442e544a0";
version = "2.0.5-2021-10-02";
rev = "d3294fa63b344173db68dd612c6d3801631e28d4";
isStable = true;
sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z";
sha256 = "0ja6x7bv3iqnf6m8xk6qp1dgan2b7mys0ff86dw671fqqrfw28fn";
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: !hasPrefix "aarch64-" p)
(platforms.linux ++ platforms.darwin);

6
pkgs/development/interpreters/luajit/2.1.nix
View file

@ -1,8 +1,8 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
version = "2.1.0-2021-08-12";
rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597";
version = "2.1.0-2021-10-27";
rev = "b4b2dce9fc3ffaaaede39b36d06415311e2aa516";
isStable = false;
sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr";
sha256 = "185s071aa0yffz8npgdxj7l98cs987vddb2l5pzfcdqfj41gn55q";
}

14
pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch
View file

@ -1,14 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index 2538503f..7e6380da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS))
$(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
endif
TARGET_STRIP+= -x
+ ifneq (arm64,$(shell uname -m))
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
+ endif
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)

4
pkgs/development/interpreters/luajit/default.nix
View file

@ -51,10 +51,6 @@ stdenv.mkDerivation rec {
luaversion = "5.1";
# Fix for pcall on aarch64-darwin.
# Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698
patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ];
postPatch = ''
substituteInPlace Makefile --replace ldconfig :
if test -n "''${dontStrip-}"; then