Fix rebuild on changing package location in stack.yaml

Author: mgsloan

src/Stack/Build/ConstructPlan.hs

@@ -359,7 +359,7 @@ addFinal lp package isAllInOne = do
                 , taskPresent = present
                 , taskType = TTLocal lp
                 , taskAllInOne = isAllInOne
-                , taskCachePkgSrc = CacheSrcLocal
+                , taskCachePkgSrc = CacheSrcLocal (toFilePath (lpDir lp))
                 }
     tell mempty { wFinals = Map.singleton (packageName package) res }
 
@@ -774,7 +774,7 @@ describeConfigDiff config old new
 
     newComponents = configCacheComponents new `Set.difference` configCacheComponents old
 
-    pkgSrcName CacheSrcLocal = "local source"
+    pkgSrcName (CacheSrcLocal fp) = T.pack fp
     pkgSrcName CacheSrcUpstream = "upstream source"
 
 psForceDirty :: PackageSource -> Bool

src/Stack/SDist.hs

@@ -239,7 +239,7 @@ getSDistFileList lp =
             }
         , taskPresent = Map.empty
         , taskAllInOne = True
-        , taskCachePkgSrc = CacheSrcLocal
+        , taskCachePkgSrc = CacheSrcLocal (toFilePath (lpDir lp))
         }
 
 normalizeTarballPaths :: (StackM env m) => [FilePath] -> m [FilePath]

src/Stack/Types/Build.hs

@@ -402,17 +402,17 @@ data ConfigCache = ConfigCache
 instance Store ConfigCache
 instance NFData ConfigCache
 
-data CachePkgSrc = CacheSrcUpstream | CacheSrcLocal
+data CachePkgSrc = CacheSrcUpstream | CacheSrcLocal FilePath
     deriving (Generic, Eq, Show, Data, Typeable)
 instance Store CachePkgSrc
 instance NFData CachePkgSrc
 
 toCachePkgSrc :: PackageSource -> CachePkgSrc
-toCachePkgSrc PSLocal{} = CacheSrcLocal
+toCachePkgSrc (PSLocal lp) = CacheSrcLocal (toFilePath (lpDir lp))
 toCachePkgSrc PSUpstream{} = CacheSrcUpstream
 
 configCacheVC :: VersionConfig ConfigCache
-configCacheVC = storeVersionConfig "config-v2" "IU16Mr9HCSnOm0APqrPUvCW0adw="
+configCacheVC = storeVersionConfig "config-v3" "z7N_NxX7Gbz41Gi9AGEa1zoLE-4="
 
 -- | A task to perform when building
 data Task = Task