diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 21:06:17 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 21:06:17 +0200 |
commit | 1f65182272800122917f5ad25479ac618f7fd100 (patch) | |
tree | f1d4679ebe3681fe7c14205a5c8175974cbb3acf /pkgs/development/python-modules/keepkey | |
parent | 9cc023a9b448b2c2ae5d7e95bf2d9409f8fbab26 (diff) | |
download | nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar.gz nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar.bz2 nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar.lz nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar.xz nixlib-1f65182272800122917f5ad25479ac618f7fd100.tar.zst nixlib-1f65182272800122917f5ad25479ac618f7fd100.zip |
electrum: Unify protobuf dependencies
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
Diffstat (limited to 'pkgs/development/python-modules/keepkey')
-rw-r--r-- | pkgs/development/python-modules/keepkey/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 0d7f7661e7dd..e54ed52d9c52 100644 --- 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 ]; |