From a330f351eefc0c701aeaab070afebb6252795f0b Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Sun, 16 Jun 2019 03:43:29 +0300 Subject: [PATCH 1/6] monero: 0.14.0.2 -> 0.14.1.0 --- pkgs/applications/altcoins/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 94c277f63eb..15dbeab7ef4 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 = "1wckn566ly98d4whlnsif6zjlpm6nwmrhmmrg0rzr9587vkx57sx"; }; nativeBuildInputs = [ cmake pkgconfig git ]; From 63a895812bfe8e671ff8f69bd66ee19abfea8769 Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Sun, 16 Jun 2019 03:49:16 +0300 Subject: [PATCH 2/6] monero-gui: 0.14.0.0 -> 0.14.1.0 --- pkgs/applications/altcoins/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index f597d6b6527..d67ac0a7055 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 ]; From a402aa11fc03b58f1572230c15c0c8ef05e4972a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 3 Jul 2019 21:44:08 +0200 Subject: [PATCH 3/6] monero: fix source hash --- pkgs/applications/altcoins/monero/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 15dbeab7ef4..9a4aa2e0a28 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1wckn566ly98d4whlnsif6zjlpm6nwmrhmmrg0rzr9587vkx57sx"; + sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh"; }; nativeBuildInputs = [ cmake pkgconfig git ]; From 1c623cc3f059e0949a4c96031869d3d1c6946c99 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 3 Jul 2019 21:44:52 +0200 Subject: [PATCH 4/6] monero: bump boost version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f2cab11d4..947b04e1466 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19090,7 +19090,7 @@ in monero = callPackage ../applications/altcoins/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost15x; + boost = boost16x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { From 56bee53f425cc3de89a92f05a408becbd878bfea Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 3 Jul 2019 21:45:04 +0200 Subject: [PATCH 5/6] monero-gui: bump boost version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 947b04e1466..56a5ff6080b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19094,7 +19094,7 @@ in }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - boost = boost15x; + boost = boost16x; }; xmr-stak = callPackage ../applications/misc/xmr-stak { From 1a4c62435440479430e5727db897b63e053342d9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 3 Jul 2019 21:45:36 +0200 Subject: [PATCH 6/6] monero-gui: update patch --- pkgs/applications/altcoins/monero-gui/move-log-file.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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");