More fixes for GHC HEAD

Author: hamishmack

test/cabal-simple/default.nix

@@ -31,8 +31,11 @@ in recurseIntoAttrs {
 
   # Used for testing externally with nix-shell (../tests.sh).
   test-shell = (project.shellFor {
-      tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; };
-      withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927"];
+      tools = {
+        cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
+        hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
+      };
+      withHoogle = true;
     }).overrideAttrs (_: _: {
       meta = rec {
         platforms = lib.platforms.all;

test/cabal.project.local

@@ -7,20 +7,15 @@ if impl(ghc>=9.10.1)
 if impl(ghc > 9.11)
   allow-newer: *:containers, *:time
   constraints: base-compat >=0.14.0, aeson >=2.2.1.0
+  -- From https://ghc.gitlab.haskell.org/head.hackage/cabal.constraints
+  constraints: extra ==1.7.14
 
 -- This prevents hsc2hs from causing old versions of packages from being added to plan.json
 allow-newer: hsc2hs:*
 
 if impl(ghc >=9.10.1)
   extra-packages: process
 
-if impl(ghc >=9.11)
-  source-repository-package
-    type: git
-    location: https://github.com/hamishmack/extra.git
-    tag: 3cced868b7f270acb90b7064d34e2d4c5952ca48
-    --sha256: sha256-e2JHNRvkpws18dWmc+RUPWEESX+LV9W0u25dCG2e8ws=
-
 repository head.hackage.ghc.haskell.org
   url: https://ghc.gitlab.haskell.org/head.hackage/
   secure: True
@@ -29,14 +24,14 @@ repository head.hackage.ghc.haskell.org
      f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
      26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
      7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-  --sha256: sha256-Z4NrYC11bsuJp4IPy6cRoFQ03wLAPEaejM9Y52n4EHk=
+  --sha256: sha256-VFRuIfs3k6nyLVvT445wFRDy+bpcy1LVmLCMg1Oo/uE=
 
 repository ghcjs-overlay
-  url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/d37efd733666d090bf1c83bf7d5f9cb71b1dacc1
+  url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/01ecad22c0a72e3c5a49262357cf0b062892d87f
   secure: True
   root-keys:
   key-threshold: 0
-  --sha256: sha256-6I5mu1QFdvWFm6jWOUMKGm3VHvB7vSqiBjjHgAZJReo=
+  --sha256: sha256-BjyXYh6oS4wE1iHlY/7as7vkmjxFOXzK6nOYzbzjQrM=
 
 if os(ghcjs)
   extra-packages: ghci