Merge staging-next into staging
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
libuv,
|
||||
lief,
|
||||
llhttp,
|
||||
merve,
|
||||
nghttp2,
|
||||
nghttp3,
|
||||
ngtcp2,
|
||||
@@ -125,6 +126,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";
|
||||
|
||||
@@ -165,6 +167,9 @@ let
|
||||
// (lib.optionalAttrs useSharedLief {
|
||||
inherit lief;
|
||||
})
|
||||
// (lib.optionalAttrs useSharedMerve {
|
||||
inherit merve;
|
||||
})
|
||||
// (lib.optionalAttrs useSharedZstd {
|
||||
inherit zstd;
|
||||
});
|
||||
|
||||
@@ -23,8 +23,8 @@ let
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
version = "25.6.0";
|
||||
sha256 = "9db6848c802b1981c0faeb71a5b8cc79913f82a747f7f1d50260c6d2f781ef7e";
|
||||
version = "25.6.1";
|
||||
sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
Reference in New Issue
Block a user