python: tensorflow: 1.13.1 -> 1.14.0, tensorflow-tensorboard: 1.13.0 -> 1.14.0, tensorflow-estimator: 1.13.0 -> 1.14.0

All in one commit because the packages are all interdependent and have
to be upgraded together.
This commit is contained in:
Timo Kaufmann
2019-06-22 13:43:06 +02:00
parent 0266ca8db0
commit 377a60f902
6 changed files with 68 additions and 52 deletions

View File

@@ -5,6 +5,8 @@
, isPy3k, pythonOlder
, astor
, gast
, google-pasta
, wrapt
, numpy
, six
, termcolor
@@ -41,7 +43,7 @@ let
in buildPythonPackage rec {
pname = "tensorflow";
version = "1.13.1";
version = "1.14.0";
format = "wheel";
src = let
@@ -53,9 +55,23 @@ in buildPythonPackage rec {
dls = import (./. + "/tf${version}-hashes.nix");
in fetchurl dls.${key};
propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]
++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
propagatedBuildInputs = [
protobuf
numpy
termcolor
grpcio
six
astor
absl-py
gast
google-pasta
wrapt
tensorflow-estimator
tensorflow-tensorboard
keras-applications
keras-preprocessing
] ++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.