From d5e17b02f431872117bc35f15e4ed917004bc271 Mon Sep 17 00:00:00 2001
From: Taylor Fausak <taylor@fausak.me>
Date: Wed, 14 Sep 2022 07:19:37 -0500
Subject: [PATCH 1/4] Upgrade to HLS 1.8.0.0 by default

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7c42042..d4430ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,7 +85,7 @@ RUN \
 
 # Install HLS.
 
-ARG HLS_VERSION=1.7.0.0
+ARG HLS_VERSION=1.8.0.0
 RUN \
   set -o errexit -o xtrace; \
   if test -n "$HLS_VERSION"; then \

From 95f627432dce20a7a2c82ea614e21c3ca8512435 Mon Sep 17 00:00:00 2001
From: Taylor Fausak <taylor@fausak.me>
Date: Wed, 14 Sep 2022 07:19:59 -0500
Subject: [PATCH 2/4] Upgrade to GHC 9.4.2 by default

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d4430ad..c75dd58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,7 +54,7 @@ RUN \
 
 # Install GHC.
 
-ARG GHC_VERSION=9.0.2
+ARG GHC_VERSION=9.4.2
 RUN \
   set -o errexit -o xtrace; \
   if test -n "$GHC_VERSION"; then \

From 27b37db952284927510c3ab79e9ca602b3149fc4 Mon Sep 17 00:00:00 2001
From: Taylor Fausak <taylor@fausak.me>
Date: Wed, 14 Sep 2022 07:20:55 -0500
Subject: [PATCH 3/4] Install HLS for all versions of GHC

---
 .github/workflows/workflow.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 2532acf..c5c0d31 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -5,9 +5,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - { ghc: 9.0.2, hls: 1.7.0.0 }
-          - { ghc: 9.2.4, hls: '' }
-          - { ghc: 9.4.2, hls: '' }
+          - { ghc: 9.0.2 }
+          - { ghc: 9.2.4 }
+          - { ghc: 9.4.2 }
     name: Docker with GHC ${{ matrix.ghc }}
     runs-on: ubuntu-latest
     steps:
@@ -31,7 +31,6 @@ jobs:
         with:
           build-args: |
             GHC_VERSION=${{ matrix.ghc }}
-            HLS_VERSION=${{ matrix.hls }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           labels: ${{ steps.meta.outputs.labels }}

From 8827d793b97c6338fd965c6b7340db8834b45096 Mon Sep 17 00:00:00 2001
From: Taylor Fausak <taylor@fausak.me>
Date: Wed, 14 Sep 2022 07:21:32 -0500
Subject: [PATCH 4/4] Remove note about HLS

---
 README.markdown | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 1fc45d6..4165f87 100644
--- a/README.markdown
+++ b/README.markdown
@@ -7,4 +7,3 @@ This Docker image provides a Haskell development environment with the following
 - [Cabal](https://www.haskell.org/cabal/)
 - [Stack](https://docs.haskellstack.org/en/stable/README/)
 - [HLS](https://haskell-language-server.readthedocs.io/en/latest/)
-  - Note that HLS is not available for all versions of GHC.