electrum: Unify protobuf dependencies

Since 9c57f3b 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
NixOS · Jun 22, 2017 · 1f65182 · 1f65182
1 parent 9cc023a
commit 1f65182
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
     ecdsa
     jsonrpclib
     pbkdf2
-    protobuf3_0
+    protobuf3_2
     pyaes
     pycrypto
     pyqt4

diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, ecdsa
-, mnemonic, protobuf3_0, hidapi }:
+, mnemonic, protobuf3_2, hidapi }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
   };
 
-  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+  propagatedBuildInputs = [ protobuf3_2 hidapi ];
 
   buildInputs = [ ecdsa mnemonic ];