From 5ac638d0ff1b4eb1040ef4085b94b7e0f57a2eb1 Mon Sep 17 00:00:00 2001
From: Ryan Thomas <ryan@ryant.org>
Date: Mon, 28 Dec 2015 09:04:26 +1100
Subject: [PATCH] Bump cabal-install version to 1.22.7.0 and Cabal dependency
to 1.22.6.0
---
cabal-install/bootstrap.sh | 2 +-
cabal-install/cabal-install.cabal | 2 +-
cabal-install/changelog | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 77b8c9dded..aeee21a23c 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -190,7 +190,7 @@ NETWORK_VER="2.6.0.2"; NETWORK_VER_REGEXP="2\.[0-6]\."
# >= 2.0 && < 2.7
NETWORK_URI_VER="2.6.0.1"; NETWORK_URI_VER_REGEXP="2\.6\."
# >= 2.6 && < 2.7
-CABAL_VER="1.22.5.0"; CABAL_VER_REGEXP="1\.22"
+CABAL_VER="1.22.6.0"; CABAL_VER_REGEXP="1\.22"
# >= 1.22 && < 1.23
TRANS_VER="0.4.2.0"; TRANS_VER_REGEXP="0\.[4]\."
# >= 0.2.* && < 0.5
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index f6014d239c..2c76369720 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
Name: cabal-install
-Version: 1.22.6.0
+Version: 1.22.7.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 55bbaecbe6..c11d7be777 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,9 @@
-*-change-log-*-
+1.22.7.0
+ * Remove GZipUtils tests
+ * maybeDecompress: bail on all errors at the beginning of the stream with zlib < 0.6
+ * Correct maybeDecompress
+
1.22.6.0 Ryan Thomas <ryan@ryant.org> June 2015
* A fix for @ezyang's fix for #2502. (Mikhail Glushenkov)
--
GitLab