From 1d04b09add656b1a86a6d161ebaa14bfaca4744d Mon Sep 17 00:00:00 2001 From: fendor Date: Tue, 4 Feb 2020 11:09:50 +0100 Subject: [PATCH] Update to latest hie-bios (#382) * Update to latest hie-bios * Remove explicit usage of type parameter Void from Cradle --- exe/Main.hs | 2 +- ghcide.cabal | 2 +- stack-ghc-lib.yaml | 2 +- stack.yaml | 2 +- stack84.yaml | 5 ++++- stack88.yaml | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/exe/Main.hs b/exe/Main.hs index 322a55948e..8093aa7174 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -177,7 +177,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 diff --git a/ghcide.cabal b/ghcide.cabal index ed532d6560..0b8503aaad 100644 --- a/ghcide.cabal +++ b/ghcide.cabal @@ -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, diff --git a/stack-ghc-lib.yaml b/stack-ghc-lib.yaml index abb37670ec..6d8ec639e6 100644 --- a/stack-ghc-lib.yaml +++ b/stack-ghc-lib.yaml @@ -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 diff --git a/stack.yaml b/stack.yaml index 77820c919b..389c662a31 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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 diff --git a/stack84.yaml b/stack84.yaml index e2c15786ec..6fdc6ca7c8 100644 --- a/stack84.yaml +++ b/stack84.yaml @@ -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 diff --git a/stack88.yaml b/stack88.yaml index 5390041130..3e79428d2b 100644 --- a/stack88.yaml +++ b/stack88.yaml @@ -3,6 +3,7 @@ packages: - . extra-deps: - fuzzy-0.1.0.0 +- hie-bios-0.4.0 allow-newer: true nix: packages: [zlib]