movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

monero-{cli,gui}: 0.18.3.4 -> 0.18.4.0

Browse source
This commit is contained in:
rnhmjoj 2025-05-06 02:53:33 +02:00
parent bf71e6024e
commit a516c5650f
No known key found for this signature in database
GPG key ID: BFBAF4C975F76450
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/blockchains/monero-gui/default.nix
View file

@ -30,20 +30,20 @@
trezorSupport ? true, trezorSupport ? true,
hidapi, hidapi,
libusb1, libusb1,
protobuf, protobuf_21,
python3, python3,
udev, udev,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.18.3.4"; version = "0.18.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM="; hash = "sha256-JwYx5TjGp3VPPSgjN0+w1A4RoZGm7A73Gpg44fre1/c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
++ lib.optionals trezorSupport [ ++ lib.optionals trezorSupport [
hidapi hidapi
libusb1 libusb1
protobuf protobuf_21
python3 python3
] ]
++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [

14
pkgs/by-name/mo/monero-cli/package.nix
View file

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

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

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