diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-03-16 18:06:14 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2022-03-27 19:47:54 +0200 |
| commit | 882ecdce35dc3d9c61bc9f6ef883bfe2d817d878 (patch) | |
| tree | 3cce01771e75a2454fc79fcdf1835dcb5bea7672 | |
| parent | 33e1d138c0eaefc3e5649c7c807c693c1f72cae9 (diff) | |
| download | nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar.gz nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar.bz2 nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar.lz nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar.xz nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.tar.zst nixpkgs-882ecdce35dc3d9c61bc9f6ef883bfe2d817d878.zip | |
electrum: 4.1.5 -> 4.2.1
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 29a12919296..f9ef802ce42 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.1.5"; + version = "4.2.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; + sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c="; extraPostFetch = '' mv $out ./all @@ -45,19 +45,6 @@ let ''; }; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -66,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; + sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA="; }; postUnpack = '' @@ -74,27 +61,9 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - - # according to upstream, this is fine - # https://github.com/spesmilo/electrum/issues/7361 - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" - ''; - - patches = [ - # trezorlib 0.13 compatibility - (fetchpatch { - url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch"; - sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E="; - }) - ]; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx |