From 650aec314f84fdbd6833abbec4a3b94ba016cb04 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 3 Apr 2018 22:35:44 +0200 Subject: [PATCH 1/5] monero-gui: 2018-03-31 -> 0.12.0.0 --- pkgs/applications/altcoins/monero-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 30bc0532d88..2aff86ae1d3 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "2018-03-31"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; - rev = "fbe5ba831795008361f4de4347e7ecb6d868b4eb"; - sha256 = "06cncwk4mxfw1rqwlwisasvangl73xyqwj4g6r9j85j5x4xy0k5s"; + rev = "v${version}"; + sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; }; nativeBuildInputs = [ qmake pkgconfig ]; From dff0404d8dc63591324da5668864f48c99cdd1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 Apr 2018 11:00:37 +0100 Subject: [PATCH 2/5] monero-gui: blind darwin fix --- pkgs/applications/altcoins/monero-gui/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 2aff86ae1d3..5aef30c25dd 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -6,6 +6,7 @@ , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , pcsclite, zeromq, cppzmq, pkgconfig +, CoreData }: with stdenv.lib; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind pcsclite zeromq cppzmq makeWrapper - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin CoreData; patches = [ ./move-log-file.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62ad5f27dfe..b085adaa047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16706,6 +16706,7 @@ with pkgs; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { + inherit (darwin.apple_sdk.frameworks) CoreData; boost = boost15x; }; From b9e5aeaf79e94a56d4ae002041142f24640a7ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 Apr 2018 11:14:42 +0100 Subject: [PATCH 3/5] monero: actually wants CoreData instead of monero-gui --- pkgs/applications/altcoins/monero/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 85f5c2eb07c..e87c3379399 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline -, IOKit ? null +, IOKit +, CoreData }: assert stdenv.isDarwin -> IOKit != null; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline - ] ++ optional stdenv.isDarwin IOKit; + ] ++ optionals stdenv.isDarwin [ IOKit CoreData ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b085adaa047..744ae359601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,7 +612,7 @@ with pkgs; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; - + chkcrontab = callPackage ../tools/admin/chkcrontab { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -16701,12 +16701,11 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit CoreData; boost = boost15x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - inherit (darwin.apple_sdk.frameworks) CoreData; boost = boost15x; }; From a7e63bc9983746ac05ee46dd08a33282c9370097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 Apr 2018 11:16:21 +0100 Subject: [PATCH 4/5] monero-gui: remove CoreData again --- pkgs/applications/altcoins/monero-gui/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 5aef30c25dd..2aff86ae1d3 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -6,7 +6,6 @@ , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , pcsclite, zeromq, cppzmq, pkgconfig -, CoreData }: with stdenv.lib; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind pcsclite zeromq cppzmq makeWrapper - ] ++ stdenv.lib.optional stdenv.isDarwin CoreData; + ]; patches = [ ./move-log-file.patch From 4df34f803c132ebf9300dba7087d5a4f9e03806a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 4 Apr 2018 21:33:45 +0200 Subject: [PATCH 5/5] monero: fix darwin build --- pkgs/applications/altcoins/monero/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index e87c3379399..8be24522f56 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline -, IOKit -, CoreData +, CoreData, IOKit, PCSC }: assert stdenv.isDarwin -> IOKit != null; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline - ] ++ optionals stdenv.isDarwin [ IOKit CoreData ]; + ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 744ae359601..e0dd1ed4d7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16701,7 +16701,7 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) IOKit CoreData; + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost15x; };