diff --git a/tools/nix/openssl-matrix.nix b/tools/nix/openssl-matrix.nix index 66cfb129c43..6e86f3c5105 100644 --- a/tools/nix/openssl-matrix.nix +++ b/tools/nix/openssl-matrix.nix @@ -11,7 +11,6 @@ # Other OpenSSL variants we want to test for: inherit (pkgs) boringssl - openssl_3 openssl_3_6 openssl_4_0 ; diff --git a/tools/nix/pkgs-26.05.nix b/tools/nix/pkgs-26.05.nix index ab44b34e725..422bf57ae40 100644 --- a/tools/nix/pkgs-26.05.nix +++ b/tools/nix/pkgs-26.05.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "3fd11995d77cf6907257617f99da7dc8123a3cc9"; + rev = "e49322d1ec25b45f7c587c5fd69ac826d1a57dbc"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "1rkhimimbfygpdh5xf7irh1ncryaymkbfzv2pxjcm3b4vsyzklhj"; + sha256 = "09c75qhjxdg8ls8fi89vl1fknhmszcan5jnrni5cr6zlv911x7pg"; }) arg; in # Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index 877bd3d00d9..89dba2ed3c1 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "79b35bf0bda5cd110f856aa5b5b2c5ba4460dbf5"; + rev = "73e728ddb6b7a12d18808f510813a13ee1fe4cce"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "1zqqiyjznlg8sb6zx7f218vz8cd68dxxxss8h768q515isk2dr08"; + sha256 = "1n8kqbnh8axhk5g6j4qdinh4ya34ax9cc9yrj8zila0dqwjq38sp"; }) arg; in # Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel diff --git a/tools/nix/v8.nix b/tools/nix/v8.nix index 8b9f1796e06..8a9c672821a 100644 --- a/tools/nix/v8.nix +++ b/tools/nix/v8.nix @@ -130,6 +130,12 @@ stdenv.mkDerivation (finalAttrs: { fi done '' + # TODO: remove that custom patch in favor of https://chromium-review.googlesource.com/c/v8/v8/+/8500805 + + (lib.optionalString (with stdenv.hostPlatform; isLinux && isAarch) '' + substituteInPlace deps/v8/src/base/memcopy.h --replace-fail '#define V8_BASE_MEMCOPY_H_' "$( + printf '%s\n\n%s\n' '#define V8_BASE_MEMCOPY_H_' '#include ' + )" + '') # We also need to mock some Python util files that are not used to configure Python. # Mocking lets us avoid rebuilding the whole derivation if there's a unrelated # change in one of those files.