From a67c95c3417a16b189a3221d3d07470c739b1d44 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sun, 9 Oct 2022 23:24:51 +0100 Subject: [PATCH] altcoins.masari: 0.1.4.0 -> latest-2022-10-09 Co-authored-by: Mario Rodas --- .../blockchains/masari/default.nix | 24 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix index 175cd7a31bd..7cc0b2a593e 100644 --- a/pkgs/applications/blockchains/masari/default.nix +++ b/pkgs/applications/blockchains/masari/default.nix @@ -1,25 +1,35 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }: stdenv.mkDerivation rec { pname = "masari"; - version = "0.1.4.0"; + version = "unstable-2022-10-09"; src = fetchFromGitHub { owner = "masari-project"; repo = "masari"; - rev = "v${version}"; - sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; + rev = "ff71f52220858b84a4403dab9a14339bcad57826"; + sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnpc,rapidjson} + ''; + + nativeBuildInputs = [ cmake pkg-config git ]; + + buildInputs = [ + boost miniupnpc openssl unbound + zeromq readline libsodium + rapidjson cppzmq + ]; meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthewcroughan ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383eba56b82..51128343be3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33112,7 +33112,7 @@ with pkgs; oxen = callPackage ../applications/blockchains/oxen { stdenv = gcc10StdenvCompat; boost = boost17x; }; - masari = callPackage ../applications/blockchains/masari { boost = boost165; }; + masari = callPackage ../applications/blockchains/masari { boost = boost174; }; napari = with python3Packages; toPythonApplication napari;