pyrox.dev / nixpkgs
lol
fork atom

monero-{cli,gui}: 0.17.2.3 -> 0.17.3.0

rnhmjoj ebf7c360 961ca787

+13 -30
unified split
+2 -2
pkgs/applications/blockchains/monero-cli/default.nix
··· 9 10 stdenv.mkDerivation rec { 11 pname = "monero-cli"; 12 - version = "0.17.2.3"; 13 14 src = fetchFromGitHub { 15 owner = "monero-project"; 16 repo = "monero"; 17 rev = "v${version}"; 18 - sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6"; 19 fetchSubmodules = true; 20 }; 21
··· 9 10 stdenv.mkDerivation rec { 11 pname = "monero-cli"; 12 + version = "0.17.3.0"; 13 14 src = fetchFromGitHub { 15 owner = "monero-project"; 16 repo = "monero"; 17 rev = "v${version}"; 18 + sha256 = "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm"; 19 fetchSubmodules = true; 20 }; 21
+9 -26
pkgs/applications/blockchains/monero-cli/use-system-libraries.patch
··· 1 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt 2 - index a8916a7d0..39ec7747b 100644 3 --- a/external/CMakeLists.txt 4 +++ b/external/CMakeLists.txt 5 - @@ -37,34 +37,16 @@ 6 7 find_package(Miniupnpc REQUIRED) 8 - 9 -message(STATUS "Using in-tree miniupnpc") 10 -add_subdirectory(miniupnp/miniupnpc) 11 -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") 12 -if(MSVC) 13 - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") 14 -elseif(NOT MSVC) ··· 25 26 find_package(Unbound) 27 28 - if(NOT UNBOUND_INCLUDE_DIR OR STATIC) 29 - - # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered. 30 - - # unbound has config tests which used OpenSSL libraries, so -ldl may need to 31 - - # be set in this case. 32 - - # The unbound CMakeLists.txt can set it, since it's also needed for the 33 - - # static OpenSSL libraries set up there after with target_link_libraries. 34 - - add_subdirectory(unbound) 35 - - 36 - - set(UNBOUND_STATIC true PARENT_SCOPE) 37 - - set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE) 38 - - set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE) 39 - - set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBDIR}" PARENT_SCOPE) 40 - + set(UNBOUND_STATIC false PARENT_SCOPE) 41 - + set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) 42 - + set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) 43 - else() 44 - message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") 45 - if(UNBOUND_LIBRARIES) 46 - @@ -81,4 +63,5 @@ endif() 47 add_subdirectory(db_drivers) 48 add_subdirectory(easylogging++) 49 add_subdirectory(qrcodegen) 50 -add_subdirectory(randomx EXCLUDE_FROM_ALL) 51 - + 52 - +find_library(RANDOMX_LIBRARIES NAMES RandomX) 53 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl 54 - index 175741146..088b582f7 100644 55 --- a/src/p2p/net_node.inl 56 +++ b/src/p2p/net_node.inl 57 - @@ -60,9 +60,9 @@ 58 #include "cryptonote_core/cryptonote_core.h" 59 #include "net/parse.h" 60
··· 1 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt 2 + index 5b7f69a56..5536debe8 100644 3 --- a/external/CMakeLists.txt 4 +++ b/external/CMakeLists.txt 5 + @@ -36,22 +36,9 @@ 6 + # others. 7 8 find_package(Miniupnpc REQUIRED) 9 + - 10 -message(STATUS "Using in-tree miniupnpc") 11 + -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) 12 -add_subdirectory(miniupnp/miniupnpc) 13 -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") 14 + -set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) 15 -if(MSVC) 16 - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") 17 -elseif(NOT MSVC) ··· 28 29 find_package(Unbound) 30 31 + @@ -69,4 +56,3 @@ endif() 32 add_subdirectory(db_drivers) 33 add_subdirectory(easylogging++) 34 add_subdirectory(qrcodegen) 35 -add_subdirectory(randomx EXCLUDE_FROM_ALL) 36 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl 37 + index d4b39869c..13071d898 100644 38 --- a/src/p2p/net_node.inl 39 +++ b/src/p2p/net_node.inl 40 + @@ -61,9 +61,9 @@ 41 #include "cryptonote_core/cryptonote_core.h" 42 #include "net/parse.h" 43
+2 -2
pkgs/applications/blockchains/monero-gui/default.nix
··· 14 15 stdenv.mkDerivation rec { 16 pname = "monero-gui"; 17 - version = "0.17.2.3"; 18 19 src = fetchFromGitHub { 20 owner = "monero-project"; 21 repo = "monero-gui"; 22 rev = "v${version}"; 23 - sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg"; 24 }; 25 26 nativeBuildInputs = [
··· 14 15 stdenv.mkDerivation rec { 16 pname = "monero-gui"; 17 + version = "0.17.3.0"; 18 19 src = fetchFromGitHub { 20 owner = "monero-project"; 21 repo = "monero-gui"; 22 rev = "v${version}"; 23 + sha256 = "0rc1p0k16icgfhc7yvkvb8p6570zz0cvigs648l05fcm3mf787rp"; 24 }; 25 26 nativeBuildInputs = [