diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-03-26 12:09:31 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-06 13:03:16 -0400 |
| commit | 6563cd2473a309b135eb8f950adf28b9f3d8e5c2 (patch) | |
| tree | 22eb3757856086434a9258fa64c5449708bae8c1 /.gitlab | |
| parent | c41c478eb9003eaa9fc8081a0039652448124f5d (diff) | |
| download | haskell-6563cd2473a309b135eb8f950adf28b9f3d8e5c2.tar.gz | |
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.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/darwin/toolchain.nix | 6 | ||||
| -rwxr-xr-x | .gitlab/gen_ci.hs | 4 |
2 files changed, 5 insertions, 5 deletions
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 |