From 409f467077b9c82e3d15b2a22b8c5fd26e716dad Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 16 Apr 2026 12:33:29 +0200 Subject: [PATCH 1/3] nodejs_24: fix openssl related tests --- pkgs/development/web/nodejs/v24.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 2573737c3fdd..6c0c164e9285 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 + # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124 + # OpenSSL reports different errors + # https://github.com/nodejs/node/pull/62629 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/dd25d8f29d3ddadcf5a5ebfdf98ece55f9df96c6.patch?full_index=1"; + hash = "sha256-6cxRN7TyWmJgUZt3jp2YXbVIjrDb2BNep5LxBOtT3Q0="; + }) ] ++ gypPatches ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [ From da8bac81b2e245ce344798abd6159a0d704fa600 Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 16 Apr 2026 12:26:51 +0200 Subject: [PATCH 2/3] nodejs_25: fix openssl related tests --- pkgs/development/web/nodejs/v25.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix index f16fd951dce2..e15993766aee 100644 --- a/pkgs/development/web/nodejs/v25.nix +++ b/pkgs/development/web/nodejs/v25.nix @@ -56,6 +56,14 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch ./use-nix-codesign.patch + + # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124 + # OpenSSL reports different errors + # https://github.com/nodejs/node/pull/62629 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/dd25d8f29d3ddadcf5a5ebfdf98ece55f9df96c6.patch?full_index=1"; + hash = "sha256-6cxRN7TyWmJgUZt3jp2YXbVIjrDb2BNep5LxBOtT3Q0="; + }) ] ++ gypPatches; } From f5248024d1a33a17fb381e9afb019b0189b2737c Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 16 Apr 2026 12:27:18 +0200 Subject: [PATCH 3/3] nodejs_{20,22}: disable broken openssl tests --- pkgs/development/web/nodejs/nodejs.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 070a37f8f0ad..e52cf2892786 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -512,6 +512,12 @@ let ++ lib.optional ( majorVersion == "22" && stdenv.buildPlatform.isDarwin ) "test/sequential/test-http-server-request-timeouts-mixed.js" + # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124 + # OpenSSL reports different errors + # https://github.com/nodejs/node/pull/62629 + # patch does not apply + ++ lib.optional (!lib.versionAtLeast version "24") "test-tls-junk-server" + ++ lib.optional (majorVersion == "22") "test-tls-alert-handling" ) }" ];