nodejs_{20,22,23}: fix flaky test

NixOS · Nov 26, 2024 · e9522c2 · e9522c2
1 parent 4685474
commit e9522c2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
@@ -8,6 +8,7 @@
 , gnupg
 , darwin
 , installShellFiles
+, fetchpatch
 }:
 
 { enableNpm ? true, version, sha256, patches ? [] } @args:
@@ -299,6 +300,7 @@ let
       "FLAKY_TESTS=skip"
       # Skip some tests that are not passing in this context
       "CI_SKIP_TESTS=${lib.concatStringsSep "," ([
+        # Tests don't work in sandbox.
         "test-child-process-exec-env"
         "test-child-process-uid-gid"
         "test-fs-write-stream-eagain"

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
+{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true, fetchpatch }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -44,5 +44,10 @@ buildNodejs {
       stripLen = 1;
       hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
     })
+    # fixes test failure, remove once included in release
+    (fetchpatch {
+      url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
+      hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
+    })
   ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
+{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true, fetchpatch }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -24,5 +24,10 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/32f7d5ad1cf79e7e731e1bb7ac967f4f2a3194cf.patch?full_index=1";
       hash = "sha256-dyUr3caGfetrXgfAl+CLE1LKKetDZCpPwMg4EM98rqI=";
     })
+    # fixes test failure, remove once included in release
+    (fetchpatch {
+      url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
+      hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
+    })
   ];
 }
diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
@@ -4,6 +4,7 @@
   openssl,
   python3,
   enableNpm ? true,
+  fetchpatch,
 }:
 
 let
@@ -35,5 +36,10 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
       hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
     })
+    # fixes test failure, remove once included in release
+    (fetchpatch {
+      url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
+      hash = "sha256-y45G9Vc58Nh0I+kSS3iRnoZe7se55rk3PVMpgZgPY+U=";
+    })
   ];
 }