monero: 0.11.1.0 -> 0.12.0.0

pkgs/applications/altcoins/monero/build-wallet-rpc.patch

@@ -1,78 +0,0 @@
-diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index 63908005..f6656d5c 100644
---- a/src/wallet/CMakeLists.txt
-+++ b/src/wallet/CMakeLists.txt
-@@ -86,43 +86,40 @@ target_link_libraries(wallet
-     ${EXTRA_LIBRARIES})
- add_dependencies(wallet version)
- 
--if (NOT BUILD_GUI_DEPS)
--  set(wallet_rpc_sources
--    wallet_rpc_server.cpp)
-+set(wallet_rpc_sources
-+  wallet_rpc_server.cpp)
- 
--  set(wallet_rpc_headers)
-+set(wallet_rpc_headers)
- 
--  set(wallet_rpc_private_headers
--    wallet_rpc_server.h)
-+set(wallet_rpc_private_headers
-+  wallet_rpc_server.h)
- 
--  monero_private_headers(wallet_rpc_server
--    ${wallet_rpc_private_headers})
--  monero_add_executable(wallet_rpc_server
--    ${wallet_rpc_sources}
--    ${wallet_rpc_headers}
--    ${wallet_rpc_private_headers})
--
--  target_link_libraries(wallet_rpc_server
--    PRIVATE
--      wallet
--      epee
--      rpc
--      cryptonote_core
--      cncrypto
--      common
--      ${Boost_CHRONO_LIBRARY}
--      ${Boost_PROGRAM_OPTIONS_LIBRARY}
--      ${Boost_FILESYSTEM_LIBRARY}
--      ${Boost_THREAD_LIBRARY}
--      ${CMAKE_THREAD_LIBS_INIT}
--      ${EXTRA_LIBRARIES})
--  add_dependencies(wallet_rpc_server version)
--  set_property(TARGET wallet_rpc_server
--    PROPERTY
--      OUTPUT_NAME "monero-wallet-rpc")
--  install(TARGETS wallet_rpc_server DESTINATION bin)
--endif()
-+monero_private_headers(wallet_rpc_server
-+  ${wallet_rpc_private_headers})
-+monero_add_executable(wallet_rpc_server
-+  ${wallet_rpc_sources}
-+  ${wallet_rpc_headers}
-+  ${wallet_rpc_private_headers})
- 
-+target_link_libraries(wallet_rpc_server
-+  PRIVATE
-+    wallet
-+    epee
-+    rpc
-+    cryptonote_core
-+    cncrypto
-+    common
-+    ${Boost_CHRONO_LIBRARY}
-+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-+    ${Boost_FILESYSTEM_LIBRARY}
-+    ${Boost_THREAD_LIBRARY}
-+    ${CMAKE_THREAD_LIBS_INIT}
-+    ${EXTRA_LIBRARIES})
-+add_dependencies(wallet_rpc_server version)
-+set_property(TARGET wallet_rpc_server
-+  PROPERTY
-+    OUTPUT_NAME "monero-wallet-rpc")
-+install(TARGETS wallet_rpc_server DESTINATION bin)
- 
- # build and install libwallet_merged only if we building for GUI
- if (BUILD_GUI_DEPS)

pkgs/applications/altcoins/monero/default.nix

@@ -1,34 +1,31 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake
-, boost, miniupnpc, openssl, pkgconfig, unbound
-, IOKit
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git
+, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite
+, readline, IOKit
 }:
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.11.1.0";
+  version = "0.12.0.0";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero";
     rev    = "v${version}";
-    sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
+    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig git ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ]
+  buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ]
     ++ stdenv.lib.optional stdenv.isDarwin IOKit;
 
-  patches = [
-    ./build-wallet-rpc.patch # fixed in next release
-  ];
-
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
+    "-DReadline_ROOT_DIR=${readline.dev}"
   ];
 
-  doCheck = false;
+  hardeningDisable = [ "fortify" ];
 
   installPhase = ''
     make install

pkgs/top-level/all-packages.nix

@@ -16690,6 +16690,7 @@ with pkgs;
 
   monero = callPackage ../applications/altcoins/monero {
     inherit (darwin.apple_sdk.frameworks) IOKit;
+    boost = boost15x;
   };
 
   monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };