[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, develop, develop-0.6, develop-0.6-questionable, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394, zip-devel: Try to use CABALVER=1.20 again (e5d74fa)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branches: changelog-foldtree,cleaned_bugfix394,develop,develop-0.6,develop-0.6-questionable,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e5d74fa883ef2d66511d12cdb62b9586abff14c5

>---------------------------------------------------------------

commit e5d74fa883ef2d66511d12cdb62b9586abff14c5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat May 3 17:45:13 2014 +0200

    Try to use CABALVER=1.20 again
    
    ...hoping that haskell/cabal#1806 has been resolved for good


>---------------------------------------------------------------

e5d74fa883ef2d66511d12cdb62b9586abff14c5
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67d893c..8af3116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,11 @@ env:
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.16
  - GHCVER=7.8.2 CABALVER=1.18
- # NOTE: we can't use Cabal 1.20 yet due to
- #  https://github.com/haskell/cabal/issues/1806
- - GHCVER=head  CABALVER=1.18
+ - GHCVER=head  CABALVER=1.20
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=1.18
+   - env: GHCVER=head  CABALVER=1.20
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.