From f5846d25a1335267bc8bad633ffcbdf2109b18dc Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 8 Aug 2024 12:09:14 +0200 Subject: [PATCH 1/2] nodejs: skip tests failing in sandbox in all platforms ce685a8422 added list of tests failing on sandbox, but for some reason only for Darwin. We should skip those tests on all platforms otherwise OfBorg builds are failing. --- pkgs/development/web/nodejs/nodejs.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index a589757664e1..96c8d9f64551 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -286,11 +286,6 @@ let "test-tls-cli-max-version-1.3" "test-tls-client-auth" "test-tls-sni-option" - ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ - # Disable tests that don’t work under macOS sandbox. - "test-macos-app-sandbox" - "test-os" - "test-os-process-priority" # This is a bit weird, but for some reason fs watch tests fail with # sandbox. "test-fs-promises-watch" @@ -311,6 +306,11 @@ let "test-runner-run" "test-runner-watch-mode" "test-watch-mode-files_watcher" + ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ + # Disable tests that don’t work under macOS sandbox. + "test-macos-app-sandbox" + "test-os" + "test-os-process-priority" ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [ # These tests fail on x86_64-darwin (even without sandbox). # TODO: revisit at a later date. From 35b556d314ff99940619f4f16920542fd5b8f972 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 24 Jul 2024 15:37:15 +0200 Subject: [PATCH 2/2] nodejs_20: 20.15.1 -> 20.16.0 --- pkgs/development/web/nodejs/v20.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index ae031708f6a7..1aa0fbf72e8d 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.15.1"; - sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ="; + version = "20.16.0"; + sha256 = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,14 +21,6 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; - hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; - hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; - }) (fetchpatch2 { url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8=";