Merge branch 'master' into ghc-9.6

.github/workflows/presubmit-stack.yaml

@@ -51,6 +51,15 @@ jobs:
           key: stack-root-${{ matrix.os }}-${{ matrix.resolver }}-${{ hashFiles('stack.yaml', '**/*.cabal') }}
           restore-keys: stack-root-${{ matrix.os }}-${{ matrix.resolver }}-
 
+      # Check this before building, otherwise stack will overwrite the cabal file.
+      - name: Validate cabal file is properly generated from HPack
+        if: matrix.os != 'windows-latest' # Since we're using `diff -u`, cannot run on Windows
+        run: |
+          mv hindent.cabal hindent.cabal.original
+          # See https://github.com/commercialhaskell/stack/issues/3697#issuecomment-353729540.
+          stack build --resolver=${{ matrix.resolver }} --dry-run
+          diff -u hindent.cabal.original hindent.cabal
+
       - name: Get dependencies
         run: stack build --resolver=${{ matrix.resolver }} --only-dependencies --test --bench --no-run-tests --no-run-benchmarks
 
@@ -64,12 +73,4 @@ jobs:
         run: stack bench --resolver=${{ matrix.resolver }}
 
       - name: Generate documentation
-        run: stack haddock --resolver=${{ matrix.resolver }}
-
-      - name: Validate cabal file is properly generated from HPack
-        if: matrix.os != 'windows-latest' # Since we're using `diff -u`, cannot run on Windows
-        run: |
-          mv hindent.cabal hindent.cabal.original
-          # See https://github.com/commercialhaskell/stack/issues/3697#issuecomment-353729540.
-          stack build --resolver=${{ matrix.resolver }} --dry-run
-          diff -u hindent.cabal.original hindent.cabal
+        run: stack haddock --resolver=${{ matrix.resolver }}

hindent.cabal

@@ -98,7 +98,6 @@ library
     build-depends:
         ghc-lib-parser >=9.6.1.20230312 && <9.7
   else
-    if impl(ghc >= 9.4.1)
       build-depends:
           ghc-lib-parser >=9.4.1.20220807 && <9.5
     else