From d3958aa3fa5fbd9ee162a0872ef3d4562d951d6f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 10 Sep 2020 00:27:30 +0200 Subject: [PATCH] electron-cash: 4.0.14 -> 4.1.0 --- .../misc/electron-cash/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 1616c082c01..a6ba3444dcd 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,14 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook, secp256k1 }: +{ lib, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +, secp256k1 }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.0.14"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6"; + sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; }; propagatedBuildInputs = with python3Packages; [ @@ -35,6 +36,15 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; + patches = [ + # Patch a failed test, this can be removed in next version + (fetchpatch { + url = + "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; + sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; + }) + ]; + postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -43,9 +53,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ - pytest - ]; + checkInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME