[commit: ghc] master: Revert "Update Cabal submodule to HEAD (1.21)" (f23b212)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f23b2129aca24beb4ece0d5915f67c448dc64ae4/ghc

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

commit f23b2129aca24beb4ece0d5915f67c448dc64ae4
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Jul 20 22:50:44 2014 +0100

    Revert "Update Cabal submodule to HEAD (1.21)"
    
    This reverts commit af28e61c7e84b8eb89fdfd9671af83a2a13f554a.
    We'll wait until it's possible to bootstrap from 7.6 out of the box.


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

f23b2129aca24beb4ece0d5915f67c448dc64ae4
 libraries/Cabal                               | 2 +-
 libraries/bin-package-db/bin-package-db.cabal | 2 +-
 utils/ghc-cabal/ghc-cabal.cabal               | 2 +-
 utils/ghctags/ghctags.cabal                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 337f9cd..c125342 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 337f9cd7927b787c6796acddc943393cf5b8e64c
+Subproject commit c125342d4147ffb59c88d43024ae9abfc3a9c96d
diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal
index e8b4fd4..dd84f9c 100644
--- a/libraries/bin-package-db/bin-package-db.cabal
+++ b/libraries/bin-package-db/bin-package-db.cabal
@@ -26,5 +26,5 @@ Library
 
     build-depends: base >= 4 && < 5,
                    binary >= 0.5 && < 0.8,
-                   Cabal >= 1.20 && < 1.22
+                   Cabal >= 1.20 && < 1.21
 
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 5437d63..0f13b9d 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -18,7 +18,7 @@ Executable ghc-cabal
 
     Build-Depends: base       >= 3   && < 5,
                    bytestring >= 0.10 && < 0.11,
-                   Cabal      >= 1.20 && < 1.22,
+                   Cabal      >= 1.20 && < 1.21,
                    directory  >= 1.1 && < 1.3,
                    filepath   >= 1.2 && < 1.4
 
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index e9c7848..31e80b2 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -19,6 +19,6 @@ Executable ghctags
 
     Build-Depends: base       >= 4   && < 5,
                    containers,
-                   Cabal      >= 1.20 && <1.22,
+                   Cabal      >= 1.20 && <1.21,
                    ghc