From 0b7dc4a7205db089e58c02803a8c49c98f163e0f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 10 Feb 2026 14:46:43 +0100 Subject: [PATCH] nodejs_25: 25.6.0 -> 25.6.1 --- pkgs/development/web/nodejs/nodejs.nix | 5 +++++ pkgs/development/web/nodejs/v25.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index ca91b9d69b2e..c3e8548004d8 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -11,6 +11,7 @@ libuv, lief, llhttp, + merve, nghttp2, nghttp3, ngtcp2, @@ -126,6 +127,7 @@ let useSharedAdaAndSimd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.2"; useSharedLief = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6"; + useSharedMerve = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6.1"; useSharedSQLite = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.5"; useSharedZstd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.15"; @@ -166,6 +168,9 @@ let // (lib.optionalAttrs useSharedLief { inherit lief; }) + // (lib.optionalAttrs useSharedMerve { + inherit merve; + }) // (lib.optionalAttrs useSharedZstd { inherit zstd; }); diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix index 91215b2a2c32..50f7d9baf93c 100644 --- a/pkgs/development/web/nodejs/v25.nix +++ b/pkgs/development/web/nodejs/v25.nix @@ -25,8 +25,8 @@ let in buildNodejs { inherit enableNpm; - version = "25.6.0"; - sha256 = "9db6848c802b1981c0faeb71a5b8cc79913f82a747f7f1d50260c6d2f781ef7e"; + version = "25.6.1"; + sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then