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]

[ci skip]

Unfortunately, the vast majority of Appveyor runs are timing out again.

Closes #4602.

Haddock errors aren't fatal any more, but Cabal now knows not to invoke Haddock when there is no input for it to process.

[ci skip]

[ci skip]

Joachim Breitner authored 6 years ago and Herbert Valerio Riedel committed 6 years ago

because ghcjs does not like if the flag appears more than once, and it
seems it was happy before with the `jsSrc` files to be passed without a
flag.
This works-round https://github.com/ghcjs/ghcjs/issues/678 and
fixes #5442