Merge remote-tracking branch 'origin/master' into staging-next

2025-10-05 12:17:08 +03:00
parent 10ceb7bbdf aee3f2ec9e
commit e93c560b79
1577 changed files with 2261 additions and 2253 deletions
@@ -7,7 +7,7 @@
 let
  url = "https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.patch?full_index=1";
 in
-lib.optionals patch_tools ([
+lib.optionals patch_tools [
  # Fixes builds with Nix sandbox on Darwin for gyp.
  (fetchpatch2 {
    inherit url;
@@ -15,15 +15,15 @@ lib.optionals patch_tools ([
    stripLen = 1;
    extraPrefix = "tools/gyp/";
  })
-])
-++ lib.optionals patch_npm ([
+]
++ lib.optionals patch_npm [
  (fetchpatch2 {
    inherit url;
    hash = "sha256-cXTwmCRHrNhuY1+3cD/EvU0CJ+1Nk4TRh6c3twvfaW8=";
    stripLen = 1;
    extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
  })
-])
+]
 ++ [
  ./gyp-patches-set-fallback-value-for-CLT-darwin.patch
 ]