diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 73d1eea988de..0474fd3bc487 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972f01b4f6cb..96d718b900fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };