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

electrum: Unify protobuf dependencies

Browse Source 
Since 9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb bumped the protobuf
version because the new upstream requires it, electrum now gets
protobuf3_0 *and* protobuf3_2 instead of just one version.

This leads to the following build errer:

Found duplicated packages in closure for dependency 'protobuf':
  protobuf 3.0.2 (...-python2.7-protobuf-3.0.2/lib/python2.7/site-packages)
  protobuf 3.2.0 (...-python2.7-protobuf-3.2.0/lib/python2.7/site-packages)

Using protobuf3_2 for keepkey and electrum fixes the build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @np
This commit is contained in:
aszlig 2017-06-22 21:06:17 +02:00
parent 9cc023a9b4
commit 1f65182272
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/electrum/default.nix
View File

@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
ecdsa ecdsa
jsonrpclib jsonrpclib
pbkdf2 pbkdf2
protobuf3_0 protobuf3_2
pyaes pyaes
pycrypto pycrypto
pyqt4 pyqt4

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

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