Skip to content

Commit 25f2aaa

Browse files
nodejs_22: 22.19.0 -> 22.20.0 (#445791)
2 parents 92d8a4d + b7b1ce1 commit 25f2aaa

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

pkgs/development/web/nodejs/nodejs.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,10 @@ let
420420
]
421421
# Those are annoyingly flaky, but not enough to be marked as such upstream.
422422
++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
423+
++ lib.optionals (majorVersion == "22" && stdenv.buildPlatform.isDarwin) [
424+
"test-cluster-dgram-1"
425+
"test/sequential/test-http-server-request-timeouts-mixed.js"
426+
]
423427
)
424428
}"
425429
];

pkgs/development/web/nodejs/v22.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ let
1515
python = python3;
1616
};
1717

18-
gypPatches = if stdenv.buildPlatform.isDarwin then callPackage ./gyp-patches.nix { } else [ ];
18+
gypPatches =
19+
if stdenv.buildPlatform.isDarwin then
20+
callPackage ./gyp-patches.nix { patch_tools = false; }
21+
else
22+
[ ];
1923
in
2024
buildNodejs {
2125
inherit enableNpm;
22-
version = "22.19.0";
23-
sha256 = "0272acfce50ce9ad060288321b1092719a7f19966f81419835410c59c09daa46";
26+
version = "22.20.0";
27+
sha256 = "ff7a6a6e8a1312af5875e40058351c4f890d28ab64c32f12b2cc199afa22002d";
2428
patches =
2529
(
2630
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -53,11 +57,5 @@ buildNodejs {
5357
./use-correct-env-in-tests.patch
5458
./bin-sh-node-run-v22.patch
5559
./use-nix-codesign.patch
56-
57-
# TODO: remove when included in a release
58-
(fetchpatch2 {
59-
url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
60-
hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
61-
})
6260
];
6361
}

0 commit comments

Comments
 (0)