Skip to content

Commit acdb82e

Browse files
simonmichaeljneiraAnton-Latukha
authored
small stack yaml updates to ease maintenance (#2501)
* install: sync stack.yaml with parent project for less rebuilding * stack: update, sync, comment the ghc 8.10 yamls Co-authored-by: Javier Neira <[email protected]> Co-authored-by: Anton Latukha <[email protected]>
1 parent c0d8a3b commit acdb82e

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

install/stack.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
resolver: lts-14.27 # Last 8.6.5
1+
# keep synced with ../stack.yaml to minimise rebuilding
2+
resolver: lts-18.18
23

34
packages:
45
- .
56

6-
extra-deps:
7-
- cabal-install-parsers-0.3.0.1
8-
- Cabal-3.2.0.0
9-
- binary-instances-1.0.0.1
10-
- lukko-0.1.1.2
7+
# extra-deps:
8+
# - cabal-install-parsers-0.3.0.1
9+
# - Cabal-3.2.0.0
10+
# - binary-instances-1.0.0.1
11+
# - lukko-0.1.1.2
1112

1213
flags:
1314
hls-install:

stack-8.10.6.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Build plan for GHC 8.10.6.
2+
# Like stack-8.10.7.yaml but with an older resolver.
3+
14
resolver: lts-18.8
25

36
packages:

stack-8.10.7.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
resolver: lts-18.16
1+
# Build plan for GHC 8.10.7.
2+
# stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical.
3+
# https://github.com/haskell/haskell-language-server/issues/2491
4+
5+
resolver: lts-18.18
26

37
packages:
48
- .

stack.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
resolver: lts-18.10
1+
# Build plan for GHC 8.10.7.
2+
# stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical.
3+
# https://github.com/haskell/haskell-language-server/issues/2491
4+
5+
resolver: lts-18.18
26

37
packages:
48
- .
@@ -17,8 +21,8 @@ packages:
1721
- ./plugins/hls-hlint-plugin
1822
- ./plugins/hls-retrie-plugin
1923
- ./plugins/hls-splice-plugin
20-
- ./plugins/hls-qualify-imported-names-plugin
2124
- ./plugins/hls-tactics-plugin
25+
- ./plugins/hls-qualify-imported-names-plugin
2226
- ./plugins/hls-brittany-plugin
2327
- ./plugins/hls-stylish-haskell-plugin
2428
- ./plugins/hls-floskell-plugin
@@ -52,8 +56,6 @@ extra-deps:
5256
- stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244
5357
- stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972
5458

55-
56-
5759
# Enable these when supported by all formatters
5860
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
5961
# - ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80

0 commit comments

Comments
 (0)