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

Merge pull request #29134 from abbradar/protobuf

Browse Source 
Update protobuf and remove old versions
This commit is contained in:
Frederik Rietdijk
2017-09-09 09:27:10 +02:00
committed by GitHub
parent 79770136ff 1f2a18d916
commit 6589ee83c2
23 changed files with 54 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/keepkey/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage, ecdsa
, mnemonic, protobuf3_2, hidapi }:
, mnemonic, protobuf, hidapi }:
buildPythonPackage rec {
name = "${pname}-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
};
propagatedBuildInputs = [ protobuf3_2 hidapi ];
propagatedBuildInputs = [ protobuf hidapi ];
buildInputs = [ ecdsa mnemonic ];

4
pkgs/development/python-modules/tensorflow/default.nix
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

4
pkgs/development/python-modules/trezor/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic
{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic
, requests
}:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314";
};
propagatedBuildInputs = [ protobuf3_2 hidapi requests ];
propagatedBuildInputs = [ protobuf hidapi requests ];
buildInputs = [ ecdsa mnemonic ];