From f634fa26cc24f7a32913f5c6d8afedcfd80116eb Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 22 Nov 2024 19:31:46 +0100 Subject: [PATCH] nodejs_{20,22,23}: fix flaky test --- pkgs/development/web/nodejs/nodejs.nix | 1 + pkgs/development/web/nodejs/v20.nix | 5 +++++ pkgs/development/web/nodejs/v22.nix | 5 +++++ pkgs/development/web/nodejs/v23.nix | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 86d5897f8e62..90c2d23447b5 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -299,6 +299,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 index a29c5385a4fc..a9bac963f2da 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -44,5 +44,10 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) + # fixes test failure, remove when included in release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; + hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index e11d2fb882b3..0bdabda01400 100644 --- 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="; }) + # fixes test failure, remove when included in release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; + hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + }) ]; } diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 0e55a6484dd7..43cbaa2b8e71 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -35,5 +35,10 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; }) + # fixes test failure, remove when included in release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; + hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + }) ]; }