lol

nodejs: use upstream patch instead of custom one

+25 -7
-7
pkgs/development/web/nodejs/use-correct-env-in-tests.patch
··· 1 1 `/usr/bin/env` is not available. 2 2 3 - --- old/test/common/assertSnapshot.js 4 - +++ new/test/common/assertSnapshot.js 5 - @@ -81,2 +81,2 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... 6 - - const executable = tty ? 'tools/pseudo-tty.py' : process.execPath; 7 - - const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename]; 8 - + const executable = tty ? 'python3' : process.execPath; 9 - + const args = tty ? ['tools/pseudo-tty.py', process.execPath, ...flags, filename] : [...flags, filename]; 10 3 --- old/test/parallel/test-child-process-default-options.js 11 4 +++ new/test/parallel/test-child-process-default-options.js 12 5 @@ -35 +35 @@ if (isWindows) {
+9
pkgs/development/web/nodejs/v18.nix
··· 37 37 url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; 38 38 hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; 39 39 }) 40 + (fetchpatch2 { 41 + url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; 42 + hash = "sha256-JJi8z9aaWnu/y3nZGOSUfeNzNSCYzD9dzoHXaGkeaEA="; 43 + includes = ["test/common/assertSnapshot.js"]; 44 + }) 45 + (fetchpatch2 { 46 + url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; 47 + hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; 48 + }) 40 49 ] ++ gypPatches; 41 50 }
+8
pkgs/development/web/nodejs/v20.nix
··· 27 27 url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; 28 28 hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; 29 29 }) 30 + (fetchpatch2 { 31 + url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; 32 + hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8="; 33 + }) 34 + (fetchpatch2 { 35 + url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; 36 + hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; 37 + }) 30 38 ] ++ gypPatches; 31 39 }
+8
pkgs/development/web/nodejs/v22.nix
··· 20 20 ./node-npm-build-npm-package-logic.patch 21 21 ./use-correct-env-in-tests.patch 22 22 ./bin-sh-node-run-v22.patch 23 + (fetchpatch2 { 24 + url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; 25 + hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8="; 26 + }) 27 + (fetchpatch2 { 28 + url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; 29 + hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; 30 + }) 23 31 ] ++ gypPatches; 24 32 }