From 28379deacfadc35b7854f821a769fb5d7f64df7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 22 Jun 2025 20:17:37 -0700 Subject: [PATCH 1/3] python3Packages.jaxlib-build: pass pkgs.snappy as snappy-cpp --- pkgs/development/python-modules/jaxlib/default.nix | 9 ++++++--- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 37030e69f531..6f869268aa52 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -38,7 +38,7 @@ giflib, libjpeg_turbo, python, - snappy, + snappy-cpp, zlib, config, @@ -254,7 +254,7 @@ let pybind11 scipy six - snappy + snappy-cpp zlib ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; @@ -470,7 +470,10 @@ buildPythonPackage { numpy scipy six - snappy + ]; + + buildInputs = [ + snappy-cpp ]; pythonImportsCheck = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 954c54da7583..cf9b1ac4dce5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7182,7 +7182,9 @@ self: super: with self; { jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; - jaxlib-build = callPackage ../development/python-modules/jaxlib { }; + jaxlib-build = callPackage ../development/python-modules/jaxlib { + snappy-cpp = pkgs.snappy; + }; jaxopt = callPackage ../development/python-modules/jaxopt { }; From c12384329f3c3e206b546d2625653da875be5b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 22 Jun 2025 20:18:14 -0700 Subject: [PATCH 2/3] python3Packages.python-snappy: pass pkgs.snappy as snappy-cpp --- pkgs/development/python-modules/python-snappy/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index eb6e12df362c..3b0dadc2ac28 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -4,7 +4,7 @@ fetchPypi, cramjam, setuptools, - snappy, + snappy-cpp, unittestCheckHook, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = [ snappy ]; + buildInputs = [ snappy-cpp ]; dependencies = [ cramjam ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf9b1ac4dce5..44808a834e01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14562,7 +14562,9 @@ self: super: with self; { python-snap7 = callPackage ../development/python-modules/python-snap7 { inherit (pkgs) snap7; }; - python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + python-snappy = callPackage ../development/python-modules/python-snappy { + snappy-cpp = pkgs.snappy; + }; python-snoo = callPackage ../development/python-modules/python-snoo { }; From d0fc6ee5119d1a6409a20a3cdb44dc77801abeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 22 Jun 2025 20:19:33 -0700 Subject: [PATCH 3/3] python3Packages.tensorflow-build: pass pkgs.snappy as snappy-cpp --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index c9d3eb0ac79e..2af0d63b9d5b 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -55,7 +55,7 @@ jsoncpp, nsync, curl, - snappy, + snappy-cpp, flatbuffers-core, icu, double-conversion, @@ -328,7 +328,7 @@ let (pybind11.overridePythonAttrs (_: { inherit stdenv; })) - snappy + snappy-cpp sqlite ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44808a834e01..30c061627bee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17486,6 +17486,7 @@ self: super: with self; { grpcio = compat.grpcioTF; tensorboard = compat.tensorboardTF; abseil-cpp = pkgs.abseil-cpp_202301; + snappy-cpp = pkgs.snappy; # Tensorflow 2.13 doesn't support gcc13: # https://github.com/tensorflow/tensorflow/issues/61289