Commit d4120cbcc61 for nodejs
commit d4120cbcc617db974e055d0a3100286e03650223
Author: Node.js GitHub Bot <github-bot@iojs.org>
Date: Tue Sep 22 04:00:51 2026 -0400
tools: update nixpkgs-unstable to 79b35bf0bda5cd110f856aa5b5b2c5ba446
PR-URL: https://github.com/nodejs/node/pull/66146
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
diff --git a/tools/nix/pkgs-26.05.nix b/tools/nix/pkgs-26.05.nix
index 3455a1e04dc..ab44b34e725 100644
--- a/tools/nix/pkgs-26.05.nix
+++ b/tools/nix/pkgs-26.05.nix
@@ -1,13 +1,19 @@
arg:
let
repo = "https://github.com/NixOS/nixpkgs";
- rev = "b378e416ccd4a9d27aba331c8f51a7c985dea1a0";
+ rev = "3fd11995d77cf6907257617f99da7dc8123a3cc9";
nixpkgs = import (builtins.fetchTarball {
url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "0n62hvmnxw6x1sxs29ryl1k4cyy0c3az9wbwpnc0v56n90x8i2v9";
+ sha256 = "1rkhimimbfygpdh5xf7irh1ncryaymkbfzv2pxjcm3b4vsyzklhj";
}) arg;
in
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
# to keep testing on that platform for a little longer.
# TODO: remove this file when 26.05 is EOL (end of 2026)
nixpkgs
+// {
+ simdutf = nixpkgs.simdutf.overrideAttrs (old: {
+ # TODO: remove this once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/557405
+ cmakeFlags = old.cmakeFlags ++ [ (nixpkgs.lib.cmakeFeature "SIMDUTF_CXX_STANDARD" "20") ];
+ });
+}
diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix
index 2067e35a023..ea670bc7f5d 100644
--- a/tools/nix/pkgs.nix
+++ b/tools/nix/pkgs.nix
@@ -1,13 +1,23 @@
arg:
let
repo = "https://github.com/NixOS/nixpkgs";
- rev = "aff8a0b28396750446e5537a96461bc4facdb287";
+ rev = "79b35bf0bda5cd110f856aa5b5b2c5ba4460dbf5";
nixpkgs = import (builtins.fetchTarball {
url = "${repo}/archive/${rev}.tar.gz";
- sha256 = "19qc9lljqzyfxqix8z3lh72x73r0z2rijfndxvs5whdnh2vgzxf5";
+ sha256 = "1zqqiyjznlg8sb6zx7f218vz8cd68dxxxss8h768q515isk2dr08";
}) arg;
in
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
# to keep testing on that platform for a little longer.
# TODO: remove this when 26.05 is EOL (end of 2026)
-if builtins.currentSystem == "x86_64-darwin" then (import ./pkgs-26.05.nix arg) else nixpkgs
+if builtins.currentSystem == "x86_64-darwin" then
+ (import ./pkgs-26.05.nix arg)
+else
+ nixpkgs
+ // nixpkgs.lib.optionalAttrs (with nixpkgs.stdenv.hostPlatform; isLinux && isx86_64) {
+ # TODO: remove pin once https://github.com/mozilla/sccache/issues/2869 is resolved
+ sccache = nixpkgs.callPackage (builtins.fetchurl {
+ url = "${repo}/raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix";
+ sha256 = "09dlc99sam9ld9jvzgcc00r4v4ls1cmbb0yim3mr895fpbs8b3qa";
+ }) { };
+ }
diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix
index 0dab23c9c85..d57ceb4918b 100644
--- a/tools/nix/sharedLibDeps.nix
+++ b/tools/nix/sharedLibDeps.nix
@@ -18,6 +18,7 @@
nbytes
nghttp2
simdjson
+ simdutf
uvwasi
zlib
zstd
@@ -27,10 +28,6 @@
hdr-histogram = pkgs.hdrhistogram_c;
highway = pkgs.libhwy;
http-parser = pkgs.llhttp;
- simdutf = pkgs.simdutf.overrideAttrs (old: {
- # TODO: remove this once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/557405
- cmakeFlags = old.cmakeFlags ++ [ (pkgs.lib.cmakeFeature "SIMDUTF_CXX_STANDARD" "20") ];
- });
}
// (pkgs.lib.optionalAttrs withLief {
inherit (pkgs) lief;