From bad431a7581694398686cea6b2b3f95a2044ae8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Mon, 10 Aug 2015 09:07:41 +0200
Subject: [PATCH] Bump cabal-helper depdendency

---
 Language/Haskell/GhcMod/CabalHelper.hs | 20 +++++++++++---------
 ghc-mod.cabal                          |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Language/Haskell/GhcMod/CabalHelper.hs b/Language/Haskell/GhcMod/CabalHelper.hs
index 9c0ad95..b53f5a5 100644
--- a/Language/Haskell/GhcMod/CabalHelper.hs
+++ b/Language/Haskell/GhcMod/CabalHelper.hs
@@ -50,8 +50,8 @@ getGhcMergedPkgOptions :: (Applicative m, IOish m, GmEnv m, GmLog m)
                  => m [GHCOption]
 getGhcMergedPkgOptions = chCached Cached {
   cacheFile = mergedPkgOptsCacheFile,
-  cachedAction = \ _tcf (progs, root, _) _ma -> do
-    opts <- withCabal $ runQuery' progs root $ ghcMergedPkgOptions
+  cachedAction = \ _tcf (progs, rootdir, distdir, _) _ma -> do
+    opts <- withCabal $ runQuery' progs rootdir distdir $ ghcMergedPkgOptions
     return ([setupConfigPath], opts)
  }
 
@@ -75,8 +75,8 @@ getPackageDbStack = do
 getPackageDbStack' :: (IOish m, GmEnv m, GmLog m) => m [GhcPkgDb]
 getPackageDbStack' = chCached Cached {
   cacheFile = pkgDbStackCacheFile,
-  cachedAction = \ _tcf (progs, root, _) _ma -> do
-    dbs <- withCabal $ map chPkgToGhcPkg <$> runQuery' progs root packageDbStack
+  cachedAction = \ _tcf (progs, rootdir, distdir, _) _ma -> do
+    dbs <- withCabal $ map chPkgToGhcPkg <$> runQuery' progs rootdir distdir packageDbStack
     return ([setupConfigPath, sandboConfigFile], dbs)
  }
 
@@ -96,11 +96,11 @@ getComponents = chCached cabalHelperCache
 
 cabalHelperCache
   :: (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 {
     cacheFile = cabalHelperCacheFile,
-    cachedAction = \ _tcf (progs, root, _vers) _ma ->
-      runQuery' progs root $ do
+    cachedAction = \ _tcf (progs, rootdir, distdir, _vers) _ma ->
+      runQuery' progs rootdir distdir $ do
         q <- join7
                <$> ghcOptions
                <*> ghcPkgOptions
@@ -135,7 +135,8 @@ withCabal action = do
     pkgDbStackOutOfSync <-
          case mCusPkgDbStack of
            Just cusPkgDbStack -> do
-             pkgDb <- runQuery' (helperProgs opts) (cradleRootDir crdl </> "dist") $
+             let root = cradleRootDir crdl
+             pkgDb <- runQuery' (helperProgs opts) root (root </> "dist") $
                  map chPkgToGhcPkg <$> packageDbStack
              return $ pkgDb /= cusPkgDbStack
 
@@ -194,7 +195,7 @@ helperProgs opts = Programs {
                           }
 
 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
   root <- cradleRootDir <$> cradle
   d <- cacheInputData root
@@ -203,6 +204,7 @@ chCached c = do
    cacheInputData root = do
                opt <- options
                return $ ( helperProgs opt
+                        , root
                         , root </> "dist"
                         , (gmVer, chVer)
                         )
diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index 07f44e0..7ae5944 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -131,7 +131,7 @@ Library
                       , bytestring
                       , cereal >= 0.4
                       , containers
-                      , cabal-helper == 0.3.* && >= 0.3.9.0
+                      , cabal-helper == 0.4.* && >= 0.4.0.0
                       , deepseq
                       , directory
                       , filepath