Merge pull request #2863 from commercialhaskell/2849-extra-dep-target

Local extra-dep packages can be targets #2849

ChangeLog.md

@@ -33,6 +33,11 @@ Bug fixes:
 * Correct the testing of whether a package database exists by checking
   for the `package.cache` file itself instead of the containing
   directory.
+* Revert a change in the previous release which made it impossible to
+  set local extra-dep packages as targets. This was overkill; we
+  really only wanted to disable their test suites, which was already
+  handled by a later
+  patch. [#2849](https://github.com/commercialhaskell/stack/issues/2849)
 
 ## 1.3.0
 

src/Stack/Build/Source.hs

@@ -429,14 +429,6 @@ loadLocalPackage boptsCli targets (name, (lpv, gpkg)) = do
         , lpCabalFile = lpvCabalFP lpv
         , lpDir = lpvRoot lpv
         , lpWanted = isJust mtarget
-                  -- A local package marked as extra-dep should never
-                  -- be treated as a target. Perhaps we should be
-                  -- fixing this upstream of this function, not
-                  -- certain, but this works for now. If in the future
-                  -- we decide to move the extra-dep checking logic
-                  -- upstream, this lpvExtraDep check should be
-                  -- changed to an assertion.
-                  && not (lpvExtraDep lpv)
         , lpComponents = toComponents exes tests benches
         -- TODO: refactor this so that it's easier to be sure that these
         -- components are indeed unbuildable.