BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30839 from clefru/python-trezor-fix-master

Browse source 
python-trezor: Move mnemonic dependency to propagatedBuildInputs
This commit is contained in:
Jörg Thalheim 2017-11-07 18:12:51 +00:00 committed by GitHub
commit 6c27c7e695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/python-modules/keepkey/default.nix
View file

@ -1,21 +1,25 @@
{ stdenv, fetchPypi, buildPythonPackage, ecdsa { stdenv, fetchFromGitHub, buildPythonPackage, pytest
, mnemonic, protobuf, hidapi }: , ecdsa , mnemonic, protobuf, hidapi, trezor }:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "keepkey"; pname = "keepkey";
version = "4.0.0"; version = "4.0.0";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "keepkey";
sha256 = "95c8d5127919f9fc4bb0120b05f92efc8f526d4a68122ac18e63509571ac45a2"; repo = "python-keepkey";
rev = "v${version}";
sha256 = "144awjkc169z2n1ffirs697y6m97izh3pbh3sjhy3nji7jszh592";
}; };
propagatedBuildInputs = [ protobuf hidapi ]; propagatedBuildInputs = [ protobuf hidapi trezor ];
buildInputs = [ ecdsa mnemonic ]; buildInputs = [ ecdsa mnemonic ];
# There are no actual tests: "ImportError: No module named tests" checkInputs = [ pytest ];
# tests requires hardware
doCheck = false; doCheck = false;
# Remove impossible dependency constraint # Remove impossible dependency constraint

10
pkgs/development/python-modules/libagent/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa
, semver, keepkey, trezor, mnemonic, ledgerblue , semver, keepkey, trezor, mnemonic, ledgerblue, unidecode, mock, pytest
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,6 +17,14 @@ buildPythonPackage rec {
trezor mnemonic ledgerblue trezor mnemonic ledgerblue
]; ];
propagatedBuildInputs = [ unidecode ];
checkInputs = [ mock pytest ];
checkPhase = ''
py.test libagent/tests
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Using hardware wallets as SSH/GPG agent"; description = "Using hardware wallets as SSH/GPG agent";
homepage = https://github.com/romanz/trezor-agent; homepage = https://github.com/romanz/trezor-agent;

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

@ -12,9 +12,9 @@ buildPythonPackage rec {
sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314";
}; };
propagatedBuildInputs = [ protobuf hidapi requests ]; propagatedBuildInputs = [ protobuf hidapi requests mnemonic ];
buildInputs = [ ecdsa mnemonic ]; buildInputs = [ ecdsa ];
# There are no actual tests: "ImportError: No module named tests" # There are no actual tests: "ImportError: No module named tests"
doCheck = false; doCheck = false;