From 521b9a6cd081329751e01b49974bf639042d0c96 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Mon, 25 Dec 2023 15:30:01 +0100 Subject: [PATCH 1/2] electron-cash: 4.2.10 -> 4.3.1 --- pkgs/applications/misc/electron-cash/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 16eb89cb5a84..6e6822d04178 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.10"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = "refs/tags/${version}"; - sha256 = "sha256-m13wJlNBG3BxOdKUyd3qmIhFBM7263FzMKr5lfD1tys="; + sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; }; propagatedBuildInputs = with python3Packages; [ @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { certifi pathvalidate dnspython + bitcoinrpc # requirements-binaries pyqt5 @@ -55,13 +56,6 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - nativeCheckInputs = with python3Packages; [ pytest ]; - - checkPhase = '' - unset HOME - pytest electroncash/tests - ''; - postInstall = lib.optionalString stdenv.isLinux '' substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" From aa35410cb5be72a4e85c3a9269fa5045ea8d2eea Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Mon, 15 Jan 2024 09:37:16 +0100 Subject: [PATCH 2/2] add QtWayland --- pkgs/applications/misc/electron-cash/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 6e6822d04178..7760b57dd3b9 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook -, secp256k1 }: +, secp256k1, qtwayland }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; @@ -48,6 +48,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = [ ] ++ lib.optional stdenv.isLinux qtwayland; + postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3"