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

Commit

Permalink
Merge remote-tracking branch 'haskell/master' into prepare-1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@alanz
alanz committed Mar 5, 2020
2 parents 02c1d24 + 4e34be7 commit fe0b2fe
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 27 deletions.
6 changes: 4 additions & 2 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ package haskell-ide-engine

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

write-ghc-environment-files: never

index-state: 2020-03-01T07:49:28Z
index-state: 2020-03-03T21:13:56Z
6 changes: 4 additions & 2 deletions cabal.project-8.8.2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ package haskell-ide-engine

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

write-ghc-environment-files: never

index-state: 2020-03-01T07:49:28Z
index-state: 2020-03-03T21:13:56Z
2 changes: 1 addition & 1 deletion haskell-ide-engine.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ library
, haddock-library
, haskell-lsp == 0.20.*
, haskell-lsp-types == 0.20.*
, haskell-src-exts
, haskell-src-exts >= 1.22
, hie-plugin-api >= 1.2
, hoogle >= 5.0.13
, hsimport
Expand Down
6 changes: 3 additions & 3 deletions stack-8.4.2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ extra-deps:
- haddock-library-1.6.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-1.22.0
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- hslogger-1.3.1.0
- invariant-0.5.3
- lens-4.18.1
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ extra-deps:
- haddock-library-1.6.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-1.22.0
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hoogle-5.0.17.15
- hsimport-0.11.0
- hslogger-1.3.1.0
- hspec-2.7.1
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ extra-deps:
- haddock-library-1.6.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-1.22.0
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hoogle-5.0.17.15
- hsimport-0.11.0
- hslogger-1.3.1.0
- invariant-0.5.3
Expand Down
6 changes: 3 additions & 3 deletions stack-8.6.4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ extra-deps:
- haddock-api-2.22.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-1.22.0
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- lsp-test-0.10.1.0
- monad-dijkstra-0.1.1.2@rev:1
- monad-memo-0.4.1
Expand Down
5 changes: 3 additions & 2 deletions stack-8.6.5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ extra-deps:
- haddock-api-2.22.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.22.0
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- indexed-profunctors-0.1
- lsp-test-0.10.1.0
- monad-dijkstra-0.1.1.2
Expand Down
5 changes: 2 additions & 3 deletions stack-8.8.1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ extra-deps:
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- ilist-0.3.1.0
- monad-dijkstra-0.1.1.2
- ormolu-0.0.3.1
Expand Down
5 changes: 2 additions & 3 deletions stack-8.8.2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ extra-deps:
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- ilist-0.3.1.0
- monad-dijkstra-0.1.1.2
- ormolu-0.0.3.1
Expand Down
7 changes: 3 additions & 4 deletions stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ extra-deps:
- floskell-0.10.2
- ghc-lib-parser-8.8.2.20200205
- ghc-lib-parser-ex-8.8.5.3
# - haddock-api-2.23.0
- git: https://github.com/haskell/haddock.git
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
subdirs:
- haddock-api
# - haddock-api-2.23.0
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.11
- hoogle-5.0.17.11
- hsimport-0.11.0
- hoogle-5.0.17.15
- hsimport-0.11.0@rev1
- ilist-0.3.1.0
- monad-dijkstra-0.1.1.2
- ormolu-0.0.3.1
Expand Down

0 comments on commit fe0b2fe

Please sign in to comment.