Commit 7e22ca46 authored by Valentin Reis's avatar Valentin Reis
Browse files

adds hwloc and bump aml

parent f6303d9d
Pipeline #7210 canceled with stages
in 16 minutes and 34 seconds
{ stdenv, src, autoreconfHook, fetchgit, pkgconfig,
excit, numabench, numactl }:
excit, numabench, numactl, hwloc }:
stdenv.mkDerivation {
inherit src;
name = "aml";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ numactl ];
buildInputs = [ hwloc numactl ];
}
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "10a2b6445aa07a7732a638c9b7aa07e229c0148a",
"sha256": "18jjdi5gzll7wvnxlyzw8ik70k0x1945d6dz0j0ljc8fj1c4fj1n",
"rev": "6d6b9e7596c5ac46336a66a998f53812d6fb0a8b",
"sha256": "0vk4ayabwkivpbscaqjblzindwxja1799yn2sp2yrws6w4rwm04l",
"url": "https://xgitlab.cels.anl.gov/argo/aml.git"
},
"fn": "fetchgit"
......
......@@ -53,7 +53,12 @@ let
# library of nix expressions
argolib = import ../lib/utils.nix;
# Argo components (source overridabel via argument)
aml = callPackage ./aml {src=aml-src; inherit excit; inherit numabench;};
aml = callPackage ./aml {
src=aml-src;
hwloc=hwloc2;
inherit excit;
inherit numabench;
};
numabench = callPackage ./numabench {src=numabench-src; hwloc = hwloc2;};
excit = callPackage ./excit {src=excit-src;};
nrm = callPackage ./nrm {src=nrm-src;};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment