diff options
| author | Antoine du Hamel | 2024-09-17 23:38:21 +0200 |
|---|---|---|
| committer | Antoine du Hamel | 2024-11-13 18:37:31 +0100 |
| commit | 9eb9f6872c2a192767e1a5e93a45be1668503595 (patch) | |
| tree | 20f524dac7c2b077151b8bc6157ab6d60e7a9777 | |
| parent | 4480cb8f62c96ede2bf3fc09f44de41879a29751 (diff) | |
nodejs_22: 22.8.0 -> 22.9.0
| -rw-r--r-- | pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v22.nix | 5 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch deleted file mode 100644 index 4f1abea901c0..000000000000 --- a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch +++ /dev/null @@ -1,14 +0,0 @@ -For some reason Node.js v22 has two different GYP versions vendored, and -only one of them contains `import sys`. - ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py -@@ -25,6 +25,7 @@ - import os - import re - import subprocess -+import sys - import gyp - import gyp.common - import gyp.xcode_emulation - diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 6f03749e2d22..9a5abc3a381a 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -7,13 +7,12 @@ let }; gypPatches = callPackage ./gyp-patches.nix { } ++ [ - ./gyp-patches-v22-import-sys.patch ]; in buildNodejs { inherit enableNpm; - version = "22.8.0"; - sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7"; + version = "22.9.0"; + sha256 = "a55aeb368dee93432f610127cf94ce682aac07b93dcbbaadd856df122c9239df"; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch |