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 committed Dec 20, 2016
1 parent 9938300 commit 2a42b31
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 6 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ Bug fixes:
[#2852](https://github.com/commercialhaskell/stack/issues/2852).
* `get-stack.sh` now installs correct binary on ARM for generic linux and raspbian,
closing [#2856](https://github.com/commercialhaskell/stack/issues/2856).
* 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

Release notes:
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 @@ -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.
Expand Down

0 comments on commit 2a42b31

Please sign in to comment.