Commit 693fc20c authored by Valentin Reis's avatar Valentin Reis

Bumping the work on the sandbox

parent dac545eb
Pipeline #5340 canceled with stage
in 5 minutes and 54 seconds
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "d25ab860203ed9cefea147b4314a48a81e53ecf4", "rev": "3ce333e2ae14f11e47d537c21f8e02afe89e7d97",
"sha256": "0icd2plv1n6dqh58rg1wvclh5xikr8ba1dm5ck8dfbfp3xdppsdb", "sha256": "0dwzi1pdbj3hzqwilwfh8ygg9xb767232p8bcf53ysicih5lm53a",
"url": "https://xgitlab.cels.anl.gov/argo/argonix.git" "url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "42e018b0928bd3e162e8a2399fe008ade0974295", "rev": "021f3476bc3e39a8cc9891023a4884e42726373f",
"sha256": "00ai13grjjmxgxs0r8i92dvlvlp6qdxwd8a0v8kmlnn4q3cjm4dp", "sha256": "06zb8hrrnwk85bxm6mp1iaxdsrqqbbra2ic7nglw7l71zzf1x4h9",
"url": "https://xgitlab.cels.anl.gov/argo/argotk.git" "url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
...@@ -111,6 +111,8 @@ let ...@@ -111,6 +111,8 @@ let
installPhase = "mkdir $$out"; installPhase = "mkdir $$out";
unpackPhase = "true"; unpackPhase = "true";
__noChroot = true;
buildInputs = [ buildInputs = [
# argotk runs mpiexec: # argotk runs mpiexec:
pkgs.mpich2 pkgs.mpich2
...@@ -128,7 +130,15 @@ let ...@@ -128,7 +130,15 @@ let
# sample application for testing progress reports: # sample application for testing progress reports:
(stream.override {libnrm = libnrm; iterationCount = "20";}) (stream.override {libnrm = libnrm; iterationCount = "20";})
]; ];
shellHook ="source ${argotk}/share/argotk.sh"; # bash completion shellHook =''
echo ""
echo "ENTERING ENVIRONMENT: Sources of impurity for this build are: /tmp/ /etc/argo/ /var/run/ /var/lock/".
echo "ENTERING ENVIRONMENT: Moreover, sandboxing is disabled, in particular because of:"
echo "ENTERING ENVIRONMENT: /tmp/nrm-* sockets, /etc/argo, /var/run/, /var/lock/ which all need read access. "
echo "ENTERING ENVIRONMENT: until these components are patched to allow for alternative paths, no sandbox use is possible."
source ${argotk}/share/argotk.sh
echo ""
''; # bash completion
ARGOTK_SHARE = "${argotk}/share"; # for argotk to find its versioned data ARGOTK_SHARE = "${argotk}/share"; # for argotk to find its versioned data
#SUDO = builtins.toPath sudoPath; #SUDO = builtins.toPath sudoPath;
}; };
...@@ -140,6 +150,8 @@ let ...@@ -140,6 +150,8 @@ let
OPENMC_PWD = "${argotk}/share/openmc"; OPENMC_PWD = "${argotk}/share/openmc";
}); });
debug = doArgotk "TestListen";
doArgotk = command: test.overrideAttrs (old:{ doArgotk = command: test.overrideAttrs (old:{
buildPhase = "argotk "+command; buildPhase = "argotk "+command;
installPhase = '' installPhase = ''
......
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