Merge pull request #3536 from commercialhaskell/3533-extra-deps-solver

Ensure solver does not put local packages in extra-deps #3533

Author: mgsloan

src/Stack/Solver.hs

@@ -421,6 +421,15 @@ solveResolverSpec stackYaml cabalDirs
                 -- returned versions or flags different from the snapshot.
                 inSnapChanged = Map.differenceWith diffConstraints
                                                    inSnap snapConstraints
+
+                           -- If a package appears in both the
+                           -- snapshot and locally, we don't want to
+                           -- include it in extra-deps. This makes
+                           -- sure we filter out such packages. See:
+                           -- https://github.com/commercialhaskell/stack/issues/3533
+
+                                    `Map.difference` srcConstraints
+
                 -- Packages neither in snapshot, nor srcs
                 extra = Map.difference deps (Map.union srcConstraints
                                                        snapConstraints)

test/integration/tests/3533-extra-deps-solver/Main.hs

@@ -0,0 +1,8 @@
+import StackTest
+import System.Directory
+
+main :: IO ()
+main = do
+    copyFile "orig-stack.yaml" "stack.yaml"
+    stack ["--resolver", "lts-9.11", "solver", "--update-config"]
+    stack ["build"]

test/integration/tests/3533-extra-deps-solver/files/.gitignore

@@ -0,0 +1,3 @@
+.stack-work/
+*.cabal
+stack.yaml

test/integration/tests/3533-extra-deps-solver/files/local-mmorph/package.yaml

@@ -0,0 +1,10 @@
+name: mmorph
+version: 1.2.0
+
+dependencies:
+- base
+- acme-missiles
+
+library:
+  source-dirs:
+  - src

test/integration/tests/3533-extra-deps-solver/files/local-mmorph/src/Lib.hs

@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"

test/integration/tests/3533-extra-deps-solver/files/orig-stack.yaml

@@ -0,0 +1,5 @@
+resolver: lts-9.11
+
+packages:
+- ./local-mmorph
+- ./uses-mmorph

test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/package.yaml

@@ -0,0 +1,10 @@
+name: uses-mmorph
+version: 1.2.0
+
+dependencies:
+- base
+- mmorph >= 1.1
+
+library:
+  source-dirs:
+  - src

test/integration/tests/3533-extra-deps-solver/files/uses-mmorph/src/Lib.hs

@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"