diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 9ee9110ef092e..768a6305776b1 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -18,6 +18,8 @@ packaging, rich, tensorflow, + pythonAtLeast, + distutils, }: buildPythonPackage rec { @@ -48,7 +50,7 @@ buildPythonPackage rec { packaging rich tensorflow - ]; + ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; pythonImportsCheck = [ "keras" diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix index c6d9e0c6fdb45..1664a05c2914e 100644 --- a/pkgs/development/python-modules/tf-keras/default.nix +++ b/pkgs/development/python-modules/tf-keras/default.nix @@ -1,12 +1,16 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, + + # build-system setuptools, - wheel, + + # dependencies numpy, tensorflow, + + # tests pytestCheckHook, }: @@ -15,24 +19,14 @@ buildPythonPackage rec { version = "2.17.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { pname = "tf_keras"; inherit version; hash = "sha256-/al8GNow2g9ypafoDz7uNDsJ9MIG2tbFfJRPss0YVg4="; }; - nativeBuildInputs = [ - ]; - - pythonRelaxDeps = [ - "tensorflow" - ]; - build-system = [ setuptools - wheel ]; dependencies = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcd1dcbfb404e..a8dc453f27df9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4098,7 +4098,7 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; - libtensorflow = python3.pkgs.tensorflow.libtensorflow; + libtensorflow = python3.pkgs.tensorflow-build.libtensorflow; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e26247c259f26..152dc8184a518 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15399,7 +15399,7 @@ self: super: with self; { tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - tensorflow = self.tensorflow-build; + tensorflow = self.tensorflow-bin; tensorflowWithCuda = self.tensorflow.override { cudaSupport = true;