diff options
| author | André-Patrick Bubel <code@apb.name> | 2017-11-18 18:46:35 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-12-12 14:32:12 +0100 |
| commit | 4ea01b6ce1de2243b3ac0d6a50c4966644c4c696 (patch) | |
| tree | 809898760a16d527a40c8c525887a5977c24d56c /pkgs/applications/misc/electrum | |
| parent | ab447d9d760c0b5cabb2f2f9810bcc7cdcb2caca (diff) | |
| download | nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar.gz nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar.bz2 nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar.lz nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar.xz nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.tar.zst nixlib-4ea01b6ce1de2243b3ac0d6a50c4966644c4c696.zip | |
electrum: 2.9.3 -> 3.0.2
Diffstat (limited to 'pkgs/applications/misc/electrum')
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8de837991aab..16a6cfe01d39 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.9.3"; + version = "3.0.2"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"; + sha256 = "0lsg513lxs8qqpr7c0ibb7pma69hxiy3zqybganh6vs9byy7bzsd"; }; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = with python3Packages; [ dnspython ecdsa - jsonrpclib + jsonrpclib-pelix matplotlib pbkdf2 protobuf pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; @@ -43,13 +43,15 @@ python2Packages.buildPythonApplication rec { postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python3.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python3.sitePackages}/nix substituteInPlace $out/share/applications/electrum.desktop \ --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; + doCheck = false; + doInstallCheck = true; installCheckPhase = '' $out/bin/electrum help >/dev/null |