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

Bump cabal-helper depdendency

This commit is contained in:
Daniel Gröber 2015-08-10 09:07:41 +02:00
parent 36c4253135
commit bad431a758
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Language/Haskell/GhcMod/CabalHelper.hs
View File

@ -50,8 +50,8 @@ getGhcMergedPkgOptions :: (Applicative m, IOish m, GmEnv m, GmLog m)
=> m [GHCOption] => m [GHCOption]
getGhcMergedPkgOptions = chCached Cached { getGhcMergedPkgOptions = chCached Cached {
cacheFile = mergedPkgOptsCacheFile, cacheFile = mergedPkgOptsCacheFile,
cachedAction = \ _tcf (progs, root, _) _ma -> do cachedAction = \ _tcf (progs, rootdir, distdir, _) _ma -> do
opts <- withCabal $ runQuery' progs root $ ghcMergedPkgOptions opts <- withCabal $ runQuery' progs rootdir distdir $ ghcMergedPkgOptions
return ([setupConfigPath], opts) return ([setupConfigPath], opts)
} }
@ -75,8 +75,8 @@ getPackageDbStack = do
getPackageDbStack' :: (IOish m, GmEnv m, GmLog m) => m [GhcPkgDb] getPackageDbStack' :: (IOish m, GmEnv m, GmLog m) => m [GhcPkgDb]
getPackageDbStack' = chCached Cached { getPackageDbStack' = chCached Cached {
cacheFile = pkgDbStackCacheFile, cacheFile = pkgDbStackCacheFile,
cachedAction = \ _tcf (progs, root, _) _ma -> do cachedAction = \ _tcf (progs, rootdir, distdir, _) _ma -> do
dbs <- withCabal $ map chPkgToGhcPkg <$> runQuery' progs root packageDbStack dbs <- withCabal $ map chPkgToGhcPkg <$> runQuery' progs rootdir distdir packageDbStack
return ([setupConfigPath, sandboConfigFile], dbs) return ([setupConfigPath, sandboConfigFile], dbs)
} }
@ -96,11 +96,11 @@ getComponents = chCached cabalHelperCache
cabalHelperCache cabalHelperCache
:: (Functor m, Applicative m, MonadIO m) :: (Functor m, Applicative m, MonadIO m)
=> Cached m (Programs, FilePath, (Version, String)) [GmComponent 'GMCRaw ChEntrypoint] => Cached m (Programs, FilePath, FilePath, (Version, String)) [GmComponent 'GMCRaw ChEntrypoint]
cabalHelperCache = Cached { cabalHelperCache = Cached {
cacheFile = cabalHelperCacheFile, cacheFile = cabalHelperCacheFile,
cachedAction = \ _tcf (progs, root, _vers) _ma -> cachedAction = \ _tcf (progs, rootdir, distdir, _vers) _ma ->
runQuery' progs root $ do runQuery' progs rootdir distdir $ do
q <- join7 q <- join7
<$> ghcOptions <$> ghcOptions
<*> ghcPkgOptions <*> ghcPkgOptions
@ -135,7 +135,8 @@ withCabal action = do
pkgDbStackOutOfSync <- pkgDbStackOutOfSync <-
case mCusPkgDbStack of case mCusPkgDbStack of
Just cusPkgDbStack -> do Just cusPkgDbStack -> do
pkgDb <- runQuery' (helperProgs opts) (cradleRootDir crdl </> "dist") $ let root = cradleRootDir crdl
pkgDb <- runQuery' (helperProgs opts) root (root </> "dist") $
map chPkgToGhcPkg <$> packageDbStack map chPkgToGhcPkg <$> packageDbStack
return $ pkgDb /= cusPkgDbStack return $ pkgDb /= cusPkgDbStack
@ -194,7 +195,7 @@ helperProgs opts = Programs {
} }
chCached :: (Applicative m, IOish m, GmEnv m, GmLog m, Serialize a) chCached :: (Applicative m, IOish m, GmEnv m, GmLog m, Serialize a)
=> Cached m (Programs, FilePath, (Version, [Char])) a -> m a => Cached m (Programs, FilePath, FilePath, (Version, [Char])) a -> m a
chCached c = do chCached c = do
root <- cradleRootDir <$> cradle root <- cradleRootDir <$> cradle
d <- cacheInputData root d <- cacheInputData root
@ -203,6 +204,7 @@ chCached c = do
cacheInputData root = do cacheInputData root = do
opt <- options opt <- options
return $ ( helperProgs opt return $ ( helperProgs opt
, root
, root </> "dist" , root </> "dist"
, (gmVer, chVer) , (gmVer, chVer)
) )

2
ghc-mod.cabal
View File

@ -131,7 +131,7 @@ Library
, bytestring , bytestring
, cereal >= 0.4 , cereal >= 0.4
, containers , containers
, cabal-helper == 0.3.* && >= 0.3.9.0 , cabal-helper == 0.4.* && >= 0.4.0.0
, deepseq , deepseq
, directory , directory
, filepath , filepath