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