reduce test builds to single app dependencies.

pkgs/default.nix

@@ -140,22 +140,6 @@ let
     zmqat = pkgs-old.haskellPackages.zmqat;
 
     # ci/experimental environments
-    testBuildInputs =  [
-      # argotk runs mpiexec:
-      pkgs.mpich2
-      # argotk uses hwloc to choose CPU counts:
-      pkgs.hwloc
-      # these are needed for some reason:
-      pkgs.coreutils
-      pkgs.utillinux
-      pkgs.git
-      # argo tools
-      argotk
-      # argo components
-      containers
-      nrm
-    ];
-
     test = pkgs.stdenv.mkDerivation rec {
       name = "testEnv";
 
@@ -197,7 +181,7 @@ let
 
     testApplications = test.overrideAttrs (old:{
       name = "testEnv-with-applications";
-      buildInputs = testBuildInputs ++ [
+      buildInputs = old.buildInputs ++ [
         lammps
         qmcpack
         openmc
@@ -207,7 +191,7 @@ let
       ];
     });
 
-    expe = testApplications.overrideAttrs (old:{
+    powerexpe = testApplications.overrideAttrs (old:{
       name = "power-experiments";
       buildInputs = old.buildInputs ++ [
         #debug tools
@@ -257,8 +241,8 @@ let
 
     report = analysis.overrideAttrs (old:{
       buildPhase = ''
-        echo "analysis/zymakefolder.R ${expe}"
-        analysis/zymakefolder.R ${expe}
+        echo "analysis/zymakefolder.R ${powerexpe}"
+        analysis/zymakefolder.R ${powerexpe}
       '';
       installPhase = ''
         mkdir -p $out
@@ -277,11 +261,11 @@ let
     testListen      = doArgotk test "TestListen";
     testPerfwrapper = doArgotk test "TestPerfwrapper";
     testPower       = doArgotk test "TestPower";
-    testSTREAM      = doArgotk testApplications "TestSTREAM";
-    testAMG         = doArgotk testApplications "TestAMG";
-    testOpenMC      = doArgotk testApplications "TestOpenMC";
-    testLAMMPS      = doArgotk testApplications "TestLAMMPS";
-    testQMCPack     = doArgotk testApplications "TestQMCPack";
+    testSTREAM      = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ stream ];})) "TestSTREAM";
+    testAMG         = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ amg ];})) "TestAMG";
+    testOpenMC      = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ openmc ];})) "TestOpenMC";
+    testLAMMPS      = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ lammps ];})) "TestLAMMPS";
+    testQMCPack     = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ qmcpack ];})) "TestQMCPack";
     testAll         = doArgotk test "tests";
 
   };