Bump stack configs + CI to 9.6.5 and 9.8.2 (#4316)

.circleci/config.yml

@@ -58,16 +58,16 @@ defaults: &defaults
 
 version: 2
 jobs:
-  stackage-lts21:
+  stackage-lts22:
     docker:
-      - image: haskell:9.4.8-slim-buster
+      - image: haskell:9.6.5-slim-buster
     environment:
-      - STACK_FILE: "stack-lts21.yaml"
+      - STACK_FILE: "stack-lts22.yaml"
     <<: *defaults
 
   stackage-nightly:
     docker:
-      - image: haskell:9.6.4-slim-buster
+      - image: haskell:9.8.2-slim-buster
     environment:
       - STACK_FILE: "stack.yaml"
     <<: *defaults
@@ -76,5 +76,5 @@ workflows:
   version: 2
   multiple-ghcs:
     jobs:
-      - stackage-lts21
+      - stackage-lts22
       - stackage-nightly

ghcide/ghcide.cabal

@@ -62,7 +62,7 @@ library
     , deepseq
     , dependent-map
     , dependent-sum
-    , Diff                         ^>=0.4.0
+    , Diff                         ^>=0.5
     , directory
     , dlist
     , enummapset

haskell-language-server.cabal

@@ -263,7 +263,6 @@ library hls-cabal-plugin
     , lsp-types             ^>=2.3
     , regex-tdfa            ^>=1.3.1
     , text
-    , text-rope
     , transformers
     , unordered-containers  >=0.2.10.0
     , containers
@@ -455,7 +454,7 @@ library hls-eval-plugin
     , bytestring
     , containers
     , deepseq
-    , Diff                  ^>=0.4.0
+    , Diff                  ^>=0.5
     , dlist
     , extra
     , filepath
@@ -584,7 +583,6 @@ library hls-rename-plugin
     , hls-plugin-api        == 2.8.0.0
     , haskell-language-server:hls-refactor-plugin
     , lens
-    , lsp
     , lsp-types
     , mtl
     , mod
@@ -638,7 +636,6 @@ library hls-retrie-plugin
     , base                  >=4.12    && <5
     , bytestring
     , containers
-    , directory
     , extra
     , ghc
     , ghcide                == 2.8.0.0
@@ -655,7 +652,6 @@ library hls-retrie-plugin
     , text
     , transformers
     , unordered-containers
-    , filepath
 
   default-extensions:
     DataKinds
@@ -845,7 +841,6 @@ library hls-module-name-plugin
     , aeson
     , base                  >=4.12 && <5
     , containers
-    , directory
     , filepath
     , ghcide                == 2.8.0.0
     , hls-plugin-api        == 2.8.0.0

hls-plugin-api/hls-plugin-api.cabal

@@ -60,7 +60,7 @@ library
     , data-default
     , dependent-map
     , dependent-sum         >=0.7
-    , Diff                  ^>=0.4.0
+    , Diff                  ^>=0.5
     , dlist
     , extra
     , filepath

stack-lts22.yaml

@@ -0,0 +1,58 @@
+resolver: lts-22.25 # ghc-9.6.5
+
+packages:
+  - .
+  - ./hie-compat
+  - ./hls-graph
+  - ./ghcide/
+  - ./hls-plugin-api
+  - ./hls-test-utils
+  # - ./shake-bench
+
+ghc-options:
+  "$everything": -haddock
+
+allow-newer: true
+allow-newer-deps:
+  - extensions
+
+extra-deps:
+  - Diff-0.5
+  - floskell-0.11.1
+  - hiedb-0.6.0.1
+  - hie-bios-0.14.0
+  - implicit-hie-0.1.4.0
+  - lsp-2.7.0.0
+  - lsp-test-0.17.1.0
+  - lsp-types-2.3.0.0
+  - monad-dijkstra-0.1.1.4 # 5
+  - retrie-1.2.3
+
+  # stan and friends
+  - stan-0.1.3.0
+  - dir-traverse-0.2.3.0
+  - extensions-0.1.0.1
+  - tomland-1.3.3.2
+  - trial-0.0.0.0
+  - trial-optparse-applicative-0.0.0.0
+  - trial-tomland-0.0.0.0
+  - validation-selective-0.2.0.0
+
+configure-options:
+  ghcide:
+    - --disable-library-for-ghci
+  haskell-language-server:
+    - --disable-library-for-ghci
+
+flags:
+  haskell-language-server:
+    pedantic: true
+  stylish-haskell:
+    ghc-lib: true
+  retrie:
+    BuildExecutable: false
+
+nix:
+  packages: [icu libcxx zlib]
+
+concurrent-tests: false

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-22.9 # ghc-9.6.4
+resolver: nightly-2024-06-12 # ghc-9.8.2
 
 packages:
   - .
@@ -13,41 +13,47 @@ ghc-options:
   "$everything": -haddock
 
 allow-newer: true
+allow-newer-deps:
+  - extensions
+  - hw-fingertree
+  - retrie
 
 extra-deps:
-- floskell-0.11.1
-- retrie-1.2.2
-- hiedb-0.6.0.0
-- hie-bios-0.14.0
-- implicit-hie-0.1.4.0
-- lsp-2.7.0.0
-- lsp-test-0.17.1.0
-- lsp-types-2.3.0.0
-- monad-dijkstra-0.1.1.4
-
-# stan and friends
-- stan-0.1.2.0
-- dir-traverse-0.2.3.0
-- extensions-0.1.0.1
-- tomland-1.3.3.2
-- trial-0.0.0.0
-- trial-optparse-applicative-0.0.0.0
-- trial-tomland-0.0.0.0
-- validation-selective-0.2.0.0
+  - floskell-0.11.1
+  - hiedb-0.6.0.1
+  - hie-bios-0.14.0
+  - implicit-hie-0.1.4.0
+  - hw-fingertree-0.1.2.1
+  - lsp-2.7.0.0
+  - lsp-test-0.17.1.0
+  - lsp-types-2.3.0.0
+  - monad-dijkstra-0.1.1.5
+  - stylish-haskell-0.14.6.0
+  - retrie-1.2.3
+
+  # stan dependencies not found in the stackage snapshot
+  - stan-0.1.3.0
+  - dir-traverse-0.2.3.0
+  - extensions-0.1.0.1
+  - trial-0.0.0.0
+  - trial-optparse-applicative-0.0.0.0
+  - trial-tomland-0.0.0.0
 
 configure-options:
   ghcide:
-      - --disable-library-for-ghci
+    - --disable-library-for-ghci
   haskell-language-server:
-      - --disable-library-for-ghci
+    - --disable-library-for-ghci
 
 flags:
   haskell-language-server:
     pedantic: true
+  stylish-haskell:
+    ghc-lib: true
   retrie:
     BuildExecutable: false
 
 nix:
-  packages: [ icu libcxx zlib ]
+  packages: [icu libcxx zlib]
 
 concurrent-tests: false