Skip to content

Commit

Permalink
Local extra-dep packages can be targets #2849
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg authored and borsboom committed Dec 20, 2016
1 parent aa018b7 commit 4f4c5ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.3.0.1 (Unreleased)
## 1.3.2 (Unreleased)

Bug fixes:

Expand All @@ -11,6 +11,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

Expand Down
8 changes: 0 additions & 8 deletions src/Stack/Build/Source.hs
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 +425,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.
Expand Down

0 comments on commit 4f4c5ed

Please sign in to comment.