about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-11-10 20:40:30 +0300
committerNikolay Amiantov <ab@fmap.me>2018-02-20 23:37:50 +0300
commit102c91d45eed0295a745e6e54bc125fb4a8eeac3 (patch)
tree9f80969c2467077170928520d7daf794a537c8ef
parent430e0f4a802fa8792accca58f03e011120b94c4e (diff)
downloadnixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar.gz
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar.bz2
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar.lz
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar.xz
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.tar.zst
nixlib-102c91d45eed0295a745e6e54bc125fb4a8eeac3.zip
python.pkgs.tensorflow-tensorboard: 0.1.5 -> 1.5.1
-rw-r--r--pkgs/development/python-modules/tensorflow-tensorboard/default.nix23
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index 9f48b8fb971a..f0b4e6f341d4 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -1,22 +1,19 @@
-{ stdenv
-, fetchPypi
-, buildPythonPackage
-, isPy3k
+{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k
 , bleach_1_5_0
 , numpy
 , werkzeug
 , protobuf
 , markdown
+, futures
 }:
 
-# tensorflow is built from a downloaded wheel, because the upstream
-# project's build system is an arcane beast based on
-# bazel. Untangling it and building the wheel from source is an open
-# problem.
+# tensorflow is built from a downloaded wheel, because
+# https://github.com/tensorflow/tensorboard/issues/719
+# blocks buildBazelPackage.
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "0.1.5";
+  version = "1.5.1";
   name = "${pname}-${version}";
   format = "wheel";
 
@@ -26,16 +23,16 @@ buildPythonPackage rec {
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "0sfia05y1mzgy371faj96vgzhag1rgpa3gnbz9w1fay13jryw26x";
+    sha256 = "1cydgvrr0s05xqz1v9z2wdiv60gzbs8wv9wvbflw5700a2llb63l";
   } else {
     python = "py2";
-    sha256 = "0qx4f55zp54x079kxir4zz5b1ckiglsdcb9afz5wcdj6af4a6czg";
+    sha256 = "0dhljddlirq6nr84zg4yrk5k69gj3x2abb6wg3crgrparb6qbya7";
   }));
 
-  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ];
+  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ] ++ lib.optional (!isPy3k) futures;
 
   meta = with stdenv.lib; {
-    description = "TensorFlow helps the tensors flow";
+    description = "TensorFlow's Visualization Toolkit";
     homepage = http://tensorflow.org;
     license = licenses.asl20;
     maintainers = with maintainers; [ abbradar ];