gitlab-ci: Bump bootstrap compiler to 9.2.2

This is necessary to build recent `text` commits.

Bumps Hackage index state for a hashable which builds with GHC 9.2.

5 files changed, 11 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31e407eccb..c1ec3706dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,11 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 885dfba7f74583d6a394dbf711cc805178cfcc47
+  DOCKER_REV: 0849567cd9780cc8e9652118b949cb050c632ef4
 
   # Sequential version number of all cached things.
   # Bump to invalidate GitLab CI cache.
-  CACHE_REV: 6
+  CACHE_REV: 8
 
   # Disable shallow clones; they break our linting rules
   GIT_DEPTH: 0
@@ -342,7 +342,8 @@ stack-hadrian-build:
 
 .build-x86_64-linux-deb10-make:
   extends: .validate
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  # Sadly we cannot bootstrap the make build system with 9.2 due to #21188.
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:885dfba7f74583d6a394dbf711cc805178cfcc47"
   variables:
     TEST_ENV: "x86_64-linux-deb10-make"
     BUILD_FLAVOUR: "validate"
diff --git a/.gitlab/darwin/toolchain.nix b/.gitlab/darwin/toolchain.nix
index f94dd5c9be..cc485946cf 100644
--- a/.gitlab/darwin/toolchain.nix
+++ b/.gitlab/darwin/toolchain.nix
@@ -15,16 +15,16 @@ let
   ghcBindists = let version = ghc.version; in {
     aarch64-darwin = pkgs.fetchurl {
       url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
-      sha256 = "sha256:075skdnsa072088a8jfkqac7pphkgzlgqpspb8xa7ljzqg1ryinw";
+      sha256 = "sha256:0p2f35pihlnmkm7x73b5xm3dyhiczrywc19khr7i7vb2q1y4zw6i";
     };
     x86_64-darwin = pkgs.fetchurl {
       url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-      sha256 = "sha256:0ir02gjyb4l073z4gs3f1zjkx04n14dp7a5z4cqzbj9qqgwv0z98";
+      sha256 = "sha256:0gzq0vfjbhr9n8z63capvdwrw7bisy15d5c1y1gynfix13bbnjlk";
     };
   };
 
   ghc = pkgs.stdenv.mkDerivation rec {
-    version = "8.10.7";
+    version = "9.2.2";
     name = "ghc";
     src = ghcBindists.${pkgs.stdenv.hostPlatform.system};
     configureFlags = [
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index 9be71acef7..78ec4fc02d 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -306,7 +306,7 @@ opsysVariables _ FreeBSD = mconcat
     -- [1] https://www.freebsd.org/doc/en/books/porters-handbook/using-iconv.html)
     "CONFIGURE_ARGS" =:  "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib"
   , "HADRIAN_ARGS" =: "--docs=no-sphinx"
-  , "GHC_VERSION" =: "8.10.1"
+  , "GHC_VERSION" =: "9.2.2"
   , "CABAL_INSTALL_VERSION" =: "3.2.0.0"
   ]
 opsysVariables _ (Linux distro) = distroVariables distro
@@ -336,7 +336,7 @@ opsysVariables _ (Windows {}) =
           , "HADRIAN_ARGS" =: "--docs=no-sphinx"
           , "LANG" =: "en_US.UTF-8"
           , "CABAL_INSTALL_VERSION" =: "3.2.0.0"
-          , "GHC_VERSION" =: "8.10.4" ]
+          , "GHC_VERSION" =: "9.2.2" ]
 opsysVariables _ _ = mempty
 
 
diff --git a/compiler/GHC/Linker/Loader.hs b/compiler/GHC/Linker/Loader.hs
index 440780f544..ed633fedb4 100644
--- a/compiler/GHC/Linker/Loader.hs
+++ b/compiler/GHC/Linker/Loader.hs
@@ -631,7 +631,7 @@ checkNonStdWay _dflags interp _srcspan
 -- #if-guard the following equations otherwise the pattern match checker will
 -- complain that they are redundant.
 #if defined(HAVE_INTERNAL_INTERPRETER)
-checkNonStdWay dflags InternalInterp srcspan
+checkNonStdWay dflags _interp srcspan
   | hostFullWays == targetFullWays = return Nothing
     -- Only if we are compiling with the same ways as GHC is built
     -- with, can we dynamically load those object files. (see #3604)
diff --git a/hadrian/cabal.project b/hadrian/cabal.project
index 91b204d9db..f84f0aed41 100644
--- a/hadrian/cabal.project
+++ b/hadrian/cabal.project
@@ -1,7 +1,7 @@
 packages: ./
 
 -- This essentially freezes the build plan for hadrian
-index-state: 2022-01-22T11:45:54Z
+index-state: 2022-03-26T18:46:55Z
 
 -- N.B. Compile with -O0 since this is not a performance-critical executable
 -- and the Cabal takes nearly twice as long to build with -O1. See #16817.