From c4888d4e515130b4d666b288b915bd89fa5715e6 Mon Sep 17 00:00:00 2001 From: fendor Date: Fri, 24 Apr 2020 21:54:39 +0200 Subject: [PATCH 1/2] Fix source packages for hie-bios and update API --- cabal.project | 2 +- exe/Main.hs | 5 +++-- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack-8.8.2.yaml | 2 +- stack-8.8.3.yaml | 2 +- stack.yaml | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index e7a139e6d0..d8bdeb1c1b 100644 --- a/cabal.project +++ b/cabal.project @@ -10,7 +10,7 @@ source-repository-package source-repository-package type: git location: https://github.com/fendor/hie-bios.git - tag: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + tag: 89d28817716a1c8df7e191f3a43c4504bc6379eb tests: true diff --git a/exe/Main.hs b/exe/Main.hs index bea31360cc..6e2586283d 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -56,7 +56,7 @@ import GHC hiding (def) import GHC.Check (runTimeVersion, compileTimeVersionFromLibdir) -- import GhcMonad import HIE.Bios.Cradle -import HIE.Bios.Environment (addCmdOpts) +import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolute) import HIE.Bios.Types import HscTypes (HscEnv(..), ic_dflags) import qualified Language.Haskell.LSP.Core as LSP @@ -503,7 +503,8 @@ memoIO op = do setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [Target]) setOptions (ComponentOptions theOpts compRoot _) dflags = do cacheDir <- liftIO $ getCacheDir theOpts - (dflags', targets) <- addCmdOpts compRoot theOpts dflags + (dflags_, targets) <- addCmdOpts theOpts dflags + let dflags' = makeDynFlagsAbsolute compRoot dflags_ let dflags'' = -- disabled, generated directly by ghcide instead flip gopt_unset Opt_WriteInterface $ diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 799ed0111b..20c75c1348 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -28,7 +28,7 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: fendor/hie-bios - commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 596b4eccaf..94ed61a72b 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-lsp-types-0.21.0.0 # - hie-bios-0.4.0 - github: fendor/hie-bios - commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb - indexed-profunctors-0.1 - lsp-test-0.10.2.0 - monad-dijkstra-0.1.1.2 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 013057df73..d0b14d5e6f 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: fendor/hie-bios - commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index e64173605c..6247164049 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-src-exts-1.21.1 # - hie-bios-0.4.0 - github: fendor/hie-bios - commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb - hlint-2.2.8 - hoogle-5.0.17.11 - hsimport-0.11.0 diff --git a/stack.yaml b/stack.yaml index 1c5aae660b..2c779845fc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -22,7 +22,7 @@ extra-deps: - haskell-lsp-types-0.21.0.0 # - hie-bios-0.4.0 - github: fendor/hie-bios - commit: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99 + commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb - indexed-profunctors-0.1 - lsp-test-0.10.2.0 - monad-dijkstra-0.1.1.2 From d38b7a63032d8ea6d23380cba4d37b37d6987079 Mon Sep 17 00:00:00 2001 From: fendor Date: Fri, 24 Apr 2020 22:47:26 +0200 Subject: [PATCH 2/2] Update submodule to use rebased hie-bios PR --- ghcide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcide b/ghcide index dc494d863f..af15fd103f 160000 --- a/ghcide +++ b/ghcide @@ -1 +1 @@ -Subproject commit dc494d863fcce34863832f2cdb10c923e20a76b6 +Subproject commit af15fd103f84d5a8701de298a9db0981c14cbf74