Skip to content

Use last apply-refact and several stack.yaml updates #1858

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

Merged
merged 16 commits into from
May 24, 2021
Merged

Use last apply-refact and several stack.yaml updates #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c988fb5
Remove stack for 8.10.2 and 8.8.2
jneira May 21, 2021
b668858
Update hackage index
jneira May 21, 2021
b2733cb
Update stack.yaml's
jneira May 22, 2021
6a51dfb
Use ghc-8.10.4 for default stack.yaml
jneira May 22, 2021
9202099
Update brittany
jneira May 22, 2021
41b5ce5
Bump up min apply-refact version
jneira May 22, 2021
2aafeec
Add missing apply-refact extra dep
jneira May 22, 2021
d888ad1
Bump up min apply-refact version
jneira May 23, 2021
95b3bb3
Revert "Remove stack for 8.10.2 and 8.8.2"
jneira May 23, 2021
382b6c1
Use last apply-refact
jneira May 23, 2021
3db5414
Remove commented allow-newer
jneira May 23, 2021
f61cb57
Merge branch 'master' into fix-1844
jneira May 23, 2021
8f8f166
Remove max-backjumps
jneira May 23, 2021
7da30b5
Merge branch 'fix-1844' of https://github.com/jneira/haskell-language…
jneira May 23, 2021
e2225ae
Set max-backjumps to 12000
jneira May 24, 2021
b1c4a55
Merge branch 'master' into fix-1844
jneira May 24, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
# max-backjumps is increased as a temporary solution
# for dependency resolution failure
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
run: cabal configure --enable-benchmarks --max-backjumps 10000
run: cabal configure --enable-benchmarks --max-backjumps 12000

- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
name: Build
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ package *

write-ghc-environment-files: never

index-state: 2021-03-29T21:23:14Z
index-state: 2021-05-21T05:01:41Z

allow-newer:
active:base,
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ library
hs-source-dirs: src
build-depends:
, aeson
, apply-refact >=0.9
, apply-refact >=0.9.3.0
, base >=4.12 && <5
, binary
, bytestring
Expand Down
8 changes: 4 additions & 4 deletions stack-8.10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ ghc-options:
"$everything": -haddock

extra-deps:
- apply-refact-0.9.0.0
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- 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-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- lsp-1.2.0.0
- lsp-types-1.2.0.0
- lsp-test-0.14.0.0
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- monad-dijkstra-0.1.1.2
Expand Down
6 changes: 4 additions & 2 deletions stack-8.10.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@ ghc-options:
"$everything": -haddock

extra-deps:
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- 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-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- monad-dijkstra-0.1.1.2
Expand Down
7 changes: 3 additions & 4 deletions stack-8.10.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-17.4
resolver: lts-17.12

packages:
- .
Expand Down Expand Up @@ -29,20 +29,19 @@ ghc-options:
"$everything": -haddock

extra-deps:
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- 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
- heapsize-0.3.0
- hie-bios-0.7.4
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
- monad-dijkstra-0.1.1.2
- refinery-0.3.0.0
- retrie-0.1.1.1
- shake-0.19.4
- stylish-haskell-0.12.2.0
- semigroups-0.18.5
- temporary-1.2.1.1
Expand Down
10 changes: 4 additions & 6 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ ghc-options:

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- apply-refact-0.9.3.0
- ansi-terminal-0.10.3
- base-compat-0.10.5
- brittany-0.13.1.0
- brittany-0.13.1.2
- butcher-1.3.3.1
- Cabal-3.0.2.0
- cabal-plan-0.6.2.0
Expand All @@ -45,7 +45,7 @@ extra-deps:
- fuzzy-0.1.0.0
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- ghc-lib-parser-ex-8.10.0.17
Expand All @@ -55,7 +55,7 @@ extra-deps:
- haddock-library-1.10.0
- hashable-1.3.0.0
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- hlint-3.2.3
- HsYAML-0.2.1.0@rev:1
- HsYAML-aeson-0.2.0.0@rev:2
Expand Down Expand Up @@ -115,8 +115,6 @@ configure-options:
heapsize:
- --disable-library-for-ghci

# allow-newer: true

nix:
packages: [icu libcxx zlib]

Expand Down
10 changes: 4 additions & 6 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ ghc-options:

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- apply-refact-0.9.3.0
- ansi-terminal-0.10.3
- base-compat-0.10.5
- brittany-0.13.1.0
- brittany-0.13.1.2
- butcher-1.3.3.1
- Cabal-3.0.2.0
- cabal-plan-0.6.2.0
Expand All @@ -44,7 +44,7 @@ extra-deps:
- fuzzy-0.1.0.0
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- ghc-lib-parser-ex-8.10.0.17
Expand All @@ -54,7 +54,7 @@ extra-deps:
- haddock-library-1.10.0
- hashable-1.3.0.0
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- hlint-3.2.3
- HsYAML-0.2.1.0@rev:1
- HsYAML-aeson-0.2.0.0@rev:2
Expand Down Expand Up @@ -114,8 +114,6 @@ flags:
retrie:
BuildExecutable: false

