From c269fa075a00a45d1298ff32cfb62afb880333ee Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:30:12 +0300 Subject: [PATCH] wownero: 0.8.0.1 -> 0.11.0.1 --- .../blockchains/wownero/default.nix | 83 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 9c68a094b87..665607e2ee7 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -1,38 +1,75 @@ -{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc, openssl, unbound -, readline, libsodium, rapidjson +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, libsodium +, openssl +, rapidjson +, readline +, unbound +, zeromq +, darwin }: +let + # submodules + miniupnp = fetchFromGitHub { + owner = "miniupnp"; + repo = "miniupnp"; + rev = "miniupnpc_2_2_1"; + hash = "sha256-opd0hcZV+pjC3Mae3Yf6AR5fj6xVwGm9LuU5zEPxBKc="; + }; + supercop = fetchFromGitHub { + owner = "monero-project"; + repo = "supercop"; + rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; + hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; + }; + randomwow = fetchFromGitHub { + owner = "wownero-project"; + repo = "RandomWOW"; + rev = "607bad48f3687c2490d90f8c55efa2dcd7cbc195"; + hash = "sha256-CJv96TbPv1k/C7MQWEntE6khIRX1iIEiF9wEdsQGiFQ="; + }; +in stdenv.mkDerivation rec { pname = "wownero"; - version = "0.8.0.1"; - randomwowVersion = "1.1.7"; + version = "0.11.0.1"; - src = fetchFromGitea { - domain = "git.wownero.com"; - owner = "wownero"; + src = fetchFromGitHub { + owner = "wownero-project"; repo = "wownero"; rev = "v${version}"; - sha256 = "sha256-+cUdousEiZMNwqhTvjoqw/k21x3dg7Lhb/5KyNUGrjQ="; fetchSubmodules = false; + hash = "sha256-zmGsSbPpVwL0AhCQkdMKORruM5kYrrLe/BYfMphph8c="; }; - randomwow = fetchFromGitea { - domain = "git.wownero.com"; - owner = "wownero"; - repo = "RandomWOW"; - rev = randomwowVersion; - sha256 = "sha256-JzyRlHwM8rmJ5OaKHz+6vHGfpSz+X4zkFAKn4Jmo+EE="; - }; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; buildInputs = [ - boost miniupnpc openssl unbound rapidjson readline libsodium + boost + libsodium + openssl + rapidjson + readline + unbound + zeromq + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit ]; postUnpack = '' - rm -r $sourceRoot/external/RandomWOW - ln -s ${randomwow} $sourceRoot/external/RandomWOW + rm -r $sourceRoot/external/miniupnp + ln -s ${miniupnp} $sourceRoot/external/miniupnp + + rm -r $sourceRoot/external/randomwow + ln -s ${randomwow} $sourceRoot/external/randomwow + + rm -r $sourceRoot/external/supercop + ln -s ${supercop} $sourceRoot/external/supercop ''; cmakeFlags = [ @@ -52,9 +89,9 @@ stdenv.mkDerivation rec { signatures using different participants for the same tx outputs on opposing forks. ''; - homepage = "https://wownero.org/"; - license = licenses.bsd3; - platforms = platforms.linux; + homepage = "https://wownero.org/"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b367984fe4b..12a642f343d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36192,9 +36192,7 @@ with pkgs; wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; - wownero = callPackage ../applications/blockchains/wownero { - boost = boost175; - }; + wownero = callPackage ../applications/blockchains/wownero { }; zcash = callPackage ../applications/blockchains/zcash { inherit (darwin.apple_sdk.frameworks) Security;