Skip to content
This repository has been archived by the owner on Jan 2, 2021. It is now read-only.

Update to latest hie-bios #382

Merged
merged 2 commits into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ showEvent lock (EventFileDiagnostics (toNormalizedFilePath -> file) diags) =
showEvent lock e = withLock lock $ print e


cradleToSession :: Cradle -> IO HscEnvEq
cradleToSession :: Cradle a -> IO HscEnvEq
cradleToSession cradle = do
cradleRes <- getCompilerOptions "" cradle
opts <- case cradleRes of
Expand Down
2 changes: 1 addition & 1 deletion ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ executable ghcide
ghc,
gitrev,
haskell-lsp,
hie-bios >= 0.3.2 && < 0.4,
hie-bios >= 0.4.0 && < 0.5,
ghcide,
optparse-applicative,
shake,
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extra-deps:
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- lsp-test-0.10.0.0
- hie-bios-0.3.2
- hie-bios-0.4.0
- ghc-lib-parser-8.8.1
- ghc-lib-8.8.1
- fuzzy-0.1.0.0
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extra-deps:
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- lsp-test-0.10.0.0
- hie-bios-0.3.2
- hie-bios-0.4.0
- fuzzy-0.1.0.0
- regex-pcre-builtin-0.95.1.1.8.43
- regex-base-0.94.0.0
Expand Down
5 changes: 4 additions & 1 deletion stack84.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ packages:
- .

extra-deps:
- aeson-1.4.6.0
- base-orphans-0.8.2
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- lsp-test-0.10.0.0
- rope-utf16-splay-0.3.1.0
- filepattern-0.1.1
- js-dgtable-0.5.2
- hie-bios-0.3.2
- hie-bios-0.4.0
- fuzzy-0.1.0.0
- shake-0.18.4
- time-compat-1.9.2.2
- regex-base-0.94.0.0
- regex-tdfa-1.3.1.0
- parser-combinators-1.2.1
Expand Down
1 change: 1 addition & 0 deletions stack88.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ packages:
- .
extra-deps:
- fuzzy-0.1.0.0
- hie-bios-0.4.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Note this will clash with my changes in #400 - but I'm happy to rebase after this lands.

allow-newer: true
nix:
packages: [zlib]