diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:44:08 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:44:08 +0200 |
| commit | 7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288 (patch) | |
| tree | 667a0a09fd26a37c54295d84a47482af67b1ff29 /pkgs/applications/altcoins | |
| parent | 46d91410afc74d2c5ddf08921a6befb3da18784a (diff) | |
| parent | 5c8472a2a17625855d0811ebb5709c9aa84fdd3f (diff) | |
| download | nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.gz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.bz2 nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.lz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.xz nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.tar.zst nixpkgs-7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/altcoins')
5 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 986dd2b9e5d..c10cc34ad44 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.14.0.0"; + version = "0.14.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; + sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index ae733151622..260c6d9d00f 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,11 +1,12 @@ diff --git a/main.cpp b/main.cpp -index 79223c0..e80b317 100644 +index a51568d..5a9f683 100644 --- a/main.cpp +++ b/main.cpp -@@ -115,6 +115,9 @@ int main(int argc, char *argv[]) +@@ -152,7 +152,9 @@ int main(int argc, char *argv[]) QCommandLineOption logPathOption(QStringList() << "l" << "log-file", QCoreApplication::translate("main", "Log to specified file"), QCoreApplication::translate("main", "file")); +- + logPathOption.setDefaultValue( + QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + + "/monero-wallet-gui.log"); diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 94c277f63eb..9a4aa2e0a28 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.14.0.2"; + version = "0.14.1.0"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; + sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 9c322b4cb8c..cce0b1c6488 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.3"; - sha256 = "04z38ba4f1kmaa3d9b4gqz7dwr5blbppnkngw758xdm56772hfmj"; - cargoSha256 = "03dlzl96g8k02lifymwp1xs0b2mrnj5c1xzpwp014ijqlnzcfgsv"; + version = "2.5.4"; + sha256 = "103kg0lrijf6d0mc1nk4pdgwgkmp9ga51rwfqrkkm133lylrr0lf"; + cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 9c7ee5111f4..57b1faf71f7 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.8"; - sha256 = "1kr7hzv27vxa14wafhpaq5a4fv97zh71xjjmwzaqq4gj3k9yj0rm"; - cargoSha256 = "1yjyk6mhr3ws73aq6h8z5iabvj03ch7mxhkrfdkmhw3cjj0jgx6j"; + version = "2.4.9"; + sha256 = "0pj3yyjzc3fq0r7g8j22anzqxvm377pbcy27np1g7ygkzapzb2v6"; + cargoSha256 = "1dxn00zxivmgk4a61nxwhjlv7fjsy2ngadyw0br1ssrkgz9k7af2"; in import ./parity.nix { inherit version sha256 cargoSha256; } |