From a61adfa3ffa57ee50cf7f2b54f08c214a535749c Mon Sep 17 00:00:00 2001
From: Martijn Bastiaan <martijn@hmbastiaan.nl>
Date: Thu, 18 Mar 2021 12:17:37 +0100
Subject: [PATCH] Update CI w.r.t. GHC 9.0

(cherry picked from commit 232ac0cbc5e20637ec583dc7c10214a5f678509d)
---
 .ci/docker/Dockerfile    | 4 ++--
 .ci/gitlab/benchmark.yml | 2 +-
 .ci/gitlab/common.yml    | 2 +-
 .circleci/config.yml     | 2 +-
 .gitlab-ci.yml           | 3 +--
 cabal.project            | 5 -----
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.ci/docker/Dockerfile b/.ci/docker/Dockerfile
index 7d8bd1e053..77e58864cc 100644
--- a/.ci/docker/Dockerfile
+++ b/.ci/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
  && cd .. \
  && rm -rf ghdl-0.37
 
-ARG GHCUP_VERSION="0.1.12"
+ARG GHCUP_VERSION="0.1.14"
 ARG GHCUP_URL="https://downloads.haskell.org/~ghcup/${GHCUP_VERSION}/x86_64-linux-ghcup-${GHCUP_VERSION}"
 ARG GHCUP_BIN=/usr/bin/ghcup
 
@@ -38,7 +38,7 @@ RUN curl $GHCUP_URL --output $GHCUP_BIN \
  && ghcup install cabal 2.4.1.0 \
  && ghcup install cabal 3.0.0.0 \
  && ghcup install cabal 3.2.0.0 \
- && ghcup install cabal 3.4.0.0-rc4
+ && ghcup install cabal 3.4.0.0
 
 ARG ghc_version
 ENV GHC_VERSION=$ghc_version
diff --git a/.ci/gitlab/benchmark.yml b/.ci/gitlab/benchmark.yml
index 07db0013b2..2391df686f 100644
--- a/.ci/gitlab/benchmark.yml
+++ b/.ci/gitlab/benchmark.yml
@@ -1,5 +1,5 @@
 .benchmark:
-  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
   stage: test
   timeout: 2 hours
   variables:
diff --git a/.ci/gitlab/common.yml b/.ci/gitlab/common.yml
index 59e412b2bd..229997ec0e 100644
--- a/.ci/gitlab/common.yml
+++ b/.ci/gitlab/common.yml
@@ -1,5 +1,5 @@
 .common:
-  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
   timeout: 2 hours
   stage: build
   variables:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c67d02239..e876a3c02f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,7 +116,7 @@ aliases:
 
   - &build_default
     docker:
-      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
         # Read-only permissions
         auth:
           username: clash-lang-builder
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b810a85aca..529723b17d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,9 +55,8 @@ tests-8.10:
 tests-9.0:
   extends: .common-trigger
   variables:
-    GHC_HEAD: "yes" # We need the HEAD overlay for now
     GHC_VERSION: 9.0.1
-    CABAL_VERSION: 3.4.0.0-rc4
+    CABAL_VERSION: 3.4.0.0
 
 # Tests run on shared runners:
 haddock:
diff --git a/cabal.project b/cabal.project
index 487558b413..443f036729 100644
--- a/cabal.project
+++ b/cabal.project
@@ -60,8 +60,3 @@ source-repository-package
   location: https://github.com/kcsongor/generic-lens.git
   tag: 8e1fc7dcf444332c474fca17110d4bc554db08c8
   subdir: generic-lens
-
-source-repository-package
-  type: git
-  location: https://github.com/haskell-hint/hint.git
-  tag: abdb192eace46ef71b7b4a2d4a67654248f8dbdb