From 34d152b7b5bf8a3ac3eb8181f725ac7adb4917d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Aug 2023 05:14:17 +0000 Subject: [PATCH 1/4] python310Packages.hwi: 2.2.1 -> 2.3.1 --- pkgs/development/python-modules/hwi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 89a2bf03de56..10e195b204ef 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.2.1"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - hash = "sha256-vQJN2YXWGvYSVV9lemZyu61inc9iBFxf5nIlpIiRe+s="; + hash = "sha256-V4BWB4mCONQ8kjAy6ySonAbCUTaKpBTvhSnHmoH8TQM="; }; propagatedBuildInputs = [ From 728a648676525028fe1be3429d589bc88e37f702 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 07:55:30 +0200 Subject: [PATCH 2/4] python310Packages.hwi: add changelog to meta --- pkgs/development/python-modules/hwi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 10e195b204ef..40b694414e9f 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bitcoin Hardware Wallet Interface"; homepage = "https://github.com/bitcoin-core/hwi"; + changelog = "https://github.com/bitcoin-core/HWI/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ prusnak ]; }; From c5d339d789fdced8f6a98e0f7078c2e21a2eb90d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 07:57:36 +0200 Subject: [PATCH 3/4] python310Packages.hwi: disable on unsupported Python releases --- pkgs/development/python-modules/hwi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 40b694414e9f..b46396c11757 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { version = "2.3.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; From b2df84ffde8e179806d0977200d289420036e740 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 07:59:41 +0200 Subject: [PATCH 4/4] python310Packages.hwi: remove postPatch section --- pkgs/development/python-modules/hwi/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index b46396c11757..046dbc7bb4ff 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -1,16 +1,16 @@ { lib -, buildPythonPackage -, fetchFromGitHub , bitbox02 +, buildPythonPackage , cbor , ecdsa +, fetchFromGitHub , hidapi , libusb1 , mnemonic , pyaes , pyserial -, typing-extensions , pythonOlder +, typing-extensions }: buildPythonPackage rec { @@ -39,16 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - # relax required dependencies: - # libusb1 - https://github.com/bitcoin-core/HWI/issues/579 - # typing-extensions - https://github.com/bitcoin-core/HWI/issues/572 - postPatch = '' - substituteInPlace setup.py \ - --replace 'libusb1>=1.7,<3' 'libusb1>=1.7,<4' \ - --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7,<5.0' - ''; - - # tests require to clone quite a few firmwares + # Tests require to clone quite a few firmwares doCheck = false; pythonImportsCheck = [