Created
December 5, 2011 05:43
-
-
Save yihuang/1432456 to your computer and use it in GitHub Desktop.
patch to bootstrap cabal-install under ghc-7.2.2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/bootstrap.sh b/bootstrap.sh | |
index b9950e7..105b693 100644 | |
--- a/bootstrap.sh | |
+++ b/bootstrap.sh | |
@@ -19,7 +19,7 @@ CURL=${CURL:-curl} | |
FETCH=${FETCH:-fetch} | |
TAR=${TAR:-tar} | |
GUNZIP=${GUNZIP:-gunzip} | |
-SCOPE_OF_INSTALLATION="--user" | |
+SCOPE_OF_INSTALLATION="--global" | |
for arg in $* | |
@@ -47,13 +47,14 @@ done | |
# Versions of the packages to install. | |
# The version regex says what existing installed versions are ok. | |
PARSEC_VER="3.1.1"; PARSEC_VER_REGEXP="[23]\." # == 2.* || == 3.* | |
-NETWORK_VER="2.3.0.2"; NETWORK_VER_REGEXP="2\." # == 2.* | |
-CABAL_VER="1.10.1.0"; CABAL_VER_REGEXP="1\.10\.[^0]" # == 1.10.* && >= 1.10.1 | |
+NETWORK_VER="2.3.0.7"; NETWORK_VER_REGEXP="2\." # == 2.* | |
+CABAL_VER="1.12.0"; CABAL_VER_REGEXP="1\.12\." # == 1.12.* | |
TRANS_VER="0.2.2.0"; TRANS_VER_REGEXP="0\.2\." # == 0.2.* | |
MTL_VER="2.0.1.0"; MTL_VER_REGEXP="[12]\." # == 1.* || == 2.* | |
-HTTP_VER="4000.1.1"; HTTP_VER_REGEXP="4000\.[01]\." # == 4000.0.* || 4000.1.* | |
+HTTP_VER="4000.2.1"; HTTP_VER_REGEXP="4000\.[01]\." # == 4000.0.* || 4000.1.* | |
ZLIB_VER="0.5.3.1"; ZLIB_VER_REGEXP="0\.[45]\." # == 0.4.* || ==0.5.* | |
-TIME_VER="1.2.0.4" TIME_VER_REGEXP="1\.[12]\." # == 0.1.* || ==0.2.* | |
+TIME_VER="1.2.0.5"; TIME_VER_REGEXP="1\.[12]\." # == 0.1.* || ==0.2.* | |
+RANDOM_VER="1.0.1.0"; RANDOM_VER_REGEXP="1\." # == 1.* | |
HACKAGE_URL="http://hackage.haskell.org/packages/archive" | |
@@ -191,6 +192,7 @@ info_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP} | |
info_pkg "time" ${TIME_VER} ${TIME_VER_REGEXP} | |
info_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP} | |
info_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP} | |
+info_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP} | |
do_pkg "Cabal" ${CABAL_VER} ${CABAL_VER_REGEXP} | |
do_pkg "transformers" ${TRANS_VER} ${TRANS_VER_REGEXP} | |
@@ -200,6 +202,7 @@ do_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP} | |
do_pkg "time" ${TIME_VER} ${TIME_VER_REGEXP} | |
do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP} | |
do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP} | |
+do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP} | |
install_pkg "cabal-install" | |
diff --git a/cabal-install.cabal b/cabal-install.cabal | |
index e570d60..d3de8d9 100644 | |
--- a/cabal-install.cabal | |
+++ b/cabal-install.cabal | |
@@ -93,7 +93,7 @@ Executable cabal | |
Paths_cabal_install | |
build-depends: base >= 2 && < 5, | |
- Cabal >= 1.10.1 && < 1.11, | |
+ Cabal >= 1.10.1 && < 1.13, | |
filepath >= 1.0 && < 1.3, | |
network >= 1 && < 3, | |
HTTP >= 4000.0.2 && < 4001, | |
@@ -104,9 +104,9 @@ Executable cabal | |
build-depends: base < 3 | |
else | |
build-depends: base >= 3, | |
- process >= 1 && < 1.1, | |
+ process >= 1 && < 1.2, | |
directory >= 1 && < 1.2, | |
- pretty >= 1 && < 1.1, | |
+ pretty >= 1 && < 1.2, | |
random >= 1 && < 1.1, | |
containers >= 0.1 && < 0.5, | |
array >= 0.1 && < 0.4, | |
@@ -121,5 +121,5 @@ Executable cabal | |
build-depends: Win32 >= 2 && < 3 | |
cpp-options: -DWIN32 | |
else | |
- build-depends: unix >= 1.0 && < 2.5 | |
+ build-depends: unix >= 1.0 && < 2.6 | |
extensions: CPP |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Thanks, this was a great help to me.