From 9e95109b89fa575e3c6f187aab10b250dc59e330 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 4 Mar 2019 14:08:55 +0100 Subject: [PATCH 1/2] pythonPackages.tensorflow-tensorboard: fix python2 build Fix build after https://github.com/NixOS/nixpkgs/pull/56669. Update the python2 hash and re-add the python2 `futures` dependency. Not sure if there was a reason for it to be removed in the first place. --- .../tensorflow-tensorboard/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index b196fc8edce6..7840e6de0092 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -26,12 +26,16 @@ buildPythonPackage rec { sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2"; } else { python = "py2"; - sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; + sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf"; })); - propagatedBuildInputs = [ numpy werkzeug protobuf - markdown - grpcio absl-py ]; # ++ lib.optional (!isPy3k) futures; + propagatedBuildInputs = [ + numpy + werkzeug + protobuf + markdown + grpcio absl-py + ] ++ lib.optional (!isPy3k) futures; meta = with stdenv.lib; { description = "TensorFlow's Visualization Toolkit"; From af7455b1c80cf81b98f8a205bf6d16c44518ea55 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 4 Mar 2019 14:10:28 +0100 Subject: [PATCH 2/2] pythonPackages.tensorflow: fix python<3.4 build This was already added for the source build, but missing for the binary build. --- pkgs/development/python-modules/tensorflow/bin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index e1c25d9eca71..03f1e66bf501 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -55,7 +55,8 @@ in buildPythonPackage rec { 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.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.