From 45e68ec5ed13ff875c47e752fc853b428175a756 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sun, 14 Feb 2021 11:36:21 -0500 Subject: [PATCH] =?UTF-8?q?rippled-validator-keys-tool:=2020180927-d7774bc?= =?UTF-8?q?=20=E2=86=92=200.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/rippled/validator-keys-tool.nix | 28 +++++++++++--------- pkgs/top-level/all-packages.nix | 6 ++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/pkgs/servers/rippled/validator-keys-tool.nix index ec5794d1509..ba172ddefd2 100644 --- a/pkgs/servers/rippled/validator-keys-tool.nix +++ b/pkgs/servers/rippled/validator-keys-tool.nix @@ -1,33 +1,35 @@ -{ stdenv, lib, fetchgit, cmake, openssl, boost, zlib, rippled }: +{ stdenv, lib, fetchFromGitHub, cmake, openssl, boost, zlib, icu, rippled }: stdenv.mkDerivation rec { - name = "rippled-validator-keys-tool-20180927-${builtins.substring 0 7 rev}"; - rev = "d7774bcc1dc9439c586ea1c175fcd5ff3960b15f"; + pname = "rippled-validator-keys-tool"; + version = "0.3.2"; - src = fetchgit { - url = "https://github.com/ripple/validator-keys-tool.git"; - inherit rev; - sha256 = "1hcbwwa21n692qpbm0vqy5jvvnf4aias309610m4kwdsnzfw0902"; + src = fetchFromGitHub { + owner = "ripple"; + repo = "validator-keys-tool"; + rev = "5d7efcfeda3bdf6f5dda78056004a7c326321e9b"; + sha256 = "1irm8asp6plk9xw3ksf4fqnim8h0vj3h96w638lx71pga1h4zvmy"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl boost zlib rippled ]; + buildInputs = [ openssl boost zlib icu rippled ]; hardeningDisable = ["format"]; - preConfigure = '' - export CXX="$(command -v $CXX)" - export CC="$(command -v $CC)" - ''; + cmakeFlags = [ + "-Dep_procs=1" + ]; installPhase = '' + runHook preInstall install -D validator-keys $out/bin/validator-keys + runHook postInstall ''; meta = with lib; { description = "Generate master and ephemeral rippled validator keys"; homepage = "https://github.com/ripple/validator-keys-tool"; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline rmcgibbo ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2358f862f87..ecee1687e14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18420,13 +18420,11 @@ in # Fails to compile with boost >= 1.72 rippled = callPackage ../servers/rippled { - boost = boost171; + boost = boost17x; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { - boost = boost167.override { - enableStatic = true; - }; + boost = boost17x; }; roon-server = callPackage ../servers/roon-server { };