Skip to content

Commit 4f4c5ed

Browse files
snoybergborsboom
authored andcommitted
Local extra-dep packages can be targets #2849
1 parent aa018b7 commit 4f4c5ed

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

ChangeLog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 1.3.0.1 (Unreleased)
3+
## 1.3.2 (Unreleased)
44

55
Bug fixes:
66

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

1520
## 1.3.0
1621

src/Stack/Build/Source.hs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -425,14 +425,6 @@ loadLocalPackage boptsCli targets (name, (lpv, gpkg)) = do
425425
, lpCabalFile = lpvCabalFP lpv
426426
, lpDir = lpvRoot lpv
427427
, lpWanted = isJust mtarget
428-
-- A local package marked as extra-dep should never
429-
-- be treated as a target. Perhaps we should be
430-
-- fixing this upstream of this function, not
431-
-- certain, but this works for now. If in the future
432-
-- we decide to move the extra-dep checking logic
433-
-- upstream, this lpvExtraDep check should be
434-
-- changed to an assertion.
435-
&& not (lpvExtraDep lpv)
436428
, lpComponents = toComponents exes tests benches
437429
-- TODO: refactor this so that it's easier to be sure that these
438430
-- components are indeed unbuildable.

0 commit comments

Comments
 (0)