diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2021-11-07 07:36:49 +0000 |
|---|---|---|
| committer | Luka Blaskovic <lblasc@tvbeat.com> | 2021-11-07 07:38:21 +0000 |
| commit | 90a564a133e1a1ebfed26666567182ae60c666ee (patch) | |
| tree | 7b41c6fc588fa75eb26dc3c33897328e55f2ac4a /pkgs/development/interpreters/luajit | |
| parent | 83c93c8e1c01425d69bf06b2bf3c0ac5f9282443 (diff) | |
luajit_2_1: 2.1.0-2021-08-12 -> 2.1.0-2021-10-27
Diffstat (limited to 'pkgs/development/interpreters/luajit')
3 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 6ac47a6c3359..4898999281d0 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -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"; } diff --git a/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch b/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch deleted file mode 100644 index dcfb1e9d4e7f..000000000000 --- a/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch +++ /dev/null @@ -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) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index ac74610bcce9..87de82eb2630 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -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 |