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/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/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 e31c98e68a3e..ad6456ba5daa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7190,7 +7190,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 { }; @@ -14582,7 +14584,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 { }; @@ -17508,6 +17512,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