This project is mirrored from https://github.com/haskell/Cabal. Pull mirroring updated .
  1. 01 Feb, 2014 2 commits
  2. 31 Jan, 2014 6 commits
  3. 29 Jan, 2014 1 commit
  4. 25 Jan, 2014 2 commits
  5. 16 Jan, 2014 3 commits
  6. 11 Jan, 2014 2 commits
  7. 10 Jan, 2014 3 commits
  8. 09 Jan, 2014 2 commits
    • Mikhail Glushenkov's avatar
      Merge pull request #1644 from djv/patch-4 · 4abf1d95
      Mikhail Glushenkov authored
      Remove ambiguous import of 'catch'
      4abf1d95
    • Daniel Velkov's avatar
      Remove ambiguous import of 'catch' · 98fc969f
      Daniel Velkov authored
      Running 'cabal install Cabal/ cabal-install/' from the latest git version resulted in:
      
      Distribution/Client/Compat/Process.hs:41:5:
          Ambiguous occurrence `catch'
          It could refer to either `Prelude.catch',
                                   imported from `Prelude' at Distribution/Client/Compat/Process.hs:16:8-41
                                   (and originally defined in `System.IO.Error')
                                or `Control.Exception.catch',
                                   imported from `Control.Exception' at Distribution/Client/Compat/Process.hs:20:37-41
                                   (and originally defined in `Control.Exception.Base')
      
      
      This pull requests fixes that.
      98fc969f
  9. 08 Jan, 2014 2 commits
    • Mikhail Glushenkov's avatar
      Merge pull request #1642 from dcoutts/mboes-master · 66f862f2
      Mikhail Glushenkov authored
      New license-files field.
      66f862f2
    • Duncan Coutts's avatar
      New license-files field. · a7b58b1f
      Duncan Coutts authored
      Based closely on the patches by Mathieu Boespflug <mboes@cs.mcgill.ca>
      
      This field is intended to be used instead of (or in addition to) the
      normal 'license-file' field by packages that have multiple files for
      their license material. This is useful when eg the license is
      supplemented by additional permissions and/or conditions. Notably,
      the LGPL is structured in this way: it amends the GPL with additional
      permissions, therefore one should distribute both the GPL in COPYING
      and the LGPL in COPYING.LESSER.
      
      So we keep both the license-file and license-files fields (rather than
      deprecating one) and packages can use either or a mixture.
      a7b58b1f
  10. 03 Jan, 2014 2 commits
  11. 01 Jan, 2014 6 commits
  12. 31 Dec, 2013 2 commits
  13. 28 Dec, 2013 1 commit
  14. 23 Dec, 2013 1 commit
  15. 22 Dec, 2013 3 commits
  16. 21 Dec, 2013 2 commits