Merge remote-tracking branch 'origin/master' into staging-next

2025-05-31 13:30:35 +02:00
parent 01f8f5e5f6 a9bfec975f
commit 4fa55ce14d
54 changed files with 1004 additions and 819 deletions
@@ -26,6 +26,7 @@
  sqlite,
  xz,
  zlib,
+  zstd,

  # platform-specific dependencies
  bashNonInteractive,
@@ -202,6 +203,8 @@ let
    ++ optionals (!stdenv.hostPlatform.isDarwin) [
      autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
      autoreconfHook
+    ]
+    ++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
      pkg-config
    ]
    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -231,6 +234,9 @@ let
      xz
      zlib
    ]
+    ++ optionals (passthru.pythonAtLeast "3.14") [
+      zstd
+    ]
    ++ optionals withMpdecimal [
      mpdecimal
    ]