From 4ca86a844b3abef3a040cc83696e711ac223afd8 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Mon, 22 Oct 2018 21:44:02 +0200 Subject: [PATCH 1/2] particl-core: 0.16.2.0 -> 0.17.0.2 Update version. Disabled tests and benchmartk to speed up Hydra build. --- pkgs/applications/altcoins/particl/particl-core.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index a06f373683a9..3be2d296d393 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.16.2.0"; + version = "0.17.0.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617"; + sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -29,12 +29,17 @@ stdenv.mkDerivation rec { unixtools.hexdump ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + configureFlags = [ + "--disable-bench" + "--enable-tests=no" + "--with-boost-libdir=${boost.out}/lib" + ]; meta = { description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription= '' An open source, decentralized privacy platform built for global person to person eCommerce. + RPC daemon and CLI client only. ''; homepage = https://particl.io/; maintainers = with maintainers; [ demyanrogozhin ]; From 233dad81ebc164520fb763cbb47a16c88655888d Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Sat, 27 Oct 2018 23:50:40 +0200 Subject: [PATCH 2/2] particl-core: Eabled tests and parallel build. Build now dependent on Python3 and current version of Boost --- pkgs/applications/altcoins/default.nix | 2 +- .../altcoins/particl/particl-core.nix | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 87f5d0be68a3..b24dbb8f90a5 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -90,5 +90,5 @@ rec { parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; - particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; + particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 3be2d296d393..d3b20ef2ea36 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -10,13 +10,14 @@ , zeromq , zlib , unixtools +, python3 }: with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.17.0.2"; + version = "0.17.0.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; @@ -24,17 +25,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ - openssl db48 boost zlib miniupnpc libevent zeromq - unixtools.hexdump - ]; + buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; configureFlags = [ "--disable-bench" - "--enable-tests=no" "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals (!doCheck) [ + "--enable-tests=no" ]; + # Always check during Hydra builds + doCheck = true; + preCheck = "patchShebangs test"; + enableParallelBuilding = true; + meta = { description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription= ''