philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #140622 from msimberg/hpx-1.7.1

conduit-nginx
Sandro 2021-10-21 22:57:49 +02:00 committed by GitHub
parent a0dbe47318 2b39d083ba
commit ef18e54a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/hpx/default.nix
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;

5
pkgs/top-level/all-packages.nix
View File

@ -16675,7 +16675,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 { };