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

python-trezor: Move mnemonic dependency to propagatedBuildInputs

authored by Jörg Thalheim and committed by GitHub 6c27c7e6 7e571b9a

+22 -10
+11 -7
pkgs/development/python-modules/keepkey/default.nix
··· 1 - { stdenv, fetchPypi, buildPythonPackage, ecdsa 2 - , mnemonic, protobuf, hidapi }: 1 + { stdenv, fetchFromGitHub, buildPythonPackage, pytest 2 + , ecdsa , mnemonic, protobuf, hidapi, trezor }: 3 3 4 4 buildPythonPackage rec { 5 5 name = "${pname}-${version}"; 6 6 pname = "keepkey"; 7 7 version = "4.0.0"; 8 8 9 - src = fetchPypi { 10 - inherit pname version; 11 - sha256 = "95c8d5127919f9fc4bb0120b05f92efc8f526d4a68122ac18e63509571ac45a2"; 9 + src = fetchFromGitHub { 10 + owner = "keepkey"; 11 + repo = "python-keepkey"; 12 + rev = "v${version}"; 13 + sha256 = "144awjkc169z2n1ffirs697y6m97izh3pbh3sjhy3nji7jszh592"; 12 14 }; 13 15 14 - propagatedBuildInputs = [ protobuf hidapi ]; 16 + propagatedBuildInputs = [ protobuf hidapi trezor ]; 15 17 16 18 buildInputs = [ ecdsa mnemonic ]; 17 19 18 - # There are no actual tests: "ImportError: No module named tests" 20 + checkInputs = [ pytest ]; 21 + 22 + # tests requires hardware 19 23 doCheck = false; 20 24 21 25 # Remove impossible dependency constraint
+9 -1
pkgs/development/python-modules/libagent/default.nix
··· 1 1 { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa 2 - , semver, keepkey, trezor, mnemonic, ledgerblue 2 + , semver, keepkey, trezor, mnemonic, ledgerblue, unidecode, mock, pytest 3 3 }: 4 4 5 5 buildPythonPackage rec { ··· 16 16 ed25519 ecdsa semver keepkey 17 17 trezor mnemonic ledgerblue 18 18 ]; 19 + 20 + propagatedBuildInputs = [ unidecode ]; 21 + 22 + checkInputs = [ mock pytest ]; 23 + 24 + checkPhase = '' 25 + py.test libagent/tests 26 + ''; 19 27 20 28 meta = with stdenv.lib; { 21 29 description = "Using hardware wallets as SSH/GPG agent";
+2 -2
pkgs/development/python-modules/trezor/default.nix
··· 12 12 sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; 13 13 }; 14 14 15 - propagatedBuildInputs = [ protobuf hidapi requests ]; 15 + propagatedBuildInputs = [ protobuf hidapi requests mnemonic ]; 16 16 17 - buildInputs = [ ecdsa mnemonic ]; 17 + buildInputs = [ ecdsa ]; 18 18 19 19 # There are no actual tests: "ImportError: No module named tests" 20 20 doCheck = false;