Merge remote-tracking branch 'upstream/master' into support-structured-diagnostics

Author: fendor

.github/actions/setup-build/action.yml

@@ -31,7 +31,7 @@ runs:
         sudo chown -R $USER /usr/local/.ghcup
       shell: bash
 
-    - uses: haskell-actions/setup@v2.7.6
+    - uses: haskell-actions/setup@v2.7.7
       id: HaskEnvSetup
       with:
         ghc-version  : ${{ inputs.ghc   }}

.github/workflows/bench.yml

@@ -127,7 +127,7 @@ jobs:
         example: ['cabal', 'lsp-types']
 
     steps:
-    - uses: haskell-actions/setup@v2.7.6
+    - uses: haskell-actions/setup@v2.7.7
       with:
         ghc-version  : ${{ matrix.ghc   }}
         cabal-version: ${{ matrix.cabal }}

cabal.project

@@ -8,7 +8,7 @@ packages:
          ./hls-test-utils
 
 
-index-state:  2024-11-02T00:00:00Z
+index-state:  2024-12-02T00:00:00Z
 
 tests: True
 test-show-details: direct
@@ -46,3 +46,13 @@ constraints:
 if impl(ghc >= 9.9)
   -- https://github.com/haskell/haskell-language-server/issues/4324
   benchmarks: False
+
+if impl(ghc >= 9.8.4) && impl(ghc < 9.8.5)
+  -- By depending on ghc-lib-parser and ghc, we are encountering
+  -- a constraint conflict, ghc-9.8.4 comes with `filepath-1.4.301.0`,
+  -- and `ghc-lib-parser-9.8.4.20241130` specifies `filepath >=1.5 && < 1.6.
+  -- See https://github.com/digital-asset/ghc-lib/issues/572 for details.
+  allow-older:
+    ghc-lib-parser:filepath
+  constraints:
+    ghc-lib-parser==9.8.4.20241130

docs/requirements.txt

@@ -1,4 +1,4 @@
-Sphinx~=5.3.0
-sphinx-rtd-theme~=1.1.0
-myst-parser~=1.0.0
-docutils<0.19
+Sphinx~=8.1.3
+sphinx-rtd-theme~=3.0.2
+myst-parser~=4.0.0
+docutils~=0.21.2