Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 79cb340

Browse files
jneirajneira
authored
Merge pull request #1622 from alanz/bump-resolvers
Bump resolvers, hlint, brittany
2 parents 4bec07d + b699b9a commit 79cb340

File tree

11 files changed

+99
-75
lines changed

11 files changed

+99
-75
lines changed

‎.azure/windows-stack.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ jobs:
55
vmImage: windows-2019
66
strategy:
77
matrix:
8-
stack-def:
9-
YAML_FILE: stack.yaml
8+
# default stack.yaml uses ghc-8.8.2 so we can't use it for windows
9+
# TODO: Enable it when it uses ghc-8.8.3
10+
# stack-def:
11+
# YAML_FILE: stack.yaml
1012
# ghc versions 8.8.1 and 8.8.2 are not usable in windows
1113
# due to https://gitlab.haskell.org/ghc/ghc/issues/17575
1214
stack-8.6.5:

‎cabal.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ constraints:
1515

1616
write-ghc-environment-files: never
1717

18-
index-state: 2020-02-01T17:43:11Z
18+
index-state: 2020-02-02T17:43:42Z

‎install/src/HieInstall.hs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ defaultMain = do
8888
phony "hie" (need ["data", "latest"])
8989

9090
-- stack specific targets
91-
when isRunFromStack $ do
91+
-- Default `stack.yaml` uses ghc-8.8.2 and we can't build hie in windows
92+
-- TODO: Enable for windows when it uses ghc-8.8.3
93+
when (isRunFromStack && not isWindowsSystem) $ do
9294

9395
phony "dev" $ stackInstallHieWithErrMsg Nothing
9496

‎stack-8.4.2.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extra-deps:
1111
- base-compat-0.9.3
1212
- base-orphans-0.8.2
1313
- bifunctors-5.5.6
14-
- brittany-0.12.1.0
14+
- brittany-0.12.1.1
1515
- bytestring-trie-0.2.5.0
1616
- cabal-helper-1.0.0.0
1717
- cabal-plan-0.5.0.0
@@ -23,16 +23,16 @@ extra-deps:
2323
- floskell-0.10.2
2424
- generic-deriving-1.13.1
2525
- ghc-exactprint-0.6.2 # for HaRe
26-
- ghc-lib-parser-8.8.1
27-
- ghc-lib-parser-ex-8.8.2
26+
- ghc-lib-parser-8.8.2
27+
- ghc-lib-parser-ex-8.8.4.0
2828
- haddock-api-2.20.0
2929
- haddock-library-1.6.0
3030
- haskell-lsp-0.19.0.0
3131
- haskell-lsp-types-0.19.0.0
3232
- haskell-src-exts-1.21.1
3333
- haskell-src-exts-util-0.2.5
3434
- hie-bios-0.4.0
35-
- hlint-2.2.8
35+
- hlint-2.2.10
3636
- hoogle-5.0.17.11
3737
- hsimport-0.11.0
3838
- hslogger-1.3.1.0
@@ -51,21 +51,20 @@ extra-deps:
5151
- simple-sendfile-0.2.30 # for network and network-bsd
5252
- socks-0.6.1 # for network and network-bsd
5353
- syz-0.2.0.0
54-
- temporary-1.2.1.1
5554
- type-equality-1
5655
- unix-compat-0.5.2
5756
- unordered-containers-0.2.10.0
5857
- yaml-0.11.2.0
5958
- th-abstraction-0.3.1.0
59+
- windns-0.1.0.0
60+
- yi-rope-0.11
6061
# To make build work in windows 7
62+
- unix-time-0.4.7
63+
- temporary-1.2.1.1
6164
- time-compat-1.9.2.2
6265
- time-manager-0.0.0 # for http2
63-
- unix-time-0.4.7
6466
- wai-3.2.2.1 # for network and network-bsd
6567
- warp-3.2.28 # for network and network-bsd
66-
- windns-0.1.0.0
67-
- yi-rope-0.11
68-
6968

7069
flags:
7170
haskell-ide-engine:

‎stack-8.4.3.yaml‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,75 @@ packages:
66
extra-deps:
77
# - ./submodules/HaRe
88

