Skip to content

Commit 1b070ff

Browse files
nodejs-github-botnodejs-github-bot
authored
tools: bump nixpkgs pins
- unstable to f4b794aaffc0e3d45da81088d492b118224bb476 - 26.05 to c0ae35c6460f00dcac6a59063e080f826e620b28 PR-URL: #67173 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 70074c6 commit 1b070ff

7 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎.github/workflows/test-shared.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ jobs:
255255
with:
256256
runner: ubuntu-24.04-arm
257257
v8-nar: ${{ needs.build-aarch64-linux-v8.outputs.local-cache && 'libv8-aarch64-linux.nar' }}
258-
pkcs11-store-test: ${{ matrix.openssl.attr == 'openssl' }}
258+
pkcs11-store-test: ${{ matrix.openssl.attr == 'openssl_3_5' }}
259259
# Override just the `openssl` attr of the default shared-lib set with
260260
# the matrix-selected nixpkgs attribute (e.g. `openssl_3_6`). All
261261
# other shared libs (brotli, cares, libuv, …) keep their defaults.

‎tools/nix/openssl-fips.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
openssl ? (import ./openssl-matrix.nix { }).openssl,
2+
openssl ? (import ./openssl-matrix.nix { }).openssl_3_5,
33
}:
44

55
openssl.overrideAttrs (oldAttrs: {

‎tools/nix/openssl-matrix.nix‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
{
22
pkgs ? import ./pkgs.nix {
3-
config.permittedInsecurePackages = [
4-
"openssl-3.0.22"
5-
];
3+
config.permittedInsecurePackages = [ "openssl-3.0.22" ];
64
},
75
}:
86

97
{
108
# "default" OpenSSL release line, should be kept in sync with the bundled version:
11-
openssl = pkgs.openssl_3_5;
9+
openssl = pkgs.openssl_4_1;
1210

1311
# Other OpenSSL variants we want to test for:
1412
inherit (pkgs)
1513
boringssl
1614
openssl_3
17-
openssl_3_6
18-
openssl_4_0
15+
openssl_3_5
1916
;
2017

2118
openssl_fips = import ./openssl-fips.nix { };

‎tools/nix/pkcs11.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# pkcs11-provider is dlopen'd into the libcrypto Node.js itself links, so it
1111
# has to be built against that very OpenSSL. SoftHSM links OpenSSL too;
1212
# building it against the same one keeps a single libcrypto in the process.
13-
openssl ? (import ./openssl-matrix.nix { inherit pkgs; }).openssl,
13+
openssl ? (import ./openssl-matrix.nix { inherit pkgs; }).openssl_3_5,
1414

1515
pin ? "1234",
1616
}:

‎tools/nix/pkgs-26.05.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "752cbac9446602fbb78bdd1c3597455a3dd38432";
4+
rev = "c0ae35c6460f00dcac6a59063e080f826e620b28";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "0h4w0f8nkmpmmpjky3blvc2r147s515pc0z4hisywln4ryryr29z";
7+
sha256 = "0hbdqzpiv8p44li7jng01mlg2zbb1ff18z3r250f4rjbqflbiwxs";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel

‎tools/nix/pkgs.nix‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "901c54c08bdc20e00c2b3c73716b97497b1b3c74";
4+
rev = "0bb2eedc20e4739f29e8045034f2828ad7054f8f";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "0bicjz6w8n0ahwxxj837rbg494siw57vfk7ff3w8v3gvnykzxlia";
7+
sha256 = "008j4dj5yrzww91qvp1lp2c9d1lkwc6i2dpainf5nkdkr3rwj8vy";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
@@ -44,4 +44,17 @@ else
4444
url = "${repo}/raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix";
4545
sha256 = "09dlc99sam9ld9jvzgcc00r4v4ls1cmbb0yim3mr895fpbs8b3qa";
4646
}) { };
47+
48+
# TODO: remove this override once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/575002
49+
uvwasi = nixpkgs.uvwasi.overrideAttrs (old: {
50+
patches = old.patches ++ [
51+
(nixpkgs.fetchpatch2 {
52+
url = "https://github.com/nodejs/uvwasi/commit/fe602a6911207efd8dcfc070a752bcf76813c978.patch?full_index=1";
53+
hash = "sha256-MyFvRuEhcqZR+Bz2pY9vani8U1iyQrDeni2kKKnJGEI=";
54+
})
55+
];
56+
57+
buildInputs = [ ];
58+
propagatedBuildInputs = old.buildInputs;
59+
});
4760
}

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
nghttp2
2020
simdjson
2121
simdutf
22+
uvwasi
2223
zlib
2324
zstd
2425
;
@@ -27,19 +28,6 @@
2728
hdr-histogram = pkgs.hdrhistogram_c;
2829
highway = pkgs.libhwy;
2930
http-parser = pkgs.llhttp;
30-
31-
# TODO: remove this override once the pin we use has picked up https://github.com/NixOS/nixpkgs/pull/575002
32-
uvwasi = pkgs.uvwasi.overrideAttrs (old: {
33-
patches = old.patches ++ [
34-
(pkgs.fetchpatch2 {
35-
url = "https://github.com/nodejs/uvwasi/commit/fe602a6911207efd8dcfc070a752bcf76813c978.patch?full_index=1";
36-
hash = "sha256-MyFvRuEhcqZR+Bz2pY9vani8U1iyQrDeni2kKKnJGEI=";
37-
})
38-
];
39-
40-
buildInputs = [ ];
41-
propagatedBuildInputs = old.buildInputs;
42-
});
4331
}
4432
// (pkgs.lib.optionalAttrs withLief {
4533
# TODO: remove this override once the pin we use has picked up a new LIEF version that includes that patch.

0 commit comments

Comments
 (0)