nodejs_22: 22.19.0 -> 22.20.0 (#445791)
This commit is contained in:
@@ -420,6 +420,10 @@ let
|
||||
]
|
||||
# Those are annoyingly flaky, but not enough to be marked as such upstream.
|
||||
++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
|
||||
++ lib.optionals (majorVersion == "22" && stdenv.buildPlatform.isDarwin) [
|
||||
"test-cluster-dgram-1"
|
||||
"test/sequential/test-http-server-request-timeouts-mixed.js"
|
||||
]
|
||||
)
|
||||
}"
|
||||
];
|
||||
|
||||
@@ -15,12 +15,16 @@ let
|
||||
python = python3;
|
||||
};
|
||||
|
||||
gypPatches = if stdenv.buildPlatform.isDarwin then callPackage ./gyp-patches.nix { } else [ ];
|
||||
gypPatches =
|
||||
if stdenv.buildPlatform.isDarwin then
|
||||
callPackage ./gyp-patches.nix { patch_tools = false; }
|
||||
else
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "22.19.0";
|
||||
sha256 = "0272acfce50ce9ad060288321b1092719a7f19966f81419835410c59c09daa46";
|
||||
version = "22.20.0";
|
||||
sha256 = "ff7a6a6e8a1312af5875e40058351c4f890d28ab64c32f12b2cc199afa22002d";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
@@ -53,11 +57,5 @@ buildNodejs {
|
||||
./use-correct-env-in-tests.patch
|
||||
./bin-sh-node-run-v22.patch
|
||||
./use-nix-codesign.patch
|
||||
|
||||
# TODO: remove when included in a release
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
|
||||
hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user