Commit 55ce8757 authored by Valentin Reis's avatar Valentin Reis
Browse files

bump argonix

parent 3783df31
Pipeline #5827 passed with stages
in 11 minutes and 4 seconds
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "4e8103030b848882e268d8072263a87c9c79c7c9",
"sha256": "0ncd578387j3kpgm3zq3d2la16fycaa77hc2kykwyw490mn0qhx9",
"rev": "8249819276ce58f33b55ee408f2f9863a138b254",
"sha256": "1nd2a3q24ljg40112h120hqfdc1jdfn3wzq6i41smny2y4ip66j1",
"url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
},
"fn": "fetchgit"
......
......@@ -57,11 +57,11 @@ let
# applications with replaceDependency for libnrm.
repLibnrm = path: src: extra:
let
drv = callPackage path {
drv = callPackage path ({
nrmSupport = true;
src = src;
libnrm = libnrm-pinned;
};
}//extra);
rebuilt = drv.override {libnrm = libnrm;};
grafted = pkgs.replaceDependency {
drv = drv;
......@@ -73,7 +73,7 @@ let
qmcpack = repLibnrm ./qmcpack qmcpack-src {};
openmc = repLibnrm ./openmc openmc-src {};
lammps = repLibnrm ./lammps lammps-src {};
stream = repLibnrm ./stream stream-src {iterationCount="20000";};
stream = repLibnrm ./stream stream-src {iterationCount="2000";};
# data (static, non source overridable via arguments)
openmc-data = fetched openmc/data.json;
......@@ -212,6 +212,7 @@ let
buildInputs = old.buildInputs ++ [
#debug tools
pkgs.which
#pkgs.sudo
zmcat
#experiment tools
......@@ -229,7 +230,9 @@ let
src = experiments-src;
#required to be able to build the drv.
installPhase = "mkdir $out";
installPhase = ''
mkdir -p $out
'';
unpackPhase = "true";
buildInputs = [
......
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