Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2b4b36a3eb5f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae8cbb739f5c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 10, 2020

  1. electron-cash: 4.0.14 -> 4.1.0 

    (cherry picked from commit d3958aa)
    @nyanloutre
    nyanloutre committed Sep 10, 2020
    Copy the full SHA
    889e9ff View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97712 from nyanloutre/maj_electron_cash_20_09 

    electron-cash: 4.0.14 -> 4.1.0
    @Lassulus
    Lassulus authored Sep 11, 2020
    Copy the full SHA
    ae8cbb7 View commit details
Showing with 14 additions and 6 deletions.
  1. +14 −6 pkgs/applications/misc/electron-cash/default.nix
20 changes: 14 additions & 6 deletions pkgs/applications/misc/electron-cash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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