Skip to content

Commit e9522c2

Browse files
nodejs_{20,22,23}: fix flaky test
1 parent 4685474 commit e9522c2

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

pkgs/development/web/nodejs/nodejs.nix

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
, gnupg
99
, darwin
1010
, installShellFiles
11+
, fetchpatch
1112
}:
1213

1314
{ enableNpm ? true, version, sha256, patches ? [] } @args:
@@ -299,6 +300,7 @@ let
299300
"FLAKY_TESTS=skip"
300301
# Skip some tests that are not passing in this context
301302
"CI_SKIP_TESTS=${lib.concatStringsSep "," ([
303+
# Tests don't work in sandbox.
302304
"test-child-process-exec-env"
303305
"test-child-process-uid-gid"
304306
"test-fs-write-stream-eagain"

pkgs/development/web/nodejs/v20.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
1+
{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true, fetchpatch }:
22

33
let
44
buildNodejs = callPackage ./nodejs.nix {
@@ -44,5 +44,10 @@ buildNodejs {
4444
stripLen = 1;
4545
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
4646
})
47+
# fixes test failure, remove once included in release
48+
(fetchpatch {
49+
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
50+
hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
51+
})
4752
] ++ gypPatches;
4853
}

pkgs/development/web/nodejs/v22.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
1+
{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true, fetchpatch }:
22

33
let
44
buildNodejs = callPackage ./nodejs.nix {
@@ -24,5 +24,10 @@ buildNodejs {
2424
url = "https://github.com/nodejs/node/commit/32f7d5ad1cf79e7e731e1bb7ac967f4f2a3194cf.patch?full_index=1";
2525
hash = "sha256-dyUr3caGfetrXgfAl+CLE1LKKetDZCpPwMg4EM98rqI=";
2626
})
27+
# fixes test failure, remove once included in release
28+
(fetchpatch {
29+
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
30+
hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
31+
})
2732
];
2833
}

pkgs/development/web/nodejs/v23.nix

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
openssl,
55
python3,
66
enableNpm ? true,
7+
fetchpatch,
78
}:
89

910
let
@@ -35,5 +36,10 @@ buildNodejs {
3536
url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
3637
hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
3738
})
39+
# fixes test failure, remove once included in release
40+
(fetchpatch {
41+
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
42+
hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
43+
})
3844
];
3945
}

0 commit comments

Comments
 (0)