Skip to content

Commit d4120cb

Browse files
nodejs-github-botnodejs-github-bot
authored
tools: update nixpkgs-unstable to 79b35bf0bda5cd110f856aa5b5b2c5ba446
PR-URL: #66146 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Aviv Keller <[email protected]>
1 parent 44ff2db commit d4120cb

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

‎tools/nix/pkgs-26.05.nix‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "b378e416ccd4a9d27aba331c8f51a7c985dea1a0";
4+
rev = "3fd11995d77cf6907257617f99da7dc8123a3cc9";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "0n62hvmnxw6x1sxs29ryl1k4cyy0c3az9wbwpnc0v56n90x8i2v9";
7+
sha256 = "1rkhimimbfygpdh5xf7irh1ncryaymkbfzv2pxjcm3b4vsyzklhj";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
1111
# to keep testing on that platform for a little longer.
1212
# TODO: remove this file when 26.05 is EOL (end of 2026)
1313
nixpkgs
14+
// {
15+
simdutf = nixpkgs.simdutf.overrideAttrs (old: {
16+
# TODO: remove this once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/557405
17+
cmakeFlags = old.cmakeFlags ++ [ (nixpkgs.lib.cmakeFeature "SIMDUTF_CXX_STANDARD" "20") ];
18+
});
19+
}

‎tools/nix/pkgs.nix‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "aff8a0b28396750446e5537a96461bc4facdb287";
4+
rev = "79b35bf0bda5cd110f856aa5b5b2c5ba4460dbf5";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "19qc9lljqzyfxqix8z3lh72x73r0z2rijfndxvs5whdnh2vgzxf5";
7+
sha256 = "1zqqiyjznlg8sb6zx7f218vz8cd68dxxxss8h768q515isk2dr08";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
1111
# to keep testing on that platform for a little longer.
1212
# TODO: remove this when 26.05 is EOL (end of 2026)
13-
if builtins.currentSystem == "x86_64-darwin" then (import ./pkgs-26.05.nix arg) else nixpkgs
13+
if builtins.currentSystem == "x86_64-darwin" then
14+
(import ./pkgs-26.05.nix arg)
15+
else
16+
nixpkgs
17+
// nixpkgs.lib.optionalAttrs (with nixpkgs.stdenv.hostPlatform; isLinux && isx86_64) {
18+
# TODO: remove pin once https://github.com/mozilla/sccache/issues/2869 is resolved
19+
sccache = nixpkgs.callPackage (builtins.fetchurl {
20+
url = "${repo}/raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix";
21+
sha256 = "09dlc99sam9ld9jvzgcc00r4v4ls1cmbb0yim3mr895fpbs8b3qa";
22+
}) { };
23+
}

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
nbytes
1919
nghttp2
2020
simdjson
21+
simdutf
2122
uvwasi
2223
zlib
2324
zstd
@@ -27,10 +28,6 @@
2728
hdr-histogram = pkgs.hdrhistogram_c;
2829
highway = pkgs.libhwy;
2930
http-parser = pkgs.llhttp;
30-
simdutf = pkgs.simdutf.overrideAttrs (old: {
31-
# TODO: remove this once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/557405
32-
cmakeFlags = old.cmakeFlags ++ [ (pkgs.lib.cmakeFeature "SIMDUTF_CXX_STANDARD" "20") ];
33-
});
3431
}
3532
// (pkgs.lib.optionalAttrs withLief {
3633
inherit (pkgs) lief;

0 commit comments

Comments
 (0)