commit 92c1e6d176a2abdebb30f49bea091368bf614af0

pyrox.dev / nixpkgs

lol

fork atom

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

authored by

Pavol Rusnak and committed by

GitHub 9 months ago 92c1e6d1 236c99e2

+25 -39

6 changed files

expand all

unified split

pkgs

by-name

monero-cli

package.nix

use-system-libraries.patch

monero-gui

move-log-file.patch

package.nix

use-system-libquirc.patch

top-level

all-packages.nix

+15 -24

pkgs/applications/blockchains/monero-gui/default.nix pkgs/by-name/mo/monero-gui/package.nix

··· 10 10 miniupnpc, 11 11 monero-cli, 12 12 pkg-config, 13 - qtbase, 14 - qtdeclarative, 15 - qtgraphicaleffects, 16 - qtmacextras, 17 - qtmultimedia, 18 - qtquickcontrols, 19 - qtquickcontrols2, 20 - qttools, 21 - qtxmlpatterns, 13 + qt5, 22 14 quirc, 23 15 randomx, 24 16 rapidjson, 25 17 stdenv, 26 18 unbound, 27 - wrapQtAppsHook, 28 19 zeromq, 29 20 30 21 trezorSupport ? true, 31 22 hidapi, 32 23 libusb1, 33 - protobuf, 24 + protobuf_21, 34 25 python3, 35 26 udev, 36 27 }: 37 28 38 29 stdenv.mkDerivation rec { 39 30 pname = "monero-gui"; 40 - version = "0.18.3.4"; 31 + version = "0.18.4.0"; 41 32 42 33 src = fetchFromGitHub { 43 34 owner = "monero-project"; 44 35 repo = "monero-gui"; 45 36 rev = "v${version}"; 46 - hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM="; 37 + hash = "sha256-JwYx5TjGp3VPPSgjN0+w1A4RoZGm7A73Gpg44fre1/c="; 47 38 }; 48 39 49 40 nativeBuildInputs = [ 50 41 cmake 51 42 pkg-config 52 - wrapQtAppsHook 53 - (lib.getDev qttools) 43 + qt5.wrapQtAppsHook 44 + (lib.getDev qt5.qttools) 54 45 ]; 55 46 56 47 buildInputs = ··· 60 51 libgpg-error 61 52 libsodium 62 53 miniupnpc 63 - qtbase 64 - qtdeclarative 65 - qtgraphicaleffects 66 - qtmultimedia 67 - qtquickcontrols 68 - qtquickcontrols2 69 - qtxmlpatterns 54 + qt5.qtbase 55 + qt5.qtdeclarative 56 + qt5.qtgraphicaleffects 57 + qt5.qtmultimedia 58 + qt5.qtquickcontrols 59 + qt5.qtquickcontrols2 60 + qt5.qtxmlpatterns 70 61 quirc 71 62 randomx 72 63 rapidjson 73 64 unbound 74 65 zeromq 75 66 ] 76 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] 67 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ] 77 68 ++ lib.optionals trezorSupport [ 78 69 hidapi 79 70 libusb1 80 - protobuf 71 + protobuf_21 81 72 python3 82 73 ] 83 74 ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [

pkgs/applications/blockchains/monero-gui/move-log-file.patch pkgs/by-name/mo/monero-gui/move-log-file.patch

pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch pkgs/by-name/mo/monero-gui/use-system-libquirc.patch

+5 -9

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

··· 19 19 trezorSupport ? true, 20 20 hidapi, 21 21 libusb1, 22 - protobuf, 22 + protobuf_21, 23 23 udev, 24 24 }: 25 25 ··· 40 40 in 41 41 stdenv.mkDerivation rec { 42 42 pname = "monero-cli"; 43 - version = "0.18.3.4"; 43 + version = "0.18.4.0"; 44 44 45 45 src = fetchFromGitHub { 46 46 owner = "monero-project"; 47 47 repo = "monero"; 48 48 rev = "v${version}"; 49 - hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM="; 49 + hash = "sha256-0byMtX2f+8FqNhLPN1oLxIUTWg5RSbHfwiL8pUIAcgQ="; 50 50 }; 51 51 52 52 patches = [ 53 53 ./use-system-libraries.patch 54 - # https://github.com/monero-project/monero/pull/9462 55 - (fetchpatch2 { 56 - url = "https://github.com/monero-project/monero/commit/65568d3a884857ce08d1170f5801a6891a5c187c.patch?full_index=1"; 57 - hash = "sha256-Btuy69y02UyVMmsOiCRPZhM7qW5+FRNujOZjNMRdACQ="; 58 - }) 59 54 ]; 60 55 61 56 postPatch = '' ··· 88 83 python3 89 84 hidapi 90 85 libusb1 91 - protobuf 86 + protobuf_21 92 87 ] 93 88 ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; 94 89 ··· 99 94 # required by monero-gui 100 95 "-DBUILD_GUI_DEPS=ON" 101 96 "-DReadline_ROOT_DIR=${readline.dev}" 97 + "-Wno-dev" 102 98 ] 103 99 ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" 104 100 ++ lib.optional trezorSupport [

+5 -4

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

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

-2

pkgs/top-level/all-packages.nix

··· 14855 14855 14856 14856 ledger-agent = with python3Packages; toPythonApplication ledger-agent; 14857 14857 14858 - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; 14859 - 14860 14858 napari = with python3Packages; toPythonApplication napari; 14861 14859 14862 14860 nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };