Adds the separate argotk repository.

pkgs/applications/qmcpack/default.nix

-{ stdenv, src, fetchgit, openmpi, cmake, liblapack, openblas, fftw, libxml2, hdf5, pythonPackages, hdf5-fortran, gfortran, boost
+{ stdenv, src, fetchgit, mpich2, cmake, liblapack, openblasCompat, fftw, libxml2, hdf5, pythonPackages, hdf5-fortran, gfortran, boost
 , libnrm,
 nrmSupport ? false}:
 let
@@ -7,17 +7,14 @@ in
 stdenv.mkDerivation {
   inherit src;
   name = "qmcpack";
-  cmakeFlags = [
-    "-DCMAKE_C_COMPILER=${openmpi}/bin/mpicc"
-    "-DCMAKE_CXX_COMPILER=${openmpi}/bin/mpic++"
-  ] ++ optionals nrmSupport [
+  cmakeFlags = optionals nrmSupport [
     "-DQMC_INCLUDE=${libnrm}/include/"
     "-DQMC_EXTRA_LIBS=${libnrm}/lib/libnrm.so"
   ];
-  nativeBuildInputs = [ cmake openmpi ];
+  nativeBuildInputs = [ cmake mpich2 ];
   buildInputs = [
     liblapack
-    openblas
+    openblasCompat
     fftw
     libxml2
     hdf5

pkgs/applications/qmcpack/nrm.json

@@ -3,5 +3,5 @@
   "rev": "766910a4e2bb6ac5ece0a9f233a83825bf1da16e",
   "date": "2018-12-06T11:04:17-06:00",
   "sha256": "0vpyw0ffmsvwlg7fz8dwq9n2v723aqa5jy6vxa4m8yfy6pghyann",
-  "fetchSubmodules": true
+  "fetchSubmodules": false
 }

pkgs/applications/simple/dgemm_randomwalk.json

 {
   "url": "https://xgitlab.cels.anl.gov/argo/applications/simple.git",
-  "rev": "b6ccaaeab909a0479780bdb9d942cb63def3793f",
-  "date": "2018-11-02T13:47:10-05:00",
-  "sha256": "0j8c54k5xprpr1lan8kx3d7dxhpfml3510zwmx6y8bnfb619j7xn",
-  "fetchSubmodules": true
+  "rev": "349ecc8700ff09f40cca9c6ed49c078d79d47b60",
+  "date": "2019-01-23T14:15:00-06:00",
+  "sha256": "0ylz2g2cdvrr04f2h7xk3jgfx2cvn0lnc1fy3pjmg2050i6qxqvh",
+  "fetchSubmodules": false
 }

pkgs/applications/simple/dgemm_randomwalk.nix

-{ stdenv, src, intel, gsl, libnrm, mpich2, libnrm}:
+{ stdenv, src, gsl, libnrm, mpich2}:
 stdenv.mkDerivation {
   inherit src;
-  name = "simple-benchmarks";
+  name = "dgemm-randomwalk";
 
-  buildInputs = [ intel.mkl intel.WrappedICC gsl libnrm mpich2 ];
+  buildInputs = [ gsl libnrm mpich2 ];
 
-  buildPhase = "cd simple; make";
+  buildPhase = "cd simple; make randomwalk";
 
   installPhase = ''
     mkdir -p $out/bin
-    cp randomwalk dgemm $out/bin/
+    cp randomwalk $out/bin/
   '';
 }

pkgs/applications/simple/graph500.nix

@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   inherit src;
   name = "graph500";
 
-  buildInputs = [mpich2 zeromq libnrm];
+  buildInputs = [mpich2 libnrm];
 
   buildPhase = ''
     cd graph500/src

pkgs/argotk/master.json

+{
+  "fetch": {
+    "args": {
+      "fetchSubmodules": false,
+      "rev": "bcfc6a61a46c98ed8935596bf7de953e125c3882",
+      "sha256": "07hg00zjbzpbynjwgjil2h2jmam4d9pcakly84g3k778afnl1srb",
+      "url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
+    },
+    "fn": "fetchgit"
+  },
+  "rev": "refs/heads/master",
+  "type": "fetchgit",
+  "url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
+}
\ No newline at end of file

pkgs/default.nix

@@ -48,9 +48,7 @@ let
         buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
       });
       containers = cpDefaultPin ./containers { inherit pythonPackages; };
-      #containers-bandit = cpAlternatePin ./containers { inherit pythonPackages; } "bandit";
       nrm = cpDefaultPin ./nrm { inherit pythonPackages; nrm-containers = containers; };
-      #nrm-bandit = cpAlternatePin ./nrm { inherit pythonPackages; nrm-containers=containers-bandit; } "bandit";
     };
 
     #Instrumented applications
@@ -59,7 +57,7 @@ let
       paths = {
        amg = applications/amg;
        qmcpack = applications/qmcpack;
-       #openmc = applications/openmc;
+       openmc = applications/openmc;
        stream = applications/stream;
        lammps = applications/lammps;
       };
@@ -93,6 +91,11 @@ let
     asv-nix = callPackage ./tools/asv-nix/default.nix { inherit asv; };
 
     aml = cpDefaultPin ./aml {};
+
+    argotk =
+      let argotk = (pkgs.nix-update-source.fetch argotk/master.json).src;
+          argotkPkgs = import "${argotk}/default.nix" {pkgs=pkgs;};
+      in argotkPkgs.argotk;
   };
 
 in pkgs // argopkgs