From ba733f8000925e837e30765f273fec153426403d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 24 Apr 2024 04:20:00 +0000
Subject: [PATCH 1/2] nodejs_22: init at 22.0.0

Changelog: https://github.com/nodejs/node/releases/tag/v22.0.0
---
 pkgs/development/web/nodejs/v22.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix     | 10 +++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/v22.nix

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
new file mode 100644
index 000000000000..a72f22b6f498
--- /dev/null
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -0,0 +1,18 @@
+{ callPackage, openssl, python3, enableNpm ? true }:
+
+let
+  buildNodejs = callPackage ./nodejs.nix {
+    inherit openssl;
+    python = python3;
+  };
+in
+buildNodejs {
+  inherit enableNpm;
+  version = "22.0.0";
+  sha256 = "sha256-IuKPv/MfaQc7gCTLQnReUQX4QEHzR1smC5fVoUEDnRo=";
+  patches = [
+    ./disable-darwin-v8-system-instrumentation-node19.patch
+    ./bypass-darwin-xcrun-node16.patch
+    ./node-npm-build-npm-package-logic.patch
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cefd845762f1..6385e2bfff8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10161,10 +10161,14 @@ with pkgs;
   nodejs-slim_21 = callPackage ../development/web/nodejs/v21.nix { enableNpm = false; };
   corepack_21 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_21; });
 
+  nodejs_22 = callPackage ../development/web/nodejs/v22.nix { };
+  nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
+  corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });
+
   # Update this when adding the newest nodejs major version!
-  nodejs_latest = nodejs_21;
-  nodejs-slim_latest = nodejs-slim_21;
-  corepack_latest = hiPrio corepack_21;
+  nodejs_latest = nodejs_22;
+  nodejs-slim_latest = nodejs-slim_22;
+  corepack_latest = hiPrio corepack_22;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 

From 12c19fa317f73b5aea5e32f60e2cd00222e2e831 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 24 Apr 2024 04:20:00 +0000
Subject: [PATCH 2/2] nodejs_21: drop

Node.js 21 reachs EOL in 2024-06-01
---
 pkgs/development/web/nodejs/v21.nix | 18 ------------------
 pkgs/top-level/all-packages.nix     |  4 ----
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/v21.nix

diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix
deleted file mode 100644
index dedda892a918..000000000000
--- a/pkgs/development/web/nodejs/v21.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ callPackage, openssl, python3, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {
-    inherit openssl;
-    python = python3;
-  };
-in
-buildNodejs {
-  inherit enableNpm;
-  version = "21.7.3";
-  sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6";
-  patches = [
-    ./disable-darwin-v8-system-instrumentation-node19.patch
-    ./bypass-darwin-xcrun-node16.patch
-    ./node-npm-build-npm-package-logic.patch
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6385e2bfff8e..4d25df352d4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10157,10 +10157,6 @@ with pkgs;
   nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; };
   corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; });
 
-  nodejs_21 = callPackage ../development/web/nodejs/v21.nix { };
-  nodejs-slim_21 = callPackage ../development/web/nodejs/v21.nix { enableNpm = false; };
-  corepack_21 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_21; });
-
   nodejs_22 = callPackage ../development/web/nodejs/v22.nix { };
   nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
   corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });