3
0
Fork 0
forked from mirrors/nixpkgs

hpx: 1.6.0 -> 1.7.1

Update HPX from 1.6.0 to 1.7.1. Adds dependency on Asio (new for 1.7.0)
and uses fixed Boost version (1.71.0 is the minimum required by HPX).
This commit is contained in:
Mikael Simberg 2021-10-05 16:29:42 +02:00
parent f8edb26a71
commit 2b39d083ba
No known key found for this signature in database
GPG key ID: 890B490D7BFD0BB9
2 changed files with 9 additions and 5 deletions

View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }:
{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja
, pkg-config, python3 }:
stdenv.mkDerivation rec {
pname = "hpx";
version = "1.6.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk=";
sha256 = "1knx7kr8iw4b7nh116ygd00y68y84jjb4fj58jkay7n5qlrxh604";
};
buildInputs = [ boost hwloc gperftools ];
buildInputs = [ asio boost hwloc gperftools ];
nativeBuildInputs = [ cmake pkg-config python3 ];
strictDeps = true;

View file

@ -16499,7 +16499,10 @@ with pkgs;
hound = callPackage ../development/tools/misc/hound { };
hpx = callPackage ../development/libraries/hpx { };
hpx = callPackage ../development/libraries/hpx {
boost = boost17x;
asio = asio.override { boost = boost17x; };
};
hspell = callPackage ../development/libraries/hspell { };