From 80cb07c14ed63c9bcf14db6387a06b65c152a872 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 17 Sep 2024 23:38:21 +0200
Subject: [PATCH] nodejs_22: 22.8.0 -> 22.9.0

---
 .../nodejs/gyp-patches-v22-import-sys.patch   | 14 -------------
 pkgs/development/web/nodejs/v22.nix           | 21 ++-----------------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch

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 4f1abea901c0ffb..000000000000000
--- 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 9c7530f52bba3ce..dc4f10b7454d3bc 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -11,8 +11,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.8.0";
-  sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7";
+  version = "22.9.0";
+  sha256 = "a55aeb368dee93432f610127cf94ce682aac07b93dcbbaadd856df122c9239df";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
@@ -23,23 +23,6 @@ buildNodejs {
     ./bin-sh-node-run-v22.patch
 
     # Patches for OpenSSL 3.2
-    # Patches already in 22.9.0
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1";
-      hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1";
-      hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1";
-      hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1";
-      hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY=";
-    })
     # Patches not yet released
     (fetchpatch2 {
       url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1";