From b17808cbebf3a6883ed3588f54a97e13b8752867 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 10 Feb 2025 16:04:24 +0100 Subject: [PATCH] nodejs_20: 20.18.2 -> 20.18.3 (cherry picked from commit fbf4ceda086fc693fc8130864a73d6059e515e41) --- pkgs/development/web/nodejs/v20.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 8cc82cea4e40f..d0679570f0486 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.18.2"; - sha256 = "69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882"; + version = "20.18.3"; + sha256 = "0674f16f3bc284c11724cd3f7c2a43f7c2c13d2eb7a872dd0db198f3d588c5f2"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -35,16 +35,6 @@ buildNodejs { stripLen = 1; hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; }) - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; - }) # Backport V8 fixes for LLVM 19. (fetchpatch2 { url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; @@ -60,10 +50,5 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) - # fixes test failure, remove when included in release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; - }) ] ++ gypPatches; }