This project is mirrored from https://github.com/haskell/Cabal. Pull mirroring updated .
  1. 25 Apr, 2016 4 commits
  2. 24 Apr, 2016 3 commits
  3. 23 Apr, 2016 12 commits
  4. 22 Apr, 2016 14 commits
  5. 21 Apr, 2016 7 commits
    • bardur.arantsson's avatar
      Merge pull request #3365 from BardurArantsson/remove-test-setup-dev · 9c48d380
      bardur.arantsson authored
      Remove the 'run tests' step from setup-dev.sh
      9c48d380
    • bardur.arantsson's avatar
      Remove the 'run tests' step from setup-dev.sh · 2ce3fde7
      bardur.arantsson authored
      As it turns out we often get spurious test failures, and it's generally
      more useful to be able to actually build *everything* rather than having
      the tests pass while building. (We already have pre-merge Travis checks,
      so it's not that likely that something will slip through anyway.)
      2ce3fde7
    • kristenk's avatar
      Use larger conflict set when solver chooses wrong version for package in link group · 7f480594
      kristenk authored and Edsko de Vries's avatar Edsko de Vries committed
      This commit replaces a call to 'lgBlame' with a call to 'lgConflictSet'.
      'lgConflictSet' adds the members of the link group to the conflict set. The
      other members are required, for example, when a linked package's version doesn't
      match a constraint, and the solver must try other versions for the linked-to
      package.
      
      All tests now pass.
      7f480594
    • Edsko de Vries's avatar
      Merge pull request #3350 from edsko/pr/ConflictSetAbstract · 2c6b1d69
      Edsko de Vries authored
      Make ConflictSet abstract
      2c6b1d69
    • Edsko de Vries's avatar
      Declare indepGoals3 as passing. · 440033d6
      Edsko de Vries authored
      440033d6
    • Edsko de Vries's avatar
      Fix bug in link validation · 34bfdf82
      Edsko de Vries authored
      When we are choosing to link a package (`pickLink`), it is possible that that
      package was _already_ linked (because its reverse dependencies got linked).
      Thus, this requires a merge of link groups: it is not correct to simply add the
      package into the target link group.
      
      This fixes #2842.
      34bfdf82
    • Edsko de Vries's avatar
      Use empty POption for unknown packages · 5a4149f4
      Edsko de Vries authored
      and fix the error message in showMessages; this keeps the construction of
      conflict sets uniform.
      
      This still isn't quite right though. If we remove B from db21 as well, we don't see a line "unknown package B" appearing in the log. I have no idea why.
      
      Also, @kosmikus says:
      
      > ok, so first problem: we still need to add C to the conflict set
      > one way to do this now is to change the "initial" conflict set in the backjump calls to be the node + the goal reason again
      > I was assuming that the initial set is only ever added to an existing conflict set that we already have
      > but this is now no longer true
      
      I have no idea what that means :)
      5a4149f4