From fb13561ac91671eb10016aa97a3c5762aeeab615 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 08:56:13 +0200 Subject: [PATCH 1/3] python312Packages.tensorflow: use tensorflow-bin by default --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; From 804211c4c43ee5da01af307d9cf503d2f95f290a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 11:31:16 +0200 Subject: [PATCH 2/3] python312Packages.tf-keras: clean derivation --- .../python-modules/tf-keras/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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 = [ From a076a88139452237749062581ce27704d6677b91 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 4 Oct 2024 09:53:16 +0200 Subject: [PATCH 3/3] python312Packages.keras: add missing dependency distutils --- pkgs/development/python-modules/keras/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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"