hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for "ghc-mod doc Data.Maybe" when used with stack projects

Browse Source 
When ghc-pkg is invoked from a stack project the global database is
indeed used:

  $ stack exec -- ghc-pkg find-module Data.Maybe
  /var/lib/ghc/package.conf.d
      base-4.9.0.0
  /home/user/.stack/snapshots/x86_64-linux/lts-7.11/8.0.1/pkgdb
      (no packages)
  /home/user/work/ghc-mod-5.6.0.0/.stack-work/install/x86_64-linux/lts-7.11/8.0.1/pkgdb
      (no packages)

Therefore "ghc-mod doc" should also use GlobalDb
This commit is contained in:
Jurijs Oniscuks 2016-12-04 01:08:06 +01:00
parent 9ef3e67f21
commit 80ddf63691
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Language/Haskell/GhcMod/GhcPkg.hs
View File

@ -86,7 +86,7 @@ getPackageDbStack = do
CabalProject -> CabalProject ->
getCabalPackageDbStack getCabalPackageDbStack
(StackProject StackEnv {..}) -> (StackProject StackEnv {..}) ->
return $ map PackageDb [seSnapshotPkgDb, seLocalPkgDb] return $ [GlobalDb, PackageDb seSnapshotPkgDb, PackageDb seLocalPkgDb]
return $ fromMaybe stack mCusPkgStack return $ fromMaybe stack mCusPkgStack
getPackageCachePaths :: IOish m => FilePath -> GhcModT m [FilePath] getPackageCachePaths :: IOish m => FilePath -> GhcModT m [FilePath]