diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96c07cd0c7..bc5031fc30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
     strategy:
        fail-fast: false
        matrix:
-         ghc: ["8.10.7", "9.6.4", "9.8.1"]
-         cabal: ["3.10.2.1"]
+         ghc: ["8.10.7", "9.6.5", "9.8.2"]
+         cabal: ["3.10.3.0"]
          os: [ubuntu-latest]
     env:
       # Modify this value to "invalidate" the Cabal cache.
diff --git a/flake.lock b/flake.lock
index 66981a1eee..5b4a0a346c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,16 +104,16 @@
     "cabal-extras": {
       "flake": false,
       "locked": {
-        "lastModified": 1703004694,
-        "narHash": "sha256-IEEXktsFL5mnBxqP/x/I+rVsQsPxW4Y3YnPfO7HGIQI=",
+        "lastModified": 1713098712,
+        "narHash": "sha256-+BakoEhy3h9scMo3cfPBByDOIeB7YZ2wAooOfMSgg2c=",
         "owner": "phadej",
         "repo": "cabal-extras",
-        "rev": "1eb4198381e3461298e27a67997761f91a5ba3d4",
+        "rev": "f487e29cd7b0be52d73a7168eeff4ebc6ed55a6d",
         "type": "github"
       },
       "original": {
         "owner": "phadej",
-        "ref": "cabal-docspec-0.0.0.20231219",
+        "ref": "cabal-docspec-0.0.0.20240414",
         "repo": "cabal-extras",
         "type": "github"
       }
@@ -221,11 +221,11 @@
     "ghc910X": {
       "flake": false,
       "locked": {
-        "lastModified": 1711543129,
-        "narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=",
+        "lastModified": 1714520650,
+        "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=",
         "ref": "ghc-9.10",
-        "rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d",
-        "revCount": 62607,
+        "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5",
+        "revCount": 62663,
         "submodules": true,
         "type": "git",
         "url": "https://gitlab.haskell.org/ghc/ghc"
@@ -240,11 +240,11 @@
     "ghc911": {
       "flake": false,
       "locked": {
-        "lastModified": 1711538967,
-        "narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=",
+        "lastModified": 1714817013,
+        "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=",
         "ref": "refs/heads/master",
-        "rev": "0acfe391583d77a72051d505f05fab0ada056c49",
-        "revCount": 62632,
+        "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034",
+        "revCount": 62816,
         "submodules": true,
         "type": "git",
         "url": "https://gitlab.haskell.org/ghc/ghc"
@@ -258,11 +258,11 @@
     "hackageNix": {
       "flake": false,
       "locked": {
-        "lastModified": 1712276609,
-        "narHash": "sha256-HA2g6rjBdb+B1V7odMgfUDer6LEvBC+g5KsfV5xRwNs=",
+        "lastModified": 1717115116,
+        "narHash": "sha256-V41ZuxYDAaN+H9kuREzeL/Pet00MRuHwxYOxs3ti2os=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "10cbef0c5b3720b87e67fcfd3b03b8fea5c8ca61",
+        "rev": "724171a4419f1f91dae5febfd2606ef440a3f9ae",
         "type": "github"
       },
       "original": {
@@ -292,6 +292,8 @@
         "hls-2.4": "hls-2.4",
         "hls-2.5": "hls-2.5",
         "hls-2.6": "hls-2.6",
+        "hls-2.7": "hls-2.7",
+        "hls-2.8": "hls-2.8",
         "hpc-coveralls": "hpc-coveralls",
         "hydra": "hydra",
         "iserv-proxy": "iserv-proxy",
@@ -311,11 +313,11 @@
         "stackage": "stackage"
       },
       "locked": {
-        "lastModified": 1712099254,
-        "narHash": "sha256-cnqfbHJWP6kkAX5cFDshVr8zaaV4Aoo0HVcxMP9+sjQ=",
+        "lastModified": 1717147454,
+        "narHash": "sha256-FCC7GQZx9sP4HfBUwwrJ7PxaWxg2a/lCesKoXhv0eNg=",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "b26345a13d6d1a008ee27aa752184904f6efd2e7",
+        "rev": "76a12cf4bd4adf16d0bb02522caa3fe405e80966",
         "type": "github"
       },
       "original": {
@@ -444,6 +446,40 @@
         "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"
+      }
+    },
+    "hls-2.8": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1715153580,
+        "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=",
+        "owner": "haskell",
+        "repo": "haskell-language-server",
+        "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "2.8.0.0",
+        "repo": "haskell-language-server",
+        "type": "github"
+      }
+    },
     "hpc-coveralls": {
       "flake": false,
       "locked": {
@@ -509,11 +545,11 @@
     "iserv-proxy": {
       "flake": false,
       "locked": {
-        "lastModified": 1708894040,
-        "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=",
+        "lastModified": 1710581758,
+        "narHash": "sha256-UNUXGiKLGUv1TuQumV70rfjCJERP4w8KZEDxsMG0RHc=",
         "owner": "stable-haskell",
         "repo": "iserv-proxy",
-        "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9",
+        "rev": "50ea210590ab0519149bfd163d5ba199be925fb6",
         "type": "github"
       },
       "original": {
@@ -790,11 +826,11 @@
     "stackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1711930228,
-        "narHash": "sha256-hR0tP4AfdJr7YUsL7GX6YdOb7oqZ8wwC3yC/YKJ8Q6U=",
+        "lastModified": 1716942040,
+        "narHash": "sha256-YxHXqVGGHTy0PkVExdK9z6zHAJbGEd/9rwZdV+RaAU4=",
         "owner": "input-output-hk",
         "repo": "stackage.nix",
-        "rev": "d10c550568fec53cddf8367401407782419b4795",
+        "rev": "686ed0e27db02a273ed04aa41788cc787052b706",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 44a3438ea9..14a8271cec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
     };
     # for cabal-docspec
     cabal-extras = {
-      url = "github:phadej/cabal-extras/cabal-docspec-0.0.0.20231219";
+      url = "github:phadej/cabal-extras/cabal-docspec-0.0.0.20240414";
       flake = false;
     };
     gentle-introduction = {
diff --git a/nix/haskell.nix b/nix/haskell.nix
index 1f0fce7f8e..48320eaf9a 100644
--- a/nix/haskell.nix
+++ b/nix/haskell.nix
@@ -14,10 +14,10 @@ let
   };
   hsPkgs = haskell-nix.cabalProject {
     src = ./..;
-    compiler-nix-name = "ghc964";
+    compiler-nix-name = "ghc965";
     flake.variants = {
       ghc810 = { compiler-nix-name = lib.mkForce "ghc8107"; };
-      ghc98 = { compiler-nix-name = lib.mkForce "ghc981"; };
+      ghc98 = { compiler-nix-name = lib.mkForce "ghc982"; };
     };
     inputMap = {
       "https://chap.intersectmbo.org/" = inputs.CHaP;
diff --git a/nix/shell.nix b/nix/shell.nix
index e9dd0acb5a..14d6f0fef6 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -24,14 +24,8 @@ hsPkgs.shellFor {
   # version as used in hsPkgs.
   tools = {
     haskell-language-server = {
-      src = inputs.haskellNix.inputs."hls-2.6";
+      src = inputs.haskellNix.inputs."hls-2.8";
       configureArgs = "--disable-benchmarks --disable-tests";
-      modules = [{
-        packages.ghcide.patches = [
-          # https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
-          ./ghcide-workaround.diff
-        ];
-      }];
     };
   };
 
diff --git a/nix/tools.nix b/nix/tools.nix
index b0618dae6c..a499f34fc5 100644
--- a/nix/tools.nix
+++ b/nix/tools.nix
@@ -2,7 +2,7 @@ inputs: final: prev:
 
 let
   inherit (final) lib;
-  tool-index-state = "2024-04-01T00:00:00Z";
+  tool-index-state = "2024-05-31T00:00:00Z";
   tool = name: version: other:
     final.haskell-nix.tool final.hsPkgs.args.compiler-nix-name name ({
       version = version;
@@ -37,16 +37,10 @@ in
   }).cabal-install.components.exes.cabal;
 
   cabal-docspec = tool "cabal-docspec" "git" {
+    compiler-nix-name = "ghc98";
     src = inputs.cabal-extras;
     cabalProject = ''
-      packages: peura cabal-docspec ${inputs.gentle-introduction}
-    '';
-    cabalProjectLocal = ''
-      allow-newer: cabal-docspec:*
-                 , gentle-introduction:*
-                 , peura:*
-                 , paths:*
-      constraints: directory <1.3.8.0
+      packages: peura cabal-docspec ${inputs.gentle-introduction} paths-0.2.0.0
     '';
   };
 
@@ -54,17 +48,14 @@ in
     src = final.fetchFromGitHub {
       owner = "kokobd";
       repo = "cabal-hoogle";
-      rev = "7452c2b1dbdae4eb675d280ed99ec135293adc13";
-      hash = "sha256-w7PkNZfHJw1291c2nfviENSXykYpNV+4i3FmbMJqSMs=";
+      rev = "f3a230de36a08920f8ad47766b0528b9229b3ce6";
+      hash = "sha256-WiSq1uBjuSCEW7vp/81a1PVdo/7pf86dqy+R7lDCOdY=";
     };
-    cabalProjectLocal = ''
-      allow-newer: cabal-hoogle:*
-    '';
   };
 
   stylish-haskell = tool "stylish-haskell" "0.14.6.0" { };
 
-  cabal-gild = tool "cabal-gild" "1.3.0.1" { };
+  cabal-gild = tool "cabal-gild" "1.3.1.2" { };
 
   haskellBuildUtils = prev.haskellBuildUtils.override {
     inherit (final.hsPkgs.args) compiler-nix-name;
diff --git a/scripts/docs/haddocks.sh b/scripts/docs/haddocks.sh
index 0c1de2a4d6..65c0cde587 100755
--- a/scripts/docs/haddocks.sh
+++ b/scripts/docs/haddocks.sh
@@ -25,7 +25,7 @@ GHC_VERSION=$(ghc --numeric-version)
 if ! command -v cabal-docspec &> /dev/null
 then
   # cabal-docspec. Download binary
-  curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20231219/cabal-docspec-0.0.0.20231219-x86_64-linux.xz > cabal-docspec.xz
+  curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
   # this doesn't seem to exist in GH runners?
   mkdir -p "$HOME"/.local/bin
   xz -d < cabal-docspec.xz > "$HOME"/.local/bin/cabal-docspec