public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56820 from timokau/tensorflow-py2-fixes

Browse Source 
Tensorflow py2 fixes
This commit is contained in:
Timo Kaufmann 2019-03-04 15:01:26 +01:00 committed by GitHub
commit 2a5993d617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/tensorflow-tensorboard/default.nix
View File

@ -26,12 +26,16 @@ buildPythonPackage rec {
sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2"; sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2";
} else { } else {
python = "py2"; python = "py2";
sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf";
})); }));
propagatedBuildInputs = [ numpy werkzeug protobuf propagatedBuildInputs = [
markdown numpy
grpcio absl-py ]; # ++ lib.optional (!isPy3k) futures; werkzeug
protobuf
markdown
grpcio absl-py
] ++ lib.optional (!isPy3k) futures;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "TensorFlow's Visualization Toolkit"; description = "TensorFlow's Visualization Toolkit";

3
pkgs/development/python-modules/tensorflow/bin.nix
View File

@ -55,7 +55,8 @@ in buildPythonPackage rec {
in fetchurl dls.${key}; in fetchurl dls.${key};
propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ] propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]
++ lib.optional (!isPy3k) mock; ++ 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 # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions. # and the propageted input tensorflow-tensorboard which causes environment collisions.