diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
| commit | 5837d1a0704779928487687ada02cecbdf5b4603 (patch) | |
| tree | 4d5971e50c2a24ff3eac39e2e67e303af3daee97 /pkgs/applications/misc | |
| parent | bfb1db7a751879c83eabe823b767a71924a45bc5 (diff) | |
| parent | ad26bfd316d03236181774a0245ab874703e24bd (diff) | |
| download | nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.gz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.bz2 nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.lz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.xz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.zst nixlib-5837d1a0704779928487687ada02cecbdf5b4603.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/electron-cash/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/pdfpc/default.nix | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 7ba665f339c9..9eb08283bbcb 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -7,14 +7,14 @@ let in python3Packages.buildPythonApplication rec { - version = "3.0"; + version = "3.1.1"; name = "electron-cash-${version}"; src = fetchurl { url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "f0e2bf5c6d29da714eddd50b45761fea9fc905a0172c7b92df8fca7427439f1a"; + sha256 = "cd42a0a0075787125f195508834d8c34d651896c0986d0b2066763add59bad2b"; }; propagatedBuildInputs = with python3Packages; [ @@ -36,6 +36,11 @@ python3Packages.buildPythonApplication rec { trezor ]; + postPatch = '' + # Remove pyqt5 check + sed -i '/pyqt5/d' setup.py + ''; + preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py pyrcc5 icons.qrc -o gui/qt/icons_rc.py diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 10f12885dcd8..caa050581bf7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "09h3s1mbkliwh8758prbdk3sm19bnma7wy3k10pl9q9fkarbhp75"; + sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9fc14d0cae71..515127e12ebb 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.7"; + version = "4.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; + sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; }; nativeBuildInputs = [ |