Merge branch 'master' into re-add-stan

Author: 0rphee

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

@@ -7,7 +7,7 @@ inputs:
   cabal:
     description: "Cabal version"
     required: false
-    default: "3.8.1.0"
+    default: "3.10.2.0"
   os:
     description: "Operating system: Linux, Windows or macOS"
     required: true

.github/workflows/bench.yml

@@ -21,7 +21,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"

.github/workflows/caching.yml

@@ -62,7 +62,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '["**/docs/**"

.github/workflows/flags.yml

@@ -26,7 +26,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"

.github/workflows/nix.yml

@@ -18,10 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       should_skip_develop: ${{ steps.skip_check.outputs.should_skip }}
-      should_skip_build: ${{ steps.skip_check_no_nix.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -35,11 +34,6 @@ jobs:
                          , ".gitlab-ci.yaml"
                          , ".gitlab/**"
                          ]'
-      - id: skip_check_no_nix
-        uses: fkirc/[email protected]
-        with:
-          cancel_others: false
-          paths: '[ "**.nix" ]'
 
   # Enter the development shell and run `cabal build`
   develop:
@@ -63,66 +57,15 @@ jobs:
     - uses: cachix/cachix-action@v12
       with:
         name: haskell-language-server
-        # Disable pushing, we will do that in job `build`
-        skipPush: true
+        authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
     - run: |
         nix develop --print-build-logs --command cabal update
         nix develop --print-build-logs --command cabal build
 
-  # Build and then push HLS binaries with developmet shell to cachix
-  # This job runs when
-  #   1. PRs are merged to master (runs on master)
-  #   2. Nix files are changed (runs on PR)
-  build:
-    needs: pre_job
-    runs-on: ${{ matrix.os }}
-    env:
-      HAS_TOKEN: ${{ secrets.HLS_CACHIX_AUTH_TOKEN != '' }}
-    if: (needs.pre_job.outputs.should_skip_build != 'true' && needs.pre_job.outputs.should_skip_pr != 'true') || (github.repository_owner == 'haskell' && github.ref == 'refs/heads/master')
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macOS-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: cachix/install-nix-action@v23
-      with:
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-        nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v12
-      with:
-        name: haskell-language-server
-        authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
-    - name: Build development shell
-      run: nix develop --print-build-logs --profile dev
-    - name: Build all development shell (without nix dependencies)
-      run: nix develop --print-build-logs .#all-simple-dev-shells --profile dev
-    # We only build nix dev shell for current GHC version because some are
-    # failing with different GHC version on darwin.
-    - name: Build development shell with nix dependencies for current GHC version
-      if: matrix.os == 'macOS-latest'
-      run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
-    - name: Build development shells with nix dependencies
-      if: matrix.os == 'ubuntu-latest'
-      run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
-    - name: Push development shell
-      if: ${{ env.HAS_TOKEN == 'true' }}
-      run: cachix push haskell-language-server dev
-    - name: Build binaries
-      run: nix build --print-build-logs
-    - name: Build all binaries
-      run: nix build --print-build-logs .#all-haskell-language-server
-    - name: Push binaries
-      if: ${{ env.HAS_TOKEN == 'true' }}
-      run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server
-
   nix_post_job:
     if: always()
     runs-on: ubuntu-latest
-    needs: [pre_job, develop, build]
+    needs: [pre_job, develop]
     steps:
       - run: |
           echo "jobs info: ${{ toJSON(needs) }}"

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
       - id: ghcs
         run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
       - id: skip_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -45,7 +45,7 @@ jobs:
                          ]'
       # If we only change ghcide downstream packages we have not test ghcide itself
       - id: skip_ghcide_check
-        uses: fkirc/[email protected].0
+        uses: fkirc/[email protected].1
         with:
           cancel_others: false
           paths_ignore: '[ "hls-test-utils/**"

cabal.project

@@ -35,7 +35,7 @@ packages:
          ./plugins/hls-refactor-plugin
          ./plugins/hls-overloaded-record-dot-plugin
 
-index-state: 2023-10-30T20:39:48Z
+index-state: 2023-11-13T12:07:58Z
 
 tests: True
 test-show-details: direct
@@ -55,6 +55,10 @@ constraints:
   text -simdutf,
   ghc-check -ghc-check-use-package-abis,
   ghc-lib-parser-ex -auto,
+  -- This is only present in some versions, and it's on by default since 
+  -- 0.14.5.0, but there are some versions we allow that need this 
+  -- setting
+  stylish-haskell +ghc-lib,
   -- Centos 7 comes with an old gcc version that doesn't know about
   -- the flag '-fopen-simd', which blocked the release 2.2.0.0.
   -- We want to be able to benefit from the performance optimisations
@@ -85,27 +89,19 @@ if impl(ghc >= 9.1)
 
 if impl(ghc >= 9.7)
   allow-newer:
-    base,
-    template-haskell,
-    ghc,
-    ghc-prim,
-    integer-gmp,
-    ghc-bignum,
-    template-haskell,
-    text,
-    binary,
-    bytestring,
-    Cabal,
-    unix,
-    deepseq,
-
-  repository head.hackage.ghc.haskell.org
-     url: https://ghc.gitlab.haskell.org/head.hackage/
-     secure: True
-     key-threshold: 3
-     root-keys:
-         f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-         26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-         7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-
-  active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org
+    ekg-core:text,
+    -- https://github.com/maoe/ghc-trace-events/issues/12
+    ghc-trace-events:base,
+    ghc-trace-events:bytestring,
+    ghc-trace-events:text,
+    -- https://github.com/haskell-primitive/primitive-unlifted/issues/39
+    primitive-unlifted:bytestring,
+    -- https://github.com/obsidiansystems/constraints-extras/issues/54
+    constraints-extras:base,
+    constraints-extras:template-haskell,
+    -- https://github.com/obsidiansystems/commutative-semigroups/issues/13
+    commutative-semigroups:base,
+    commutative-semigroups:template-haskell,
+    -- https://github.com/kcsongor/generic-lens/issues/158
+    generic-lens:text,
+    generic-lens-core:text,