9+
- QuickCheck-2.13.2
910
- aeson-1.4.6.0
1011
- aeson-pretty-0.8.8
11-
- base-compat-0.9.3
12+
- ansi-terminal-0.10.2
13+
- ansi-wl-pprint-0.6.9
14+
- assoc-1.0.1
15+
- async-2.2.2
16+
- base-compat-0.11.1
1217
- base-orphans-0.8.2
13-
- bifunctors-5.5.6
14-
- brittany-0.12.1.0
18+
- bifunctors-5.5.7
19+
- brittany-0.12.1.1
1520
- bytestring-trie-0.2.5.0
1621
- cabal-helper-1.0.0.0
17-
- cabal-plan-0.5.0.0
22+
- cabal-plan-0.6.2.0
1823
- connection-0.3.1 # for network and network-bsd
1924
- constrained-dynamic-0.1.0.0
25+
- dec-0.0.3
2026
- extra-1.6.18
21-
- file-embed-0.0.11
27+
- file-embed-0.0.11.1
2228
- filepattern-0.1.1
2329
- floskell-0.10.2
2430
- generic-deriving-1.13.1
2531
- ghc-exactprint-0.6.2 # for HaRe
26-
- ghc-lib-parser-8.8.1
27-
- ghc-lib-parser-ex-8.8.2
32+
- ghc-lib-parser-8.8.2
33+
- ghc-lib-parser-ex-8.8.4.0
2834
- haddock-api-2.20.0
2935
- haddock-library-1.6.0
3036
- haskell-lsp-0.19.0.0
3137
- haskell-lsp-types-0.19.0.0
3238
- haskell-src-exts-1.21.1
3339
- haskell-src-exts-util-0.2.5
3440
- hie-bios-0.4.0
35-
- hlint-2.2.8
41+
- hlint-2.2.10
3642
- hoogle-5.0.17.11
3743
- hsimport-0.11.0
3844
- hslogger-1.3.1.0
45+
- hspec-2.7.1
46+
- hspec-core-2.7.1
47+
- hspec-discover-2.7.1
48+
- indexed-profunctors-0.1
3949
- invariant-0.5.3
4050
- lens-4.18.1
41-
- libyaml-0.1.1.0
51+
- libyaml-0.1.1.1
4252
- lsp-test-0.10.0.0
43-
- microlens-th-0.4.3.2
53+
- microlens-th-0.4.3.4
4454
- monad-dijkstra-0.1.1.2
4555
- network-3.1.1.1 # for hslogger
4656
- network-bsd-2.8.1.0 # for hslogger
57+
- optics-core-0.2
58+
- optparse-applicative-0.15.1.0
4759
- parser-combinators-1.2.1
4860
- profunctors-5.5.1
49-
- pretty-show-1.8.2
61+
- quickcheck-instances-0.3.22
5062
- rope-utf16-splay-0.3.1.0
63+
- semialign-1.1
64+
- semigroupoids-5.3.4
5165
- simple-sendfile-0.2.30 # for network and network-bsd
66+
- singleton-bool-0.1.5
5267
- socks-0.6.1 # for network and network-bsd
53-
- syz-0.2.0.0
68+
- splitmix-0.0.3
69+
- tagged-0.8.6
70+
- th-abstraction-0.3.1.0
71+
- these-1.0.1
72+
- topograph-1
73+
- type-equality-1
5474
- unix-compat-0.5.2
5575
- unordered-containers-0.2.10.0
76+
- vector-0.12.1.2
5677
- yaml-0.11.2.0
57-
- th-abstraction-0.3.1.0
58-
- type-equality-1
5978
# To make build work in windows 7
6079
- unix-time-0.4.7
6180
- temporary-1.2.1.1
@@ -64,6 +83,7 @@ extra-deps:
6483
- warp-3.2.28 # for network and network-bsd
6584
- wai-3.2.2.1 # for network and network-bsd
6685

86+
6787
flags:
6888
haskell-ide-engine:
6989
pedantic: true

‎stack-8.4.4.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extra-deps:
1010
- aeson-pretty-0.8.8
1111
- base-orphans-0.8.2
1212
- bifunctors-5.5.6
13-
- brittany-0.12.1.0
13+
- brittany-0.12.1.1
1414
- bytestring-trie-0.2.5.0
1515
- cabal-helper-1.0.0.0
1616
- cabal-plan-0.5.0.0
@@ -22,16 +22,16 @@ extra-deps:
2222
- floskell-0.10.2
2323
- generic-deriving-1.13.1
2424
- ghc-exactprint-0.6.2 # for HaRe
25-
- ghc-lib-parser-8.8.1
26-
- ghc-lib-parser-ex-8.8.2
25+
- ghc-lib-parser-8.8.2
26+
- ghc-lib-parser-ex-8.8.4.0
2727
- haddock-api-2.20.0
2828
- haddock-library-1.6.0
2929
- haskell-lsp-0.19.0.0
3030
- haskell-lsp-types-0.19.0.0
3131
- haskell-src-exts-1.21.1
3232
- haskell-src-exts-util-0.2.5
3333
- hie-bios-0.4.0
34-
- hlint-2.2.8
34+
- hlint-2.2.10
3535
- hoogle-5.0.17.11
3636
- hsimport-0.11.0
3737
- hslogger-1.3.1.0

‎stack-8.6.4.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extra-deps:
88

