From 09ff437fe9b0dd46d7bf5eb38734da96019ba129 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:13:59 +0200 Subject: [PATCH] Revert "electrum: pin ledger-bitcoin to 0.2.1" This reverts commit 54bea4702bcf038be9d09b70022ffa7730cbe088. It is no longer needed as electrum 4.5.6 raised its `ledger-bitcoin` version limit to "<0.4", cf. https://github.com/spesmilo/electrum/issues/9035 https://github.com/spesmilo/electrum/commit/719292f8189b70b83d145f3928a14de9ef5d4186 https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES#L24 --- pkgs/applications/misc/electrum/default.nix | 25 ++++----------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 27b0ab659303..2e7aeb20b20a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -9,26 +9,9 @@ , enableQt ? true , callPackage , qtwayland -, fetchPypi }: let - python = python3.override { - self = python; - packageOverrides = self: super: { - # Pin ledger-bitcoin to 0.2.1 - ledger-bitcoin = super.ledger-bitcoin.overridePythonAttrs (oldAttrs: rec { - version = "0.2.1"; - format = "pyproject"; - src = fetchPypi { - pname = "ledger_bitcoin"; - inherit version; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; - }; - }); - }; - }; - libsecp256k1_name = if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" @@ -41,7 +24,7 @@ let in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "electrum"; version = "4.5.6"; @@ -53,7 +36,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -84,7 +67,7 @@ python.pkgs.buildPythonApplication rec { qdarkstyle ]; - checkInputs = with python.pkgs; lib.optionals enableQt [ + checkInputs = with python3.pkgs; lib.optionals enableQt [ pyqt6 ]; @@ -116,7 +99,7 @@ python.pkgs.buildPythonApplication rec { wrapQtApp $out/bin/electrum ''; - nativeCheckInputs = with python.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "tests" ];