From 40e35fa25fde2f922859ce4d3c517e6230c6953f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 28 Oct 2024 10:53:34 +0100 Subject: [PATCH] nodejs_22: 22.9.0 -> 22.10.0 (#349157) --- pkgs/development/web/nodejs/v22.nix | 36 +++-------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index dc4f10b7454d..6a71b0056bf7 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -5,14 +5,11 @@ let inherit openssl; python = python3; }; - - gypPatches = callPackage ./gyp-patches.nix { } ++ [ - ]; in buildNodejs { inherit enableNpm; - version = "22.9.0"; - sha256 = "a55aeb368dee93432f610127cf94ce682aac07b93dcbbaadd856df122c9239df"; + version = "22.10.0"; + sha256 = "3180710d3130ad9df01466abf010e408d41b374be54301d1480d10eca73558e0"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,32 +18,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - - # Patches for OpenSSL 3.2 - # Patches not yet released - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; - hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; - hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; - hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; - hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; - hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; - hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; - }) - ] ++ gypPatches; + ]; }