99
- aeson-1.4.6.0
1010
- aeson-pretty-0.8.8
11-
- brittany-0.12.1.0
11+
- brittany-0.12.1.1
1212
- butcher-1.3.2.1
1313
- bytestring-trie-0.2.5.0
1414
- cabal-helper-1.0.0.0
@@ -17,14 +17,14 @@ extra-deps:
1717
- extra-1.6.18
1818
- floskell-0.10.2
1919
- ghc-exactprint-0.6.2 # for HaRe
20-
- ghc-lib-parser-8.8.1
21-
- ghc-lib-parser-ex-8.8.2
20+
- ghc-lib-parser-8.8.2
21+
- ghc-lib-parser-ex-8.8.4.0
2222
- haddock-api-2.22.0
2323
- haskell-lsp-0.19.0.0
2424
- haskell-lsp-types-0.19.0.0
2525
- haskell-src-exts-1.21.1
2626
- hie-bios-0.4.0
27-
- hlint-2.2.8
27+
- hlint-2.2.10
2828
- hoogle-5.0.17.11
2929
- hsimport-0.11.0
3030
- lsp-test-0.10.0.0

‎stack-8.6.5.yaml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.20
1+
resolver: lts-14.22
22
packages:
33
- .
44
- hie-plugin-api
@@ -8,32 +8,36 @@ extra-deps:
88

99
- aeson-1.4.6.0
1010
- aeson-pretty-0.8.8
11-
- ansi-terminal-0.8.2
12-
- ansi-wl-pprint-0.6.8.2
13-
- brittany-0.12.1.0
11+
- ansi-terminal-0.10.2
12+
- ansi-wl-pprint-0.6.9
13+
- base-compat-0.11.1
14+
- brittany-0.12.1.1
1415
- bytestring-trie-0.2.5.0
1516
- cabal-helper-1.0.0.0
16-
- cabal-plan-0.5.0.0
17+
- cabal-plan-0.6.2.0
1718
- clock-0.7.2
1819
- constrained-dynamic-0.1.0.0
1920
- floskell-0.10.2
2021
- ghc-exactprint-0.6.2 # for HaRe
21-
- ghc-lib-parser-8.8.1
22-
- ghc-lib-parser-ex-8.8.2
22+
- ghc-lib-parser-8.8.2
23+
- ghc-lib-parser-ex-8.8.4.0
2324
- haddock-api-2.22.0
2425
- haskell-lsp-0.19.0.0
2526
- haskell-lsp-types-0.19.0.0
2627
- hie-bios-0.4.0
27-
- hlint-2.2.8
28+
- hlint-2.2.10
2829
- hoogle-5.0.17.11
2930
- hsimport-0.11.0
31+
- indexed-profunctors-0.1
3032
- lsp-test-0.10.0.0
31-
- monad-dijkstra-0.1.1.2@rev:1
33+
- monad-dijkstra-0.1.1.2
34+
- optics-core-0.2
35+
- optparse-applicative-0.15.1.0
3236
- ormolu-0.0.3.1
3337
- parser-combinators-1.2.1
34-
- syz-0.2.0.0
38+
- semialign-1.1
3539
- temporary-1.2.1.1
36-
40+
- topograph-1
3741
flags:
3842
haskell-ide-engine:
3943
pedantic: true

‎stack-8.8.1.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2020-01-17
1+
resolver: nightly-2020-01-21 # last GHC 8.8.1
22
packages:
33
- .
44
- hie-plugin-api
@@ -8,17 +8,18 @@ extra-deps:
88

99
- aeson-1.4.6.0
1010
- apply-refact-0.7.0.0
11+
- brittany-0.12.1.1
1112
- bytestring-trie-0.2.5.0
1213
- cabal-helper-1.0.0.0
1314
- clock-0.7.2
1415
- constrained-dynamic-0.1.0.0
1516
- floskell-0.10.2
16-
- ghc-lib-parser-ex-8.8.2
17+
- ghc-lib-parser-ex-8.8.4.0
1718
- haddock-api-2.23.0
1819
- haddock-library-1.8.0
1920
- haskell-src-exts-1.21.1
2021
- hie-bios-0.4.0
21-
- hlint-2.2.8
22+
- hlint-2.2.10
2223
- hoogle-5.0.17.11
2324
- hsimport-0.11.0
2425
- ilist-0.3.1.0

‎stack-8.8.2.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2020-01-25
1+
resolver: nightly-2020-01-31
22
packages:
33
- .
44
- hie-plugin-api
@@ -7,20 +7,22 @@ extra-deps:
77
# - ./submodules/HaRe
88

99
- apply-refact-0.7.0.0
10+
- brittany-0.12.1.1
1011
- bytestring-trie-0.2.5.0
1112
- cabal-helper-1.0.0.0
1213
- clock-0.7.2
1314
- constrained-dynamic-0.1.0.0
1415
- floskell-0.10.2
15-
- ghc-lib-parser-ex-8.8.2
16+
- ghc-lib-parser-ex-8.8.4.0
1617
- git: https://github.com/haskell/haddock.git
1718
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
1819
subdirs:
1920
- haddock-api
21+
# - haddock-api-2.23.0
2022
- haddock-library-1.8.0
2123
- haskell-src-exts-1.21.1
2224
- hie-bios-0.4.0
23-
- hlint-2.2.8
25+
- hlint-2.2.10
2426
- hoogle-5.0.17.11
2527
- hsimport-0.11.0
2628
- ilist-0.3.1.0

0 commit comments

Comments
 (0)