Merge pull request #2362 from judah/master

Let extra-source-files mark a package as dirty (#1891, #2040).
commercialhaskell · Jul 10, 2016 · 919f0b2 · 919f0b2
2 parents 0643f90 + 29cd9e8
commit 919f0b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -92,6 +92,9 @@ Bug fixes:
   checked for dirtiness. See
   [#1982](https://github.com/commercialhaskell/stack/issues/1982)
 * Signing: always use `--with-fingerprints`
+  [#2110](https://github.com/commercialhaskell/stack/issues/2110).
+* Now consider a package to be dirty when an extra-source-file is changed.
+  See [#2040](https://github.com/commercialhaskell/stack/issues/2040).
 
 ## 1.1.0
 

diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -558,7 +558,9 @@ packageDescModulesAndFiles pkg = do
             (mapM
                  (asModuleAndFileMap benchComponent benchmarkFiles)
                  (benchmarks pkg))
-    (dfiles) <- resolveGlobFiles (map (dataDir pkg FilePath.</>) (dataFiles pkg))
+    (dfiles) <- resolveGlobFiles
+                    (extraSrcFiles pkg
+                        ++ map (dataDir pkg FilePath.</>) (dataFiles pkg))
     let modules = libraryMods <> executableMods <> testMods <> benchModules
         files =
             libDotCabalFiles <> exeDotCabalFiles <> testDotCabalFiles <>