summary refs log tree commit diff
path: root/pkgs/applications/misc/electrum
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2018-09-12 21:05:49 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2018-09-12 21:22:23 +0200
commit1e379f29f7ff009b5c353998bb4d1662b69790b5 (patch)
tree832d95eee128c4c22edc586e8d9fee09c680a2f6 /pkgs/applications/misc/electrum
parent7e2428d73a4420d9ab18310ee4836e18706a4c07 (diff)
downloadnixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar.gz
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar.bz2
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar.lz
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar.xz
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.tar.zst
nixlib-1e379f29f7ff009b5c353998bb4d1662b69790b5.zip
electrum: 3.1.3 -> 3.2.3
Diffstat (limited to 'pkgs/applications/misc/electrum')
-rw-r--r--pkgs/applications/misc/electrum/default.nix26
1 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ed2f0626e5d2..95754579c487 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,12 +1,24 @@
 { stdenv, fetchurl, python3, python3Packages, zbar }:
 
+let
+  qdarkstyle = python3Packages.buildPythonPackage rec {
+    pname = "QDarkStyle";
+    version = "2.5.4";
+    src = python3Packages.fetchPypi {
+      inherit pname version;
+      sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy";
+    };
+    doCheck = false; # no tests
+  };
+in
+
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "3.1.3";
+  version = "3.2.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy";
+    sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -17,12 +29,14 @@ python3Packages.buildPythonApplication rec {
     pbkdf2
     protobuf
     pyaes
-    pycrypto
+    pycryptodomex
     pyqt5
     pysocks
+    qdarkstyle
     qrcode
     requests
     tlslite
+    typing
 
     # plugins
     keepkey
@@ -35,10 +49,10 @@ python3Packages.buildPythonApplication rec {
 
   preBuild = ''
     sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
-    pyrcc5 icons.qrc -o gui/qt/icons_rc.py
+    pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py
     # Recording the creation timestamps introduces indeterminism to the build
-    sed -i '/Created: .*/d' gui/qt/icons_rc.py
-    sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py
+    sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py
+    sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py
   '';
 
   postInstall = ''