From bf5af0252b80d648ef61ed8e609559e20aa89249 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 22 Dec 2020 12:12:00 +0100 Subject: [PATCH 1/2] monero: 0.17.1.6 -> 0.17.1.7 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 51dedba969bd..3a254053714f 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; + sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"; fetchSubmodules = true; }; From b45e4ddb251a8f75d498c2bfd273d8de11f08506 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 22 Dec 2020 12:12:11 +0100 Subject: [PATCH 2/2] monero-gui: 0.17.1.6 -> 0.17.1.7 enable and fix darwin build --- pkgs/applications/blockchains/monero-gui/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index fb6753f79a50..c25fd1b21510 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,6 +4,7 @@ , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 +, qtmacextras , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; + sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"; }; nativeBuildInputs = [ @@ -49,7 +50,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] + ++ optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -105,7 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; }