summary refs log tree commit diff
path: root/pkgs/applications/misc/electrum
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-02-21 08:02:10 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-02-21 08:02:10 +0100
commit5871da418fffdbf286f8fa8ad743f7d76a62baa6 (patch)
tree4f2ee1f353fd6682d3505706d359f1e6d6a64ab5 /pkgs/applications/misc/electrum
parenteb22e4c775a9cbed876bfc743a59cc314f11b75b (diff)
parente2cd07b9978198696681776405c4e23526d483a7 (diff)
downloadnixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.gz
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.bz2
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.lz
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.xz
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.tar.zst
nixpkgs-5871da418fffdbf286f8fa8ad743f7d76a62baa6.zip
Merge staging into python-unstable
Diffstat (limited to 'pkgs/applications/misc/electrum')
-rw-r--r--pkgs/applications/misc/electrum/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index c6f83104fb1..5f252d97d86 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -14,13 +14,13 @@ in
 
 python3Packages.buildPythonApplication rec {
   pname = "electrum";
-  version = "3.3.2";
+  version = "3.3.4";
 
   src = fetchFromGitHub {
     owner = "spesmilo";
     repo = "electrum";
     rev = version;
-    sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i";
+    sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -53,9 +53,6 @@ python3Packages.buildPythonApplication rec {
 
   preBuild = ''
     sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
-    pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py
-    # Recording the creation timestamps introduces indeterminism to the build
-    sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py
     sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py
     substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0
   '';