From 169fc8ac3cc66b914fe6a7196d8de5e79923e4f4 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Sun, 7 Apr 2024 22:09:15 +0100
Subject: [PATCH] chore: bump GHC to 9.8.2

Also Weeder to 2.8.0.

Also, `haskell.nix` does not yet support HLS 2.7, but we can work
around it.

Signed-off-by: Drew Hess <src@drewhess.com>
---
 flake.lock | 18 ++++++++++++++++++
 flake.nix  |  9 ++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6253c7980..cbdacc69a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -599,6 +599,23 @@
         "type": "github"
       }
     },
+    "hls-2.7": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708965829,
+        "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=",
+        "owner": "haskell",
+        "repo": "haskell-language-server",
+        "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "2.7.0.0",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
     "hpc-coveralls": {
       "flake": false,
       "locked": {
@@ -1078,6 +1095,7 @@
         "ghc-wasm": "ghc-wasm",
         "hacknix": "hacknix",
         "haskell-nix": "haskell-nix",
+        "hls-2.7": "hls-2.7",
         "nixpkgs": [
           "haskell-nix",
           "nixpkgs-unstable"
diff --git a/flake.nix b/flake.nix
index 9bd68c3da..00f3a8a19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,9 @@
   inputs = {
     haskell-nix.url = "github:input-output-hk/haskell.nix";
 
+    # Until `haskell.nix` catches up.
+    "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
+
     # We use this for some convenience functions only.
     hacknix.url = "github:hackworthltd/hacknix";
 
@@ -44,11 +47,11 @@
         in
         builtins.trace "Nix Primer version is ${v}" "git-${v}";
 
-      ghcVersion = "ghc981";
+      ghcVersion = "ghc982";
 
       # We must keep the weeder version in sync with the version of
       # GHC we're using.
-      weederVersion = "2.6.0";
+      weederVersion = "2.8.0";
 
       # Fourmolu updates often alter formatting arbitrarily, and we want to
       # have more control over this.
@@ -492,7 +495,7 @@
 
                     # Workaround for HLS in haskell.nix. Ref:
                     # https://github.com/input-output-hk/haskell.nix/issues/1981#issuecomment-1594278049
-                    haskell-language-server.src = pkgs.haskell-nix.sources."hls-2.6";
+                    haskell-language-server.src = inputs."hls-2.7";
 
                     implicit-hie = "latest";