summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-20 22:50:44 +0100
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-20 22:51:18 +0100
commitf23b2129aca24beb4ece0d5915f67c448dc64ae4 (patch)
treeb519707d4ebafc8e6d79a4de4029603fbe60fda2
parent8249b509461c936d1d5fc6a81275d37fade5d1dc (diff)
downloadhaskell-f23b2129aca24beb4ece0d5915f67c448dc64ae4.tar.gz
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.
m---------libraries/Cabal0
-rw-r--r--libraries/bin-package-db/bin-package-db.cabal2
-rw-r--r--utils/ghc-cabal/ghc-cabal.cabal2
-rw-r--r--utils/ghctags/ghctags.cabal2
4 files changed, 3 insertions, 3 deletions
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 337f9cd7927b787c6796acddc943393cf5b8e64
+Subproject c125342d4147ffb59c88d43024ae9abfc3a9c96
diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal
index e8b4fd45ee..dd84f9ca4b 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 5437d63bb2..0f13b9dcf4 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 e9c784877b..31e80b289b 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