Merge pull request #74 from fendor/fendor-hie-bios-force-push-sorry

Fix source packages for hie-bios
haskell · Apr 25, 2020 · 69b3516 · 69b3516
2 parents cb33c5b + d38b7a6
commit 69b3516
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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/ghcide b/ghcide
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
+1 −1		cabal.project
+3 −2		exe/Main.hs
+1 −1		src/Development/IDE/Core/Shake.hs
+1 −1		stack.yaml
+1 −1		stack84.yaml
+1 −1		stack88.yaml