nodejs: do not skip passing tests

NixOS · Nov 15, 2024 · 4f93e62 · 4f93e62
1 parent 3f47e37
commit 4f93e62
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
@@ -301,32 +301,11 @@ let
       "CI_SKIP_TESTS=${lib.concatStringsSep "," ([
         "test-child-process-exec-env"
         "test-child-process-uid-gid"
-        "test-fs-write-stream-eagain"
         "test-process-euid-egid"
         "test-process-initgroups"
         "test-process-setgroups"
         "test-process-uid-gid"
         "test-setproctitle"
-        # This is a bit weird, but for some reason fs watch tests fail with
-        # sandbox.
-        "test-fs-promises-watch"
-        "test-fs-watch"
-        "test-fs-watch-encoding"
-        "test-fs-watch-non-recursive"
-        "test-fs-watch-recursive-add-file"
-        "test-fs-watch-recursive-add-file-to-existing-subfolder"
-        "test-fs-watch-recursive-add-file-to-new-folder"
-        "test-fs-watch-recursive-add-file-with-url"
-        "test-fs-watch-recursive-add-folder"
-        "test-fs-watch-recursive-assert-leaks"
-        "test-fs-watch-recursive-promise"
-        "test-fs-watch-recursive-symlink"
-        "test-fs-watch-recursive-sync-write"
-        "test-fs-watch-recursive-update-file"
-        "test-fs-watchfile"
-        "test-runner-run"
-        "test-runner-watch-mode"
-        "test-watch-mode-files_watcher"
       ] ++ lib.optionals (!lib.versionAtLeast version "22") [
         "test-tls-multi-key"
       ] ++ lib.optionals stdenv.buildPlatform.isDarwin [

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
@@ -48,5 +48,9 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1";
       hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4=";
     })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/9d0041ac40f225a8c79f57ca96f205d2a9ba7048.patch";
+      hash = "sha256-WhhtXUQ7GthoUiOGcznzF59E5kDaDB4pCCnSW3uaDOo=";
+    })
   ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
@@ -24,5 +24,10 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/32f7d5ad1cf79e7e731e1bb7ac967f4f2a3194cf.patch?full_index=1";
       hash = "sha256-dyUr3caGfetrXgfAl+CLE1LKKetDZCpPwMg4EM98rqI=";
     })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/9d0041ac40f225a8c79f57ca96f205d2a9ba7048.patch";
+      hash = "sha256-YS5XTFDJQtzANPZXRjJnjS+y0GqpGG7TqK/+lzFwnGM=";
+      revert = true;
+    })
   ];
 }
diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
@@ -24,5 +24,11 @@ buildNodejs {
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
+
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/9d0041ac40f225a8c79f57ca96f205d2a9ba7048.patch";
+      hash = "sha256-YS5XTFDJQtzANPZXRjJnjS+y0GqpGG7TqK/+lzFwnGM=";
+      revert = true;
+    })
   ];
 }