From b79bd305abe4a08888bfa54639c15c091b4def54 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 7 Mar 2026 08:23:21 +0100 Subject: [PATCH] nodejs: remove custom logic for skipping test --- pkgs/development/web/nodejs/nodejs.nix | 4 ---- pkgs/development/web/nodejs/v22.nix | 7 +++++++ pkgs/development/web/nodejs/v24.nix | 7 +++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 32473cad4ec3..09df27d56b1e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -461,10 +461,6 @@ let ++ lib.optionals (!lib.versionAtLeast version "22") [ "test-tls-multi-key" ] - ++ lib.optionals useSharedAdaAndSimd [ - # Different versions of Ada affect the WPT tests - "test-url" - ] ++ lib.optionals stdenv.hostPlatform.is32bit [ # utime (actually utimensat) fails with EINVAL on 2038 timestamp "test-fs-utimes-y2K38" diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 1dd6c16bbe36..700f0f70cd3e 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -55,6 +55,13 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch ./use-nix-codesign.patch + + # TODO: remove this when included in a next release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a5e534c21af49ae1b34854846b6913daa7df0808.patch?full_index=1"; + hash = "sha256-4cr94fsJrq5iCAHOf60wJQQkP/K2YWYY5W7GHs8Sbxg="; + includes = [ "test/*" ]; + }) ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ # Fix builds with shared llhttp diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 3b11c99c347c..b18371139dba 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -56,6 +56,13 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch ./use-nix-codesign.patch + + # TODO: remove this when included in a next release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a5e534c21af49ae1b34854846b6913daa7df0808.patch?full_index=1"; + hash = "sha256-4cr94fsJrq5iCAHOf60wJQQkP/K2YWYY5W7GHs8Sbxg="; + includes = [ "test/*" ]; + }) ] ++ gypPatches ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [