Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix source packages for hie-bios #74

Merged
merged 2 commits into from
Apr 25, 2020
Merged

Fix source packages for hie-bios #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4888d4
Fix source packages for hie-bios and update API
fendor Apr 24, 2020
d38b7a6
Update submodule to use rebased hie-bios PR
fendor Apr 24, 2020
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 cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 $
Expand Down
2 changes: 1 addition & 1 deletion ghcide
Open in desktop
Submodule ghcide updated 6 files
+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
2 changes: 1 addition & 1 deletion stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down