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.
This commit is contained in:
Nikolay Amiantov
2017-09-08 21:24:14 +03:00
parent 4bdcb220c9
commit 1f2a18d916
13 changed files with 31 additions and 98 deletions

View File

@@ -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