public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64263 from rnhmjoj/monero

Browse Source 
monero: 0.14.0 -> 0.14.1
This commit is contained in:
Franz Pletz 2019-07-03 23:08:38 +00:00 committed by GitHub
commit 74049dfd5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/altcoins/monero-gui/default.nix
View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-gui-${version}"; name = "monero-gui-${version}";
version = "0.14.0.0"; version = "0.14.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];

5
pkgs/applications/altcoins/monero-gui/move-log-file.patch
View File

@ -1,11 +1,12 @@
diff --git a/main.cpp b/main.cpp diff --git a/main.cpp b/main.cpp
index 79223c0..e80b317 100644 index a51568d..5a9f683 100644
--- a/main.cpp --- a/main.cpp
+++ b/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", QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
QCoreApplication::translate("main", "Log to specified file"), QCoreApplication::translate("main", "Log to specified file"),
QCoreApplication::translate("main", "file")); QCoreApplication::translate("main", "file"));
-
+ logPathOption.setDefaultValue( + logPathOption.setDefaultValue(
+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+ + "/monero-wallet-gui.log"); + + "/monero-wallet-gui.log");

4
pkgs/applications/altcoins/monero/default.nix
View File

@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-${version}"; name = "monero-${version}";
version = "0.14.0.2"; version = "0.14.1.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/monero-project/monero.git"; url = "https://github.com/monero-project/monero.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
}; };
nativeBuildInputs = [ cmake pkgconfig git ]; nativeBuildInputs = [ cmake pkgconfig git ];

4
pkgs/top-level/all-packages.nix
View File

@ -19097,11 +19097,11 @@ in
monero = callPackage ../applications/altcoins/monero { monero = callPackage ../applications/altcoins/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost15x; boost = boost16x;
}; };
monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui {
boost = boost15x; boost = boost16x;
}; };
xmr-stak = callPackage ../applications/misc/xmr-stak { xmr-stak = callPackage ../applications/misc/xmr-stak {