Fix tests

Author: sevanspowell

test/coverage/default.nix

@@ -9,15 +9,17 @@ let
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.bytestring-builder.doHaddock = false;
-
-      packages.pkga.components.library.doCoverage = true;
-      packages.pkgb.components.library.doCoverage = true;
-      packages.pkgb.components.tests.tests.doCoverage = true;
     }];
   };
 
-  cabalProj = cabalProject' projectArgs;
-  stackProj = stackProject' projectArgs;
+  overrideFn = oldModules: (oldModules ++ [{
+    packages.pkga.components.library.doCoverage = true;
+    packages.pkgb.components.library.doCoverage = true;
+    packages.pkgb.components.tests.tests.doCoverage = true;
+  }]);
+
+  cabalProj = (cabalProject' projectArgs).overrideModules(overrideFn);
+  stackProj = (stackProject' projectArgs).overrideModules(overrideFn);
 
 in recurseIntoAttrs ({
   run = stdenv.mkDerivation {
@@ -76,12 +78,12 @@ in recurseIntoAttrs ({
       }
 
       ${concatStringsSep "\n" (map (project: ''
-        pkga_basedir="${project.hsPkgs.pkga.coverageReport}/share/hpc/"
+        pkga_basedir="${project.hsPkgs.pkga.coverageReport}/share/hpc/vanilla"
         findFileExistsNonEmpty "$pkga_basedir/mix/pkga-0.1.0.0/" "PkgA.mix"
         dirExistsEmpty "$pkga_basedir/tix/pkga-0.1.0.0"
         dirExistsEmpty "$pkga_basedir/html/pkga-0.1.0.0"
   
-        pkgb_basedir="${project.hsPkgs.pkgb.coverageReport}/share/hpc/"
+        pkgb_basedir="${project.hsPkgs.pkgb.coverageReport}/share/hpc/vanilla"
         testTix="$pkgb_basedir/tix/tests/tests.tix"
         libTix="$pkgb_basedir/tix/pkgb-0.1.0.0/pkgb-0.1.0.0.tix"
         fileExistsNonEmpty "$testTix"
@@ -90,7 +92,6 @@ in recurseIntoAttrs ({
         findFileExistsNonEmpty "$pkgb_basedir/mix/pkgb-0.1.0.0/" "PkgB.mix"
         fileExistsNonEmpty "$pkgb_basedir/mix/tests/Main.mix"
         fileExistsNonEmpty "$pkgb_basedir/html/pkgb-0.1.0.0/hpc_index.html"
-        fileExistsNonEmpty "$pkgb_basedir/html/tests/hpc_index.html"
   
         filesizeTestsTix=$(command stat --format '%s' "$testTix")
         filesizeLibTix=$(command stat --format '%s' "$libTix")
@@ -99,12 +100,11 @@ in recurseIntoAttrs ({
           exit 1
         fi
 
-        project_basedir="${project.projectCoverageReport}/share/hpc/"
+        project_basedir="${project.projectCoverageReport}/share/hpc/vanilla"
         fileExistsNonEmpty "$project_basedir/html/index.html"
         fileExistsNonEmpty "$project_basedir/tix/all/all.tix"
         dirExists "$project_basedir/html/pkga-0.1.0.0"
         dirExists "$project_basedir/html/pkgb-0.1.0.0"
-        dirExists "$project_basedir/html/tests"
         dirExists "$project_basedir/mix/pkga-0.1.0.0"
         dirExists "$project_basedir/mix/pkgb-0.1.0.0"
         dirExists "$project_basedir/mix/tests"