diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-08 21:24:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-09 05:54:43 +0300 |
| commit | 1f2a18d9163f75c1001a04157f195557b0c24f8a (patch) | |
| tree | af5e9c92e375151ac241cca80e035d726f28f1ef /pkgs/development/python-modules/tensorflow/default.nix | |
| parent | 4bdcb220c9c9d965d37d3e18c5dcb10ef2605d22 (diff) | |
| download | nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.gz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.bz2 nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.lz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.xz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.zst nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.zip | |
protobuf: remove old versions
This leaves only protobuf3_1 which is the last version with libprotobuf2. Also fix several packages to build with the latest protobuf.
Diffstat (limited to 'pkgs/development/python-modules/tensorflow/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 388d27e06867..b8fb107968bc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -8,7 +8,7 @@ , linuxPackages ? null , numpy , six -, protobuf3_2 +, protobuf , swig , werkzeug , mock @@ -94,7 +94,7 @@ buildPythonPackage rec { ); propagatedBuildInputs = with stdenv.lib; - [ numpy six protobuf3_2 swig werkzeug mock ] + [ numpy six protobuf swig werkzeug mock ] ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; # Note that we need to run *after* the fixup phase because the |