From 0f567b49308fcb5f698b7c4914a97acfdd3bebcc Mon Sep 17 00:00:00 2001 From: Beardhatcode Date: Mon, 15 Jan 2024 15:15:48 +0100 Subject: [PATCH 1/2] hpx: 1.8.1 -> 1.9.1 released in august 2023 https://hpx-docs.stellar-group.org/tags/v1.9.1/html/releases/whats_new_1_9_1.html hpx: use hash attribute instead of sha256 Co-authored-by: kirillrdy --- pkgs/development/libraries/hpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 2464e95c6b6d..b7cefb19fa41 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; - rev = version; - sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw="; + rev = "v${version}"; + hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; }; buildInputs = [ asio boost hwloc gperftools ]; From 35164de0d15254c98ec2d296cfc481b908e33515 Mon Sep 17 00:00:00 2001 From: Beardhatcode Date: Mon, 15 Jan 2024 16:38:10 +0100 Subject: [PATCH 2/2] hpx: add hwloc to propagatedBuildInputs hpx will only compile programs if hwloc is availible. Any package that uses hpx will also need hwloc to be availible. Without this change CMake will complain HWLoc is not availible. see: https://hpx-docs.stellar-group.org/branches/release/html/quickstart.html#hpx-dependencies --- pkgs/development/libraries/hpx/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index b7cefb19fa41..bcaf1233d300 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja -, pkg-config, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, asio +, boost +, cmake +, hwloc +, gperftools +, ninja +, pkg-config +, python3 +}: stdenv.mkDerivation rec { pname = "hpx"; @@ -12,7 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; }; - buildInputs = [ asio boost hwloc gperftools ]; + propagatedBuildInputs = [ hwloc ]; + buildInputs = [ asio boost gperftools ]; nativeBuildInputs = [ cmake pkg-config python3 ]; strictDeps = true;