Skip to content

Commit da72a27

Browse files
authored
Use last apply-refact and several stack.yaml updates (haskell#1858)
* Update hackage index * Update stack.yaml's * Use ghc-8.10.4 for default stack.yaml * Update brittany * Bump up min apply-refact version * Set max-backjumps to 12000
1 parent 6606a06 commit da72a27

File tree

12 files changed

+44
-99
lines changed

12 files changed

+44
-99
lines changed

.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# max-backjumps is increased as a temporary solution
5959
# for dependency resolution failure
6060
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
61-
run: cabal configure --enable-benchmarks --max-backjumps 10000
61+
run: cabal configure --enable-benchmarks --max-backjumps 12000
6262

6363
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
6464
name: Build

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package *
3030

3131
write-ghc-environment-files: never
3232

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

3535
allow-newer:
3636
active:base,

plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ library
2929
hs-source-dirs: src
3030
build-depends:
3131
, aeson
32-
, apply-refact >=0.9
32+
, apply-refact >=0.9.3.0
3333
, base >=4.12 && <5
3434
, binary
3535
, bytestring

stack-8.10.2.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ ghc-options:
2929
"$everything": -haddock
3030

3131
extra-deps:
32-
- apply-refact-0.9.0.0
33-
- brittany-0.13.1.0
32+
- apply-refact-0.9.3.0
33+
- brittany-0.13.1.2
3434
- Cabal-3.0.2.0
3535
- clock-0.7.2
3636
- data-tree-print-0.1.0.2@rev:2
3737
- floskell-0.10.4
3838
- fourmolu-0.3.0.0
39-
- ghc-exactprint-0.6.3.4
39+
- ghc-exactprint-0.6.4
4040
- ghc-lib-8.10.4.20210206
4141
- ghc-lib-parser-8.10.4.20210206
4242
- lsp-1.2.0.0
4343
- lsp-types-1.2.0.0
4444
- lsp-test-0.14.0.0
4545
- heapsize-0.3.0
46-
- hie-bios-0.7.4
46+
- hie-bios-0.7.5
4747
- implicit-hie-cradle-0.3.0.2
4848
- implicit-hie-0.1.2.5
4949
- monad-dijkstra-0.1.1.2

stack-8.10.3.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,18 @@ ghc-options:
2929
"$everything": -haddock
3030

3131
extra-deps:
32-
- brittany-0.13.1.0
32+
- apply-refact-0.9.3.0
33+
- brittany-0.13.1.2
3334
- Cabal-3.0.2.0
3435
- clock-0.7.2
3536
- data-tree-print-0.1.0.2@rev:2
3637
- floskell-0.10.4
3738
- fourmolu-0.3.0.0
39+
- ghc-exactprint-0.6.4
3840
- ghc-lib-8.10.4.20210206
3941
- ghc-lib-parser-8.10.4.20210206
4042
- heapsize-0.3.0
41-
- hie-bios-0.7.4
43+
- hie-bios-0.7.5
4244
- implicit-hie-cradle-0.3.0.2
4345
- implicit-hie-0.1.2.5
4446
- monad-dijkstra-0.1.1.2

stack-8.10.4.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-17.4
1+
resolver: lts-17.12
22

33
packages:
44
- .
@@ -29,20 +29,19 @@ ghc-options:
2929
"$everything": -haddock
3030

3131
extra-deps:
32-
- brittany-0.13.1.0
32+
- apply-refact-0.9.3.0
33+
- brittany-0.13.1.2
3334
- Cabal-3.0.2.0
3435
- clock-0.7.2
3536
- data-tree-print-0.1.0.2@rev:2
3637
- floskell-0.10.4
3738
- fourmolu-0.3.0.0
3839
- heapsize-0.3.0
39-
- hie-bios-0.7.4
4040
- implicit-hie-cradle-0.3.0.2
4141
- implicit-hie-0.1.2.5
4242
- monad-dijkstra-0.1.1.2
4343
- refinery-0.3.0.0
4444
- retrie-0.1.1.1
45-
- shake-0.19.4
4645
- stylish-haskell-0.12.2.0
4746
- semigroups-0.18.5
4847
- temporary-1.2.1.1

stack-8.6.4.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ ghc-options:
3131

3232
extra-deps:
3333
- aeson-1.5.2.0
34-
- apply-refact-0.9.0.0
34+
- apply-refact-0.9.3.0
3535
- ansi-terminal-0.10.3
3636
- base-compat-0.10.5
37-
- brittany-0.13.1.0
37+
- brittany-0.13.1.2
3838
- butcher-1.3.3.1
3939
- Cabal-3.0.2.0
4040
- cabal-plan-0.6.2.0
@@ -45,7 +45,7 @@ extra-deps:
4545
- fuzzy-0.1.0.0
4646
- ghc-check-0.5.0.1
4747
- ghc-events-0.13.0
48-
- ghc-exactprint-0.6.3.4
48+
- ghc-exactprint-0.6.4
4949
- ghc-lib-8.10.4.20210206
5050
- ghc-lib-parser-8.10.4.20210206
5151
- ghc-lib-parser-ex-8.10.0.17
@@ -55,7 +55,7 @@ extra-deps:
5555
- haddock-library-1.10.0
5656
- hashable-1.3.0.0
5757
- heapsize-0.3.0
58-
- hie-bios-0.7.4
58+
- hie-bios-0.7.5
5959
- hlint-3.2.3
6060
- HsYAML-0.2.1.0@rev:1
6161
- HsYAML-aeson-0.2.0.0@rev:2
@@ -115,8 +115,6 @@ configure-options:
115115
heapsize:
116116
- --disable-library-for-ghci
117117

118-
# allow-newer: true
119-
120118
nix:
121119
packages: [icu libcxx zlib]
122120

stack-8.6.5.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ ghc-options:
3030

3131
extra-deps:
3232
- aeson-1.5.2.0
33-
- apply-refact-0.9.0.0
33+
- apply-refact-0.9.3.0
3434
- ansi-terminal-0.10.3
3535
- base-compat-0.10.5
36-
- brittany-0.13.1.0
36+
- brittany-0.13.1.2
3737
- butcher-1.3.3.1
3838
- Cabal-3.0.2.0
3939
- cabal-plan-0.6.2.0
@@ -44,7 +44,7 @@ extra-deps:
4444
- fuzzy-0.1.0.0
4545
- ghc-check-0.5.0.1
4646
- ghc-events-0.13.0
47-
- ghc-exactprint-0.6.3.4
47+
- ghc-exactprint-0.6.4
4848
- ghc-lib-8.10.4.20210206
4949
- ghc-lib-parser-8.10.4.20210206
5050
- ghc-lib-parser-ex-8.10.0.17
@@ -54,7 +54,7 @@ extra-deps:
5454
- haddock-library-1.10.0
5555
- hashable-1.3.0.0
5656
- heapsize-0.3.0
57-
- hie-bios-0.7.4
57+
- hie-bios-0.7.5
5858
- hlint-3.2.3
5959
- HsYAML-0.2.1.0@rev:1
6060
- HsYAML-aeson-0.2.0.0@rev:2
@@ -114,8 +114,6 @@ flags:
114114
retrie:
115115
BuildExecutable: false
116116

117-
# allow-newer: true
118-
119117
nix:
120118
packages: [icu libcxx zlib]
121119

stack-8.8.2.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ghc-options:
3030

3131
extra-deps:
3232
- aeson-1.5.2.0
33-
- apply-refact-0.9.0.0
34-
- brittany-0.13.1.0
33+
- apply-refact-0.9.3.0
34+
- brittany-0.13.1.2
3535
- butcher-1.3.3.2
3636
- bytestring-trie-0.2.5.0
3737
- clock-0.7.2
@@ -40,7 +40,7 @@ extra-deps:
4040
- fourmolu-0.3.0.0
4141
- ghc-check-0.5.0.1
4242
- ghc-events-0.13.0
43-
- ghc-exactprint-0.6.3.4
43+
- ghc-exactprint-0.6.4
4444
- ghc-lib-8.10.4.20210206
4545
- ghc-lib-parser-8.10.4.20210206
4646
- ghc-lib-parser-ex-8.10.0.17
@@ -100,8 +100,6 @@ flags:
100100
retrie:
101101
BuildExecutable: false
102102

103-
# allow-newer: true
104-
105103
nix:
106104
packages: [icu libcxx zlib]
107105

stack-8.8.3.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ ghc-options:
3030

3131
extra-deps:
3232
- aeson-1.5.2.0
33-
- apply-refact-0.9.0.0
34-
- brittany-0.13.1.0
33+
- apply-refact-0.9.3.0
34+
- brittany-0.13.1.2
3535
- bytestring-trie-0.2.5.0
3636
- cabal-plan-0.6.2.0
3737
- clock-0.7.2
3838
- constrained-dynamic-0.1.0.0
3939
- floskell-0.10.4
4040
- fourmolu-0.3.0.0
41-
- ghc-exactprint-0.6.3.4
41+
- ghc-exactprint-0.6.4
4242
- ghc-lib-8.10.4.20210206
4343
- ghc-lib-parser-8.10.4.20210206
4444
- ghc-trace-events-0.1.2.1
4545
- haskell-src-exts-1.21.1
4646
- heapsize-0.3.0
47-
- hie-bios-0.7.4
47+
- hie-bios-0.7.5
4848
- hlint-3.2.3
4949
- HsYAML-aeson-0.2.0.0@rev:2
5050
- hoogle-5.0.17.11
@@ -93,8 +93,6 @@ flags:
9393
retrie:
9494
BuildExecutable: false
9595

96-
# allow-newer: true
97-
9896
nix:
9997
packages: [icu libcxx zlib]
10098

0 commit comments

Comments
 (0)