From b3bdb99a08a7ebda73e6f47fa54d3d24b90238b3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 9 Dec 2021 20:42:58 +0100 Subject: [PATCH 1/6] python3Packages.mnemonic: 0.19 -> 0.20 --- pkgs/development/python-modules/mnemonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 8d47db636964..86590c1d7b8d 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "mnemonic"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "trezor"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0rs3szdikkgypiwn43ad3lwh7zvpccw39j5ggkziq6v7pnw3isaq"; + sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; }; checkInputs = [ pytestCheckHook ]; From 48a1f721e2886e5f09f8dfeedaad9285b6981f24 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 9 Dec 2021 20:43:20 +0100 Subject: [PATCH 2/6] python3Packages.shamir-mnemonic: 0.2.1 -> 0.2.2 --- .../python-modules/shamir-mnemonic/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 74ca2228d8b4..e6502a76524c 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shamir-mnemonic"; - version = "0.2.1"; + version = "0.2.2"; disabled = !isPy3k; @@ -18,14 +18,9 @@ buildPythonPackage rec { owner = "trezor"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg"; + sha256 = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "click>=7,<8" "click" - ''; - propagatedBuildInputs = [ attrs click From 71cabc227bf44337bf465b85ecd577690950e5bb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 9 Dec 2021 20:43:41 +0100 Subject: [PATCH 3/6] python3Packages.trezor: 0.12.4 -> 0.13.0 --- pkgs/development/python-modules/trezor/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 78eb7eda0884..f58c24e5008c 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.12.4"; + version = "0.13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3e180d9f9f8b69176b5ef36311b6161f5b793b538eb2dfd4babbb4d3fb1e374e"; + sha256 = "4571aa09dbfe88b31eb2f16c7c359b4809621b75a04b7b5bc9dbffe17046c99a"; }; nativeBuildInputs = [ installShellFiles ]; @@ -56,6 +56,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + "tests/test_stellar.py" # requires stellar-sdk + ]; + postFixup = '' mkdir completions _TREZORCTL_COMPLETE=source_bash $out/bin/trezorctl > completions/trezorctl || true From 510c0408725bcc0fe03a6d0f717217581921092d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 10 Dec 2021 21:22:30 +0100 Subject: [PATCH 4/6] python3Packages.keepkey: fix dependencies - trezor is not required - ecdsa, libusb1 and mnemonic are --- .../python-modules/keepkey/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 95981992fea3..a29ce9368071 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -1,5 +1,13 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytest -, ecdsa , mnemonic, protobuf, hidapi, trezor }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, ecdsa +, hidapi +, libusb1 +, mnemonic +, protobuf +, pytest +}: buildPythonPackage rec { pname = "keepkey"; @@ -12,9 +20,7 @@ buildPythonPackage rec { sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"; }; - propagatedBuildInputs = [ protobuf hidapi trezor ]; - - buildInputs = [ ecdsa mnemonic ]; + propagatedBuildInputs = [ ecdsa hidapi libusb1 mnemonic protobuf ]; checkInputs = [ pytest ]; From 1819d5e79ec3b557aff97640e120eeccfd03106f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 10 Dec 2021 21:40:37 +0100 Subject: [PATCH 5/6] python3Packages.trezor_agent: relax trezor dependency constraint --- pkgs/development/python-modules/trezor_agent/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index cef74c8636b7..41ae2e276185 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -24,6 +24,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; + # relax dependency constraint + postPatch = '' + substituteInPlace setup.py \ + --replace "trezor[hidapi]>=0.12.0,<0.13" "trezor[hidapi]>=0.12.0,<0.14" + ''; + doCheck = false; pythonImportsCheck = [ "libagent" ]; From f80e4a9eaa3267532338d852595a477450c48a0e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 13 Dec 2021 18:31:53 +0100 Subject: [PATCH 6/6] electrum: make compatible with trezorlib 0.13 --- pkgs/applications/misc/electrum/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index f722b2315c00..841b943e8634 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -78,6 +79,14 @@ python3.pkgs.buildPythonApplication { --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" ''; + patches = [ + # trezorlib 0.13 compatibility + (fetchpatch { + url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch"; + sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E="; + }) + ]; + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; propagatedBuildInputs = with py.pkgs; [