monero-{cli,gui}: 0.18.3.4 -> 0.18.4.0 (#404534)

pkgs/by-name/mo/monero-cli/package.nix

@@ -19,7 +19,7 @@
   trezorSupport ? true,
   hidapi,
   libusb1,
-  protobuf,
+  protobuf_21,
   udev,
 }:
 
@@ -40,22 +40,17 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.3.4";
+  version = "0.18.4.0";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
+    hash = "sha256-0byMtX2f+8FqNhLPN1oLxIUTWg5RSbHfwiL8pUIAcgQ=";
   };
 
   patches = [
     ./use-system-libraries.patch
-    # https://github.com/monero-project/monero/pull/9462
-    (fetchpatch2 {
-      url = "https://github.com/monero-project/monero/commit/65568d3a884857ce08d1170f5801a6891a5c187c.patch?full_index=1";
-      hash = "sha256-Btuy69y02UyVMmsOiCRPZhM7qW5+FRNujOZjNMRdACQ=";
-    })
   ];
 
   postPatch = ''
@@ -88,7 +83,7 @@ stdenv.mkDerivation rec {
       python3
       hidapi
       libusb1
-      protobuf
+      protobuf_21
     ]
     ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ];
 
@@ -99,6 +94,7 @@ stdenv.mkDerivation rec {
       # required by monero-gui
       "-DBUILD_GUI_DEPS=ON"
       "-DReadline_ROOT_DIR=${readline.dev}"
+      "-Wno-dev"
     ]
     ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
     ++ lib.optional trezorSupport [

pkgs/by-name/mo/monero-cli/use-system-libraries.patch

@@ -1,8 +1,8 @@
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 5b7f69a56..cc4b0a346 100644
+index 538e4d215..cc4b0a346 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
-@@ -35,25 +35,14 @@
+@@ -35,26 +35,14 @@
  # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
  # others.
  
@@ -10,6 +10,7 @@ index 5b7f69a56..cc4b0a346 100644
 -
 -message(STATUS "Using in-tree miniupnpc")
 -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
+-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE)
 -add_subdirectory(miniupnp/miniupnpc)
 -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
 -set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -34,13 +35,13 @@ index 5b7f69a56..cc4b0a346 100644
  
  if(NOT UNBOUND_INCLUDE_DIR)
    die("Could not find libunbound")
-@@ -69,4 +58,3 @@ endif()
+@@ -70,4 +58,3 @@ endif()
  add_subdirectory(db_drivers)
  add_subdirectory(easylogging++)
  add_subdirectory(qrcodegen)
 -add_subdirectory(randomx EXCLUDE_FROM_ALL)
 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 71f5393e8..bb48083d0 100644
+index 884a7b5fc..24c10334e 100644
 --- a/src/p2p/net_node.inl
 +++ b/src/p2p/net_node.inl
 @@ -60,9 +60,9 @@

pkgs/by-name/mo/monero-gui/package.nix

@@ -10,47 +10,38 @@
   miniupnpc,
   monero-cli,
   pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtmacextras,
-  qtmultimedia,
-  qtquickcontrols,
-  qtquickcontrols2,
-  qttools,
-  qtxmlpatterns,
+  qt5,
   quirc,
   randomx,
   rapidjson,
   stdenv,
   unbound,
-  wrapQtAppsHook,
   zeromq,
 
   trezorSupport ? true,
   hidapi,
   libusb1,
-  protobuf,
+  protobuf_21,
   python3,
   udev,
 }:
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.3.4";
+  version = "0.18.4.0";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM=";
+    hash = "sha256-JwYx5TjGp3VPPSgjN0+w1A4RoZGm7A73Gpg44fre1/c=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-    (lib.getDev qttools)
+    qt5.wrapQtAppsHook
+    (lib.getDev qt5.qttools)
   ];
 
   buildInputs =
@@ -60,24 +51,24 @@ stdenv.mkDerivation rec {
       libgpg-error
       libsodium
       miniupnpc
-      qtbase
-      qtdeclarative
-      qtgraphicaleffects
-      qtmultimedia
-      qtquickcontrols
-      qtquickcontrols2
-      qtxmlpatterns
+      qt5.qtbase
+      qt5.qtdeclarative
+      qt5.qtgraphicaleffects
+      qt5.qtmultimedia
+      qt5.qtquickcontrols
+      qt5.qtquickcontrols2
+      qt5.qtxmlpatterns
       quirc
       randomx
       rapidjson
       unbound
       zeromq
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ]
     ++ lib.optionals trezorSupport [
       hidapi
       libusb1
-      protobuf
+      protobuf_21
       python3
     ]
     ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [

pkgs/top-level/all-packages.nix

@@ -14855,8 +14855,6 @@ with pkgs;
 
   ledger-agent = with python3Packages; toPythonApplication ledger-agent;
 
-  monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { };
-
   napari = with python3Packages; toPythonApplication napari;
 
   nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };