See https://github.com/haskell/cabal/commit/123291c0939789aa7c3e4970c4a22adf50c0a9ee#comments.

Ben Gamari authored 6 years ago and Mikhail Glushenkov committed 6 years ago

This will be necessary for GHC 8.6. Please do cherry-pick into the stable branch.

(cherry picked from commit 4dad0ccd)

vrom911 authored 6 years ago and Mikhail Glushenkov committed 6 years ago

(cherry picked from commit dd3fee12)

This reverts commit 3b98a57e.

See @phadej's comments in #5421.

quasicomputational authored 6 years ago and Mikhail Glushenkov committed 6 years ago

We test on 7.0.4 on Travis, so this can reasonably be expected to work.

Closes #2819.

quasicomputational authored 6 years ago and Mikhail Glushenkov committed 6 years ago

This code existed to support building Cabal with 7.4 and earlier, but
we have recently dropped support for 7.4.

kristenk authored 6 years ago and Mikhail Glushenkov committed 6 years ago

new-build had assumed that each component could only directly depend on one
version of each package.  However, a component can depend on two different
versions of a package by listing it as a build-depends and build-tool-depends
dependency.  The incorrect assumption caused new-build to mix up the two
instances of the dependency when converting the solver's package-based install
plan (SolverInstallPlan) to the component-based install plan
(ElaboratedInstallPlan).  This commit fixes the bug by keeping build-depends and
build-tool-depends dependencies separate between reading them from the
SolverPackage and passing them to
D.Backpack.ConfiguredComponent.toConfiguredComponent.

This commit changes the signature of
D.Backpack.ConfiguredComponent.toConfiguredComponent to allow distinguishing
between the two types of dependencies.

Alexis Williams authored 6 years ago and Mikhail Glushenkov committed 6 years ago

[ci skip]

quasicomputational authored 6 years ago and Mikhail Glushenkov committed 6 years ago

Also improve the wording slightly about the `--new-freeze-file`
requirement.

[skip ci]

quasicomputational authored 6 years ago and Mikhail Glushenkov committed 6 years ago

Now the behaviour doesn't switch on just --project-file's
presence.

quasicomputational authored 6 years ago and Mikhail Glushenkov committed 6 years ago

This doesn't get anywhere near the improvements suggested in #4831,
but it's a very respectable improvement over the status-quo for not
much effort.

[ci skip]