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

Commit 4e34be7

Browse files
jneirajneira
authored
Merge pull request #1679 from jneira/hask-src-exts-1.22
Use haskell-src-exts 1.22
2 parents a4f726d + ba8ee55 commit 4e34be7

11 files changed

+29
-27
lines changed

‎cabal.project

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ package haskell-ide-engine
1616

1717
-- Match the flag settings we use in stac builds
1818
constraints:
19-
haskell-ide-engine +pedantic
19+
-- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680
20+
unliftio-core < 0.2.0.0,
21+
haskell-ide-engine +pedantic,
2022
hie-plugin-api +pedantic
2123

2224
write-ghc-environment-files: never
2325

24-
index-state: 2020-03-01T07:49:28Z
26+
index-state: 2020-03-03T21:13:56Z

‎cabal.project-8.8.2

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ package haskell-ide-engine
2424

2525
-- Match the flag settings we use in stac builds
2626
constraints:
27-
haskell-ide-engine +pedantic
27+
-- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680
28+
unliftio-core < 0.2.0.0,
29+
haskell-ide-engine +pedantic,
2830
hie-plugin-api +pedantic
2931

3032
write-ghc-environment-files: never
3133

32-
index-state: 2020-03-01T07:49:28Z
34+
index-state: 2020-03-03T21:13:56Z

‎haskell-ide-engine.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ library
7575
, haddock-library
7676
, haskell-lsp == 0.20.*
7777
, haskell-lsp-types == 0.20.*
78-
, haskell-src-exts
78+
, haskell-src-exts >= 1.22
7979
, hie-plugin-api >= 1.1
8080
, hoogle >= 5.0.13
8181
, hsimport

‎stack-8.4.2.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ extra-deps:
3131
- haddock-library-1.6.0
3232
- haskell-lsp-0.20.0.0
3333
- haskell-lsp-types-0.20.0.0
34-
- haskell-src-exts-1.21.1
34+
- haskell-src-exts-1.22.0
3535
- haskell-src-exts-util-0.2.5
3636
- hie-bios-0.4.0
3737
- hlint-2.2.11
38-
- hoogle-5.0.17.11
39-
- hsimport-0.11.0
38+
- hoogle-5.0.17.15
39+
- hsimport-0.11.0@rev1
4040
- hslogger-1.3.1.0
4141
- invariant-0.5.3
4242
- lens-4.18.1

‎stack-8.4.3.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ extra-deps:
3737
- haddock-library-1.6.0
3838
- haskell-lsp-0.20.0.0
3939
- haskell-lsp-types-0.20.0.0
40-
- haskell-src-exts-1.21.1
40+
- haskell-src-exts-1.22.0
4141
- haskell-src-exts-util-0.2.5
4242
- hie-bios-0.4.0
4343
- hlint-2.2.11
44-
- hoogle-5.0.17.11
44+
- hoogle-5.0.17.15
4545
- hsimport-0.11.0
4646
- hslogger-1.3.1.0
4747
- hspec-2.7.1

‎stack-8.4.4.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ extra-deps:
3030
- haddock-library-1.6.0
3131
- haskell-lsp-0.20.0.0
3232
- haskell-lsp-types-0.20.0.0
33-
- haskell-src-exts-1.21.1
33+
- haskell-src-exts-1.22.0
3434
- haskell-src-exts-util-0.2.5
3535
- hie-bios-0.4.0
3636
- hlint-2.2.11
37-
- hoogle-5.0.17.11
37+
- hoogle-5.0.17.15
3838
- hsimport-0.11.0
3939
- hslogger-1.3.1.0
4040
- invariant-0.5.3

‎stack-8.6.4.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ extra-deps:
2424
- haddock-api-2.22.0
2525
- haskell-lsp-0.20.0.0
2626
- haskell-lsp-types-0.20.0.0
27-
- haskell-src-exts-1.21.1
27+
- haskell-src-exts-1.22.0
2828
- hie-bios-0.4.0
2929
- hlint-2.2.11
30-
- hoogle-5.0.17.11
31-
- hsimport-0.11.0
30+
- hoogle-5.0.17.15
31+
- hsimport-0.11.0@rev1
3232
- lsp-test-0.10.1.0
3333
- monad-dijkstra-0.1.1.2@rev:1
3434
- monad-memo-0.4.1

‎stack-8.6.5.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ extra-deps:
2727
- haddock-api-2.22.0
2828
- haskell-lsp-0.20.0.0
2929
- haskell-lsp-types-0.20.0.0
30+
- haskell-src-exts-1.22.0
3031
- hie-bios-0.4.0
3132
- hlint-2.2.11
32-
- hoogle-5.0.17.11
33-
- hsimport-0.11.0
33+
- hoogle-5.0.17.15
34+
- hsimport-0.11.0@rev1
3435
- indexed-profunctors-0.1
3536
- lsp-test-0.10.1.0
3637
- monad-dijkstra-0.1.1.2

‎stack-8.8.1.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ extra-deps:
2323
- haskell-lsp-0.20.0.0
2424
- haskell-lsp-types-0.20.0.0
2525
- lsp-test-0.10.1.0
26-
- haskell-src-exts-1.21.1
2726
- hie-bios-0.4.0
2827
- hlint-2.2.11
29-
- hoogle-5.0.17.11
30-
- hsimport-0.11.0
28+
- hoogle-5.0.17.15
29+
- hsimport-0.11.0@rev1
3130
- ilist-0.3.1.0
3231
- monad-dijkstra-0.1.1.2
3332
- ormolu-0.0.3.1

‎stack-8.8.2.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ extra-deps:
2828
- haskell-lsp-0.20.0.0
2929
- haskell-lsp-types-0.20.0.0
3030
- lsp-test-0.10.1.0
31-
- haskell-src-exts-1.21.1
3231
- hie-bios-0.4.0
3332
- hlint-2.2.11
34-
- hoogle-5.0.17.11
35-
- hsimport-0.11.0
33+
- hoogle-5.0.17.15
34+
- hsimport-0.11.0@rev1
3635
- ilist-0.3.1.0
3736
- monad-dijkstra-0.1.1.2
3837
- ormolu-0.0.3.1

‎stack.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@ extra-deps:
1717
- floskell-0.10.2
1818
- ghc-lib-parser-8.8.2.20200205
1919
- ghc-lib-parser-ex-8.8.5.3
20+
# - haddock-api-2.23.0
2021
- git: https://github.com/haskell/haddock.git
2122
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
2223
subdirs:
2324
- haddock-api
24-
# - haddock-api-2.23.0
2525
- haddock-library-1.8.0
2626
- haskell-lsp-0.20.0.0
2727
- haskell-lsp-types-0.20.0.0
2828
- lsp-test-0.10.1.0
29-
- haskell-src-exts-1.21.1
3029
- hie-bios-0.4.0
3130
- hlint-2.2.11
32-
- hoogle-5.0.17.11
33-
- hsimport-0.11.0
31+
- hoogle-5.0.17.15
32+
- hsimport-0.11.0@rev1
3433
- ilist-0.3.1.0
3534
- monad-dijkstra-0.1.1.2
3635
- ormolu-0.0.3.1

0 commit comments

Comments
 (0)