Skip to content

Commit 9474e78

Browse files
authored
Remove allow-newer for hiedb (#4551)
* Remove allow-newer for hiedb * Update and prune stack.yamls * Update docker images in stack CI config * Use more general image tags, use bullseye * 9.8.4 is not nightly anymore, pin patch version again
1 parent 43cf0dc commit 9474e78

File tree

6 files changed

+13
-22
lines changed

6 files changed

+13
-22
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ version: 2
6060
jobs:
6161
stackage-lts22:
6262
docker:
63-
- image: haskell:9.6.5-slim-buster
63+
- image: haskell:9.6.6-slim-bullseye
6464
environment:
6565
- STACK_FILE: "stack-lts22.yaml"
6666
<<: *defaults
6767

68-
stackage-nightly:
68+
stackage-lts23:
6969
docker:
70-
- image: haskell:9.8.2-slim-buster
70+
- image: haskell:9.8.4-slim-bullseye
7171
environment:
7272
- STACK_FILE: "stack.yaml"
7373
<<: *defaults
@@ -77,4 +77,4 @@ workflows:
7777
multiple-ghcs:
7878
jobs:
7979
- stackage-lts22
80-
- stackage-nightly
80+
- stackage-lts23

cabal.project

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ packages:
88
./hls-test-utils
99

1010

11-
index-state: 2025-03-20T00:00:00Z
11+
index-state: 2025-04-08T01:30:37Z
1212

1313
tests: True
1414
test-show-details: direct
@@ -57,8 +57,6 @@ if impl(ghc >= 9.8.4) && impl(ghc < 9.8.5)
5757
if impl(ghc >= 9.11)
5858
benchmarks: False
5959
allow-newer:
60-
hiedb:base,
61-
hiedb:ghc,
6260
hie-bios:ghc,
6361
ghc-trace-events:base,
6462
tasty-hspec:base,

ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ library
7575
, hashable
7676
, hie-bios ^>=0.14.0
7777
, hie-compat ^>=0.3.0.0
78-
, hiedb ^>= 0.6.0.0
78+
, hiedb ^>= 0.6.0.2
7979
, hls-graph == 2.10.0.0
8080
, hls-plugin-api == 2.10.0.0
8181
, implicit-hie >= 0.1.4.0 && < 0.1.5

haskell-language-server.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ library hls-call-hierarchy-plugin
407407
, containers
408408
, extra
409409
, ghcide == 2.10.0.0
410-
, hiedb ^>= 0.6.0.0
410+
, hiedb ^>= 0.6.0.2
411411
, hls-plugin-api == 2.10.0.0
412412
, lens
413413
, lsp >=2.7
@@ -594,7 +594,7 @@ library hls-rename-plugin
594594
, containers
595595
, ghcide == 2.10.0.0
596596
, hashable
597-
, hiedb ^>= 0.6.0.0
597+
, hiedb ^>= 0.6.0.2
598598
, hie-compat
599599
, hls-plugin-api == 2.10.0.0
600600
, haskell-language-server:hls-refactor-plugin
@@ -1596,7 +1596,7 @@ flag refactor
15961596
manual: True
15971597

15981598
common refactor
1599-
if flag(refactor)
1599+
if flag(refactor)
16001600
build-depends: haskell-language-server:hls-refactor-plugin
16011601
cpp-options: -Dhls_refactor
16021602

stack-lts22.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-22.25 # ghc-9.6.5
1+
resolver: lts-22.43 # ghc-9.6.6
22

33
packages:
44
- .
@@ -19,7 +19,7 @@ allow-newer-deps:
1919
extra-deps:
2020
- Diff-0.5
2121
- floskell-0.11.1
22-
- hiedb-0.6.0.1
22+
- hiedb-0.6.0.2
2323
- hie-bios-0.14.0
2424
- implicit-hie-0.1.4.0
2525
- lsp-2.7.0.0

stack.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2024-06-12 # ghc-9.8.2
1+
resolver: lts-23.18 # ghc-9.8.4
22

33
packages:
44
- .
@@ -20,15 +20,10 @@ allow-newer-deps:
2020

2121
extra-deps:
2222
- floskell-0.11.1
23-
- hiedb-0.6.0.1
24-
- hie-bios-0.14.0
23+
- hiedb-0.6.0.2
2524
- implicit-hie-0.1.4.0
2625
- hw-fingertree-0.1.2.1
27-
- lsp-2.7.0.0
28-
- lsp-test-0.17.1.0
29-
- lsp-types-2.3.0.0
3026
- monad-dijkstra-0.1.1.5
31-
- stylish-haskell-0.14.6.0
3227
- retrie-1.2.3
3328

3429
# stan dependencies not found in the stackage snapshot
@@ -38,8 +33,6 @@ extra-deps:
3833
- trial-0.0.0.0
3934
- trial-optparse-applicative-0.0.0.0
4035
- trial-tomland-0.0.0.0
41-
- cabal-add-0.1
42-
- cabal-install-parsers-0.6.1.1
4336

4437
configure-options:
4538
ghcide:

0 commit comments

Comments
 (0)