Skip to content

Support for ghc-8.10.3 #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Support for ghc-8.10.3 #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
012d7d9
Add stack-8.10.3.yaml
jneira Dec 23, 2020
adb8dba
Add ghc-8.10.3 and enable default stack.yaml
jneira Dec 23, 2020
731b188
Add ghc-8.10.3 to gihub actions
jneira Dec 23, 2020
48c880b
Use ghc-lib-8.10.3
jneira Dec 25, 2020
9e54a90
docker image for 8.10.3 not prepared
jneira Dec 25, 2020
2351f01
Sync default stack.yaml
jneira Dec 26, 2020
1809837
Add comment about docker image
jneira Dec 27, 2020
d99cb85
Add class plugin to stack-8.10.3.yaml
jneira Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,22 @@ jobs:
- STACK_FILE: "stack-8.10.2.yaml"
<<: *defaults

ghc-nightly:
ghc-8.10.3:
environment:
- STACK_FILE: "stack-8.10.3.yaml"
<<: *defaults

ghc-default:
environment:
- STACK_FILE: "stack.yaml"
<<: *defaults

cabal:
working_directory: ~/build
docker:
- image: haskell:8.10.1
# We have to wait to a docker image with ghc-8.10.3
# See https://github.com/haskell/docker-haskell/issues/31
- image: haskell:8.10.2
steps:
- checkout
- run:
Expand Down Expand Up @@ -191,5 +198,6 @@ workflows:
- ghc-8.8.4
- ghc-8.10.1
- ghc-8.10.2
# - ghc-nightly
- ghc-8.10.3
- ghc-default
- cabal
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
os: [ubuntu-latest, macOS-latest, windows-latest]
exclude:
- os: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
os: [ubuntu-latest, macOS-latest, windows-latest]
exclude:
- os: windows-latest
Expand Down
4 changes: 2 additions & 2 deletions stack-8.10.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ extra-deps:
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- heapsize-0.3.0
- hie-bios-0.7.1
- hlint-3.2.3
Expand Down
2 changes: 2 additions & 0 deletions stack-8.10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ extra-deps:
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- heapsize-0.3.0
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
Expand Down
47 changes: 47 additions & 0 deletions stack-8.10.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
resolver: nightly-2020-12-09
compiler: ghc-8.10.3

packages:
- .
- ./ghcide/hie-compat
- ./ghcide/
- ./hls-plugin-api
- ./plugins/hls-class-plugin
- ./plugins/tactics
- ./plugins/hls-hlint-plugin
- ./plugins/hls-explicit-imports-plugin
- ./plugins/hls-retrie-plugin

ghc-options:
"$everything": -haddock

extra-deps:
- brittany-0.13.1.0
- Cabal-3.0.2.0
- clock-0.7.2
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- heapsize-0.3.0
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- lsp-test-0.11.0.6
- monad-dijkstra-0.1.1.2
- refinery-0.3.0.0
- retrie-0.1.1.1
- stylish-haskell-0.12.2.0
- semigroups-0.18.5
- temporary-1.2.1.1

flags:
haskell-language-server:
pedantic: true
retrie:
BuildExecutable: false

nix:
packages: [ icu libcxx zlib ]

concurrent-tests: false
8 changes: 3 additions & 5 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ extra-deps:
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-parser-ex-8.10.0.16
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-lib-parser-ex-8.10.0.17
- ghc-source-gen-0.4.0.0
- ghc-trace-events-0.1.2.1
- haddock-api-2.22.0@rev:1
Expand Down Expand Up @@ -68,8 +68,6 @@ extra-deps:
- regex-tdfa-1.3.1.0
- retrie-0.1.1.1
- semialign-1.1
# - github: wz1000/shake
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- stylish-haskell-0.12.2.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
Expand Down
8 changes: 3 additions & 5 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ extra-deps:
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-parser-ex-8.10.0.16
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-lib-parser-ex-8.10.0.17
- ghc-source-gen-0.4.0.0
- ghc-trace-events-0.1.2.1
- haddock-api-2.22.0@rev:1
Expand Down Expand Up @@ -67,8 +67,6 @@ extra-deps:
- regex-tdfa-1.3.1.0
- retrie-0.1.1.1
- semialign-1.1
# - github: wz1000/shake
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- stylish-haskell-0.12.2.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
Expand Down
8 changes: 3 additions & 5 deletions stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ extra-deps:
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-parser-ex-8.10.0.16
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-lib-parser-ex-8.10.0.17
- ghc-trace-events-0.1.2.1
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
Expand All @@ -55,8 +55,6 @@ extra-deps:
- refinery-0.3.0.0
- retrie-0.1.1.1
- semigroups-0.18.5
# - github: wz1000/shake
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- stylish-haskell-0.12.2.0
- temporary-1.2.1.1
- these-1.1.1.1
Expand Down
4 changes: 2 additions & 2 deletions stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ extra-deps:
- fourmolu-0.3.0.0
# - ghcide-0.6.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-trace-events-0.1.2.1
- haskell-src-exts-1.21.1
- heapsize-0.3.0
Expand Down
2 changes: 2 additions & 0 deletions stack-8.8.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ extra-deps:
- fourmolu-0.3.0.0
# - ghcide-0.6.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-trace-events-0.1.2.1
- haskell-src-exts-1.21.1
- heapsize-0.3.0
Expand Down
139 changes: 70 additions & 69 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,81 @@
resolver: lts-14.27 # Last 8.6.5

packages:
- .
- ./ghcide/hie-compat
- ./ghcide/
- ./hls-plugin-api
- ./plugins/hls-class-plugin
- ./plugins/hls-explicit-imports-plugin
- ./plugins/hls-hlint-plugin
- ./plugins/hls-retrie-plugin
- ./plugins/tactics
- .
- ./ghcide/hie-compat
- ./ghcide/
- ./hls-plugin-api
- ./plugins/hls-class-plugin
- ./plugins/tactics
- ./plugins/hls-hlint-plugin
- ./plugins/hls-explicit-imports-plugin
- ./plugins/hls-retrie-plugin

ghc-options:
"$everything": -haddock

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.8.2.1
- ansi-terminal-0.10.3
- base-compat-0.10.5
- brittany-0.13.1.0
- butcher-1.3.3.1
- Cabal-3.0.2.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- Diff-0.4.0
- extra-1.7.3
- floskell-0.10.4
- fourmolu-0.3.0.0
- fuzzy-0.1.0.0
# - ghcide-0.6.0
- ghc-check-0.5.0.1
- ghc-exactprint-0.6.3.2
- ghc-events-0.13.0
- ghc-lib-8.10.2.20200916
- ghc-lib-parser-8.10.2.20200916
- ghc-lib-parser-ex-8.10.0.16
- ghc-source-gen-0.4.0.0
- ghc-trace-events-0.1.2.1
- haddock-api-2.22.0@rev:1
- haddock-library-1.8.0
- hashable-1.3.0.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- heapsize-0.3.0
- hie-bios-0.7.1
- hlint-3.2
- HsYAML-0.2.1.0@rev:1
- HsYAML-aeson-0.2.0.0@rev:2
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.11.0.6
- monad-dijkstra-0.1.1.2
- opentelemetry-0.6.1
- opentelemetry-extra-0.6.1
- optics-core-0.2
- optparse-applicative-0.15.1.0
- ormolu-0.1.4.1
- parser-combinators-1.2.1
- primitive-0.7.1.0
- refinery-0.3.0.0
- regex-base-0.94.0.0
- regex-pcre-builtin-0.95.1.1.8.43
- regex-tdfa-1.3.1.0
- retrie-0.1.1.1
- semialign-1.1
# - github: wz1000/shake
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- stylish-haskell-0.12.2.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- these-1.1.1.1
- type-equality-1
- topograph-1
- aeson-1.5.2.0
- apply-refact-0.8.2.1
- ansi-terminal-0.10.3
- base-compat-0.10.5
- brittany-0.13.1.0
- butcher-1.3.3.1
- Cabal-3.0.2.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- Diff-0.4.0
- extra-1.7.3
- floskell-0.10.4
- fourmolu-0.3.0.0
- fuzzy-0.1.0.0
# - ghcide-0.1.0
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.2
- ghc-lib-8.10.3.20201220
- ghc-lib-parser-8.10.3.20201220
- ghc-lib-parser-ex-8.10.0.17
- ghc-source-gen-0.4.0.0
- ghc-trace-events-0.1.2.1
- haddock-api-2.22.0@rev:1
- haddock-library-1.8.0
- hashable-1.3.0.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- heapsize-0.3.0
- hie-bios-0.7.1
- hlint-3.2.3
- HsYAML-0.2.1.0@rev:1
- HsYAML-aeson-0.2.0.0@rev:2
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.11.0.6
- monad-dijkstra-0.1.1.2
- opentelemetry-0.6.1
- opentelemetry-extra-0.6.1
- optics-core-0.2
- optparse-applicative-0.15.1.0
- ormolu-0.1.4.1
- parser-combinators-1.2.1
- primitive-0.7.1.0
- refinery-0.3.0.0
- regex-base-0.94.0.0
- regex-pcre-builtin-0.95.1.1.8.43
- regex-tdfa-1.3.1.0
- retrie-0.1.1.1
- semialign-1.1
- stylish-haskell-0.12.2.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- these-1.1.1.1
- type-equality-1
- topograph-1
- with-utf8-1.0.2.1@sha256:95c02fffa643ddbeb092359802a512007c3e644cd509809f4716ad54592c437b,3057
- th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370


flags:
haskell-language-server:
Expand Down