aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix')
-rw-r--r--nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
index d32305ff513..acb5f473ec9 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
@@ -19,7 +19,7 @@
, opt-einsum
, backports_weakref
, tensorflow-estimator_2
-, tensorflow-tensorboard
+, tensorflow-tensorboard_2
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
@@ -77,7 +77,7 @@ in buildPythonPackage {
google-pasta
wrapt
tensorflow-estimator_2
- tensorflow-tensorboard
+ tensorflow-tensorboard_2
keras-applications
keras-preprocessing
] ++ lib.optional (!isPy3k) mock
@@ -159,6 +159,14 @@ in buildPythonPackage {
done
'';
+ # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
+ # and the propagated input tensorflow-tensorboard, which causes environment collisions.
+ # Another possibility would be to have tensorboard only in the buildInputs
+ # See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
+ postInstall = ''
+ rm $out/bin/tensorboard
+ '';
+
pythonImportsCheck = [
"tensorflow"
"tensorflow.keras"