diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-07-03 23:08:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 23:08:38 +0000 |
| commit | 74049dfd5c60a5a0ac6412b220c754ec6a605eea (patch) | |
| tree | 1893e43fd55e2e806376217dcdbe5d3812789864 /pkgs/applications/altcoins | |
| parent | 6bae45d24f85da0f3cb80db617c6dd65e635893d (diff) | |
| parent | 1a4c62435440479430e5727db897b63e053342d9 (diff) | |
| download | nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar.gz nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar.bz2 nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar.lz nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar.xz nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.tar.zst nixlib-74049dfd5c60a5a0ac6412b220c754ec6a605eea.zip | |
Merge pull request #64263 from rnhmjoj/monero
monero: 0.14.0 -> 0.14.1
Diffstat (limited to 'pkgs/applications/altcoins')
| -rw-r--r-- | pkgs/applications/altcoins/monero-gui/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/monero-gui/move-log-file.patch | 5 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/monero/default.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index f597d6b6527c..d67ac0a7055c 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 ]; diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index ae733151622d..260c6d9d00f2 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 94c277f63eb0..9a4aa2e0a28a 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 ]; |