Skip to content
Snippets Groups Projects
This project is mirrored from https://github.com/haskell/Cabal. Pull mirroring updated .
  1. Feb 28, 2021
  2. Feb 24, 2021
  3. Feb 15, 2021
  4. Feb 12, 2021
    • Alex Biehl's avatar
      Merge pull request #7084 from alexbiehl/alex/proj-constraint-source · 4f95a629
      Alex Biehl authored
      Propagate provenance when parsing ProjectConfig
      4f95a629
    • Alex Biehl's avatar
      Propage provenance when parsing ProjectConfig · efa1e3f1
      Alex Biehl authored
      In a project with lots of constraints it's not always obvious from
      which file a constraint is coming from. Also we are currently showing
      a big `TODO` message in place of the file name which is not nice.
      
      Prior to this patch
      
      ```
      $ cabal build all
      Resolving dependencies...
      cabal: Could not resolve dependencies:
      [__0] trying: some-package-0.24.1.2 (user goal)
      [__1] trying: foldl-1.4.8 (dependency of some-package)
      [__2] next goal: mwc-random (dependency of foldl)
      [__2] rejecting: mwc-random-0.15.0.0 (constraint from project config TODO
      requires ==0.14.0.0)
      [__2] trying: mwc-random-0.14.0.0
      [__3] next goal: math-functions (dependency of mwc-random)
      [__3] rejecting: math-functions-0.3.4.0, math-functions-0.3.3.0,
      math-functions-0.3.2.1, math-functions-0.3.2.0, math-functions-0.3.1.0,
      math-functions-0.3.0.2, math-functions-0.3.0.1, math-functions-0.3.0.0,
      math-functions-0.2.1.0, math-functions-0.2.0.2, math-functions-0.2.0.1,
      math-functions-0.2.0.0, math-functions-0.1.7.0, math-functions-0.1.6.0,
      math-functions-0.1.5.2, math-functions-0.1.5.1, math-functions-0.1.4.0,
      math-functions-0.1.3.0, math-functions-0.1.1.2, math-functions-0.1.1.1,
      math-functions-0.1.1.0, math-functions-0.1.0.0 (constraint from project config
      TODO requires ==0.3.4.1)
      [__3] fail (backjumping, conflict set: math-functions, mwc-random)
      After searching the rest of the dependency tree exhaustively, these were the
      goals I've had most trouble fulfilling: mwc-random, math-functions, foldl,
      some-package
      Try running with --minimize-conflict-set to improve the error message.
      ```
      
      Note the TODO. No idea where th constraint is coming from :(
      
      With this patch applied:
      
      ```
      Resolving dependencies...
      cabal: Could not resolve dependencies:
      [__0] trying: some-package-0.24.1.2 (user goal)
      [__1] trying: foldl-1.4.8 (dependency of some-packagge)
      [__2] next goal: mwc-random (dependency of foldl)
      [__2] rejecting: mwc-random-0.15.0.0 (constraint from project config
      /Users/a602232/git/haskell-libs/cabal.project.freeze requires ==0.14.0.0)
      [__2] trying: mwc-random-0.14.0.0
      [__3] next goal: math-functions (dependency of mwc-random)
      [__3] rejecting: math-functions-0.3.4.0, math-functions-0.3.3.0,
      math-functions-0.3.2.1, math-functions-0.3.2.0, math-functions-0.3.1.0,
      math-functions-0.3.0.2, math-functions-0.3.0.1, math-functions-0.3.0.0,
      math-functions-0.2.1.0, math-functions-0.2.0.2, math-functions-0.2.0.1,
      math-functions-0.2.0.0, math-functions-0.1.7.0, math-functions-0.1.6.0,
      math-functions-0.1.5.2, math-functions-0.1.5.1, math-functions-0.1.4.0,
      math-functions-0.1.3.0, math-functions-0.1.1.2, math-functions-0.1.1.1,
      math-functions-0.1.1.0, math-functions-0.1.0.0 (constraint from project config
      /Users/a602232/git/haskell-libs/cabal.project.freeze requires ==0.3.4.1)
      [__3] fail (backjumping, conflict set: math-functions, mwc-random)
      After searching the rest of the dependency tree exhaustively, these were the
      goals I've had most trouble fulfilling: mwc-random, math-functions, foldl,
      some-package
      Try running with --minimize-conflict-set to improve the error message.
      ```
      
      Note that we now explicitly say where the constraint is coming from!
      efa1e3f1
  5. Feb 08, 2021
  6. Feb 07, 2021
  7. Feb 06, 2021
  8. Feb 01, 2021
  9. Jan 27, 2021
  10. Jan 26, 2021
  11. Jan 24, 2021
  12. Jan 14, 2021
  13. Jan 13, 2021
  14. Jan 11, 2021
  15. Jan 09, 2021
  16. Dec 30, 2020
  17. Dec 28, 2020
  18. Dec 20, 2020
  19. Dec 19, 2020
  20. Dec 09, 2020
  21. Dec 08, 2020
    • Aiken Cairncross's avatar
      Add spaces between words · cca04714
      Aiken Cairncross authored
      cca04714
    • Oleg Grenrus's avatar
      Merge pull request #7190 from DanielG/more-cmdline-help-wrapping · 3b8efe79
      Oleg Grenrus authored
      Cabal: Improve cmdline help readability by breaking long lines
      3b8efe79
    • Daniel Gröber (dxld)'s avatar
      Cabal: Improve cmdline help readability by breaking long lines · 97e4a127
      Daniel Gröber (dxld) authored
      Currently usageInfo lays out the cmdline help as three columns for each
      OptDescr: 1) the short options, 2) the long option and 3) the help text.
      
      We try to fit these columns in 79 chars but if thi fails we allocate at
      least 30 chars to the help text. Since we currently have some very long
      .. long options in cabal-install this makes the help output quite ugly on
      a standard 80x24 terminal window.
      
      This patch does two things: firstly we get rid of the dedicated short
      options column, and simply merge this with the long options
      column. Secondly instead of laying everything out in a strictly two column
      fashion with the first column having variable width we instead make the
      first column a fixed width and simply break the line after the list of
      options if we go over.
      
      Say we currently have:
      
          -a  --short-long-option                                 with some help text
              --really-long-option=with|a|bunch|of|allowed|values and help text here
      
      Instead we now get:
      
          -a, --short-long-option       with some help text
          --really-long-option=with|a|bunch|of|allowed|values
                                        and help text here
      
      where the help text is aligned to a fixed column (30 chars here) throughout
      and we use a comma to separate the short and long options instead of giving
      the short options a dedicated column.
      97e4a127
  22. Dec 05, 2020
  23. Nov 27, 2020
  24. Nov 26, 2020
  25. Nov 24, 2020
  26. Nov 23, 2020
Loading