# allow-newer: true

nix:
packages: [icu libcxx zlib]

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 @@ -30,8 +30,8 @@ ghc-options:

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- butcher-1.3.3.2
- bytestring-trie-0.2.5.0
- clock-0.7.2
Expand All @@ -40,7 +40,7 @@ extra-deps:
- fourmolu-0.3.0.0
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- ghc-lib-parser-ex-8.10.0.17
Expand Down Expand Up @@ -100,8 +100,6 @@ flags:
retrie:
BuildExecutable: false

# allow-newer: true

nix:
packages: [icu libcxx zlib]

Expand Down
10 changes: 4 additions & 6 deletions stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ ghc-options:

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- bytestring-trie-0.2.5.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- ghc-trace-events-0.1.2.1
- haskell-src-exts-1.21.1
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- hlint-3.2.3
- HsYAML-aeson-0.2.0.0@rev:2
- hoogle-5.0.17.11
Expand Down Expand Up @@ -93,8 +93,6 @@ flags:
retrie:
BuildExecutable: false

# allow-newer: true

nix:
packages: [icu libcxx zlib]

Expand Down
10 changes: 4 additions & 6 deletions stack-8.8.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ ghc-options:

extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- brittany-0.13.1.0
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- bytestring-trie-0.2.5.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-exactprint-0.6.3.4
- ghc-exactprint-0.6.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- ghc-trace-events-0.1.2.1
- haskell-src-exts-1.21.1
- heapsize-0.3.0
- hie-bios-0.7.4
- hie-bios-0.7.5
- hlint-3.2.3
- HsYAML-aeson-0.2.0.0@rev:2
- hoogle-5.0.17.11
Expand Down Expand Up @@ -90,8 +90,6 @@ flags:
retrie:
BuildExecutable: false

# allow-newer: true

nix:
packages: [icu libcxx zlib]

Expand Down
68 changes: 11 additions & 57 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
resolver: lts-14.27 # Last 8.6.5
resolver: lts-17.12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love this update :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, 8.10.4 windows version seems to be reliable enough to make it the default


packages:
- .
- ./hie-compat
- ./hls-graph
- ./ghcide
- ./ghcide/
- ./hls-plugin-api
- ./hls-test-utils
# - ./shake-bench
Expand All @@ -28,69 +28,26 @@ packages:
ghc-options:
"$everything": -haddock



extra-deps:
- aeson-1.5.2.0
- apply-refact-0.9.0.0
- ansi-terminal-0.10.3
- base-compat-0.10.5
- brittany-0.13.1.0
- butcher-1.3.3.1
- apply-refact-0.9.3.0
- brittany-0.13.1.2
- Cabal-3.0.2.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- Diff-0.4.0
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- fuzzy-0.1.0.0
- ghc-check-0.5.0.1
- ghc-events-0.13.0
- ghc-exactprint-0.6.3.4
- ghc-lib-8.10.4.20210206
- ghc-lib-parser-8.10.4.20210206
- 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.10.0
- hashable-1.3.0.0
- ghc-exactprint-0.6.4
- heapsize-0.3.0
- hie-bios-0.7.4
- 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
- megaparsec-9.0.1
- 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
- shake-0.19.4
- stylish-haskell-0.12.2.0
- tasty-rerun-1.1.17
- semigroups-0.18.5
- temporary-1.2.1.1
- these-1.1.1.1
- type-equality-1
- topograph-1
- uniplate-1.6.13
- th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
- hiedb-0.3.0.1
- extra-1.7.9@sha256:f1dec740f0f2025790c540732bfd52c556ec55bde4f5dfd7cf18e22bd44ff3d0,2683
- lsp-1.2.0.0
- lsp-types-1.2.0.0
- lsp-test-0.14.0.0
Expand All @@ -100,25 +57,22 @@ extra-deps:
- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- resourcet-1.2.3

configure-options:
ghcide:
- --disable-library-for-ghci
- --disable-library-for-ghci
haskell-language-server:
- --disable-library-for-ghci
- --disable-library-for-ghci
heapsize:
- --disable-library-for-ghci
- --disable-library-for-ghci

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

# allow-newer: true

nix:
packages: [icu libcxx zlib]
packages: [ icu libcxx zlib ]

concurrent-tests: false