From b4e97063ba1ba912fecf02104f64960319622504 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Dec 2021 19:17:01 +0100 Subject: gnu: trezor-agent: Fix hash. * gnu/packages/finance.scm (trezor-agent): Update hash. Hash was not updated when committing c7c4f8088195a8e6650904de4e16d71b98776a76. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 268f7ab3a5..4793fe3adf 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1115,7 +1115,7 @@ the KeepKey Hardware Wallet.") (commit "v0.14.4"))) (file-name (git-file-name name version)) (sha256 - (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk")) + (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l")) (modules '((guix build utils) (ice-9 ftw) -- cgit v1.2.3 From 107481ea0ffb64f040d6a715490a7933338d67dd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 11:57:59 +0100 Subject: gnu: monero: Update to 0.17.3.0. * gnu/packages/finance.scm (monero): Update to 0.17.3.0. * gnu/packages/patches/monero-use-system-miniupnpc.patch: Update patch. --- gnu/packages/finance.scm | 4 ++-- gnu/packages/patches/monero-use-system-miniupnpc.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4793fe3adf..5004f9230c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -642,7 +642,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.2.3") + (version "0.17.3.0") (source (origin (method git-fetch) @@ -662,7 +662,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch "external/unbound")) #t)) (sha256 - (base32 "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6")))) + (base32 "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) diff --git a/gnu/packages/patches/monero-use-system-miniupnpc.patch b/gnu/packages/patches/monero-use-system-miniupnpc.patch index c5d376d793..2bd179946f 100644 --- a/gnu/packages/patches/monero-use-system-miniupnpc.patch +++ b/gnu/packages/patches/monero-use-system-miniupnpc.patch @@ -1,14 +1,16 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 7553f87e..8e865c6c 100644 +index 5b7f69a56..3a353a0f3 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -37,19 +37,7 @@ +@@ -37,21 +37,7 @@ find_package(Miniupnpc REQUIRED) -message(STATUS "Using in-tree miniupnpc") +-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) @@ -24,12 +26,12 @@ index 7553f87e..8e865c6c 100644 find_package(Unbound) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 74924e4f..3554dd0d 100644 +index d4b39869c..13071d898 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl -@@ -49,9 +49,9 @@ - #include "storages/levin_abstract_invoke2.h" +@@ -61,9 +61,9 @@ #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" -#include -#include -- cgit v1.2.3 From 3ccf33bbe6c36b14385286dbfe6fd1be26d69e7f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 13:17:51 +0100 Subject: gnu: monero-gui: Update to 0.17.3.0. * gnu/packages/finance.scm (monero-gui): Update to 0.17.3.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5004f9230c..f28fbf8809 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -752,7 +752,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.17.2.3") + (version "0.17.3.0") (source (origin (method git-fetch) @@ -769,7 +769,7 @@ the Monero command line client and daemon.") (delete-file-recursively "monero") #t)) (sha256 - (base32 "0qb746z1sxqrja7q9lqhhbm64v83sn67az4k7gs5q90iaw584qfc")))) + (base32 "0sc3g8g4mlcgz1ys1mqx9klyfl02z17zv2z22clx33jni0l3bqkr")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit v1.2.3 From ac53cbb368fef080a3e0656794109621bbe036db Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 13:21:10 +0100 Subject: gnu: monero: Improve check phase. * gnu/packages/finance.scm (monero)[arguments]: Take 'tests?' parameter into consideration in 'check' phase. --- gnu/packages/finance.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f28fbf8809..1f4dd25f6f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -716,12 +716,13 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) ;; Only try tests that don't need access to network or system (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; Core tests sometimes fail, at least on i686-linux. ;; Let's disable them for now and just try hash tests ;; and unit tests. ;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) - (invoke "make" "ARGS=-R 'hash' --verbose" "test"))) + (when tests? + (invoke "make" "ARGS=-R 'hash' --verbose" "test")))) (add-after 'check 'unit-tests (lambda _ (let ((excluded-unit-tests -- cgit v1.2.3