More fixes for ghc HEAD

Author: hamishmack

test/js-template-haskell/default.nix

@@ -7,7 +7,8 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "js-template-haskell";
-    cabalProjectLocal = ''
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + ''
       if arch(javascript)
         extra-packages: ghci
         constraints: ghcjs installed

test/shell-for-setup-deps/default.nix

@@ -10,7 +10,8 @@ let
   };
 
   env = project.shellFor {
-    withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927"];
+    tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
+    withHoogle = true;
   };
 
 in recurseIntoAttrs ({