Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updating dependencies in bootstrap.sh

Thanks to Tuncer Ayaz.
  • Loading branch information...
commit f80b86d64e3bda576eae641e686a9f43636164fc 1 parent a831a44
Andres Löh kosmikus authored

Showing 1 changed file with 13 additions and 7 deletions. Show diff stats Hide diff stats

  1. +13 7 cabal-install/bootstrap.sh
20 cabal-install/bootstrap.sh
@@ -46,14 +46,16 @@ done
46 46
47 47 # Versions of the packages to install.
48 48 # The version regex says what existing installed versions are ok.
49   -PARSEC_VER="3.1.1"; PARSEC_VER_REGEXP="[23]\." # == 2.* || == 3.*
50   -NETWORK_VER="2.3.0.2"; NETWORK_VER_REGEXP="2\." # == 2.*
51   -CABAL_VER="1.10.1.0"; CABAL_VER_REGEXP="1\.10\.[^0]" # == 1.10.* && >= 1.10.1
  49 +PARSEC_VER="3.1.2"; PARSEC_VER_REGEXP="[23]\." # == 2.* || == 3.*
  50 +TEXT_VER="0.11.1.12"; TEXT_VER_REGEXP="0\.([2-9]|(1[0-1]))\." # >= 0.2 && < 0.12
  51 +NETWORK_VER="2.3.0.8"; NETWORK_VER_REGEXP="2\." # == 2.*
  52 +CABAL_VER="1.14.0"; CABAL_VER_REGEXP="1\.(13\.3|14\.)" # >= 1.13.3 && < 1.15
52 53 TRANS_VER="0.2.2.0"; TRANS_VER_REGEXP="0\.2\." # == 0.2.*
53 54 MTL_VER="2.0.1.0"; MTL_VER_REGEXP="[12]\." # == 1.* || == 2.*
54   -HTTP_VER="4000.1.1"; HTTP_VER_REGEXP="4000\.[01]\." # == 4000.0.* || 4000.1.*
55   -ZLIB_VER="0.5.3.1"; ZLIB_VER_REGEXP="0\.[45]\." # == 0.4.* || ==0.5.*
56   -TIME_VER="1.2.0.4" TIME_VER_REGEXP="1\.[12]\." # == 0.1.* || ==0.2.*
  55 +HTTP_VER="4000.2.2"; HTTP_VER_REGEXP="4000\.[012]\." # == 4000.0.* || 4000.1.* || 4000.2.*
  56 +ZLIB_VER="0.5.3.1"; ZLIB_VER_REGEXP="0\.[45]\." # == 0.4.* || == 0.5.*
  57 +TIME_VER="1.4" TIME_VER_REGEXP="1\.[1234]\.?" # >= 1.1 && < 1.5
  58 +RANDOM_VER="1.0.1.1" RANDOM_VER_REGEXP="1\.0\." # >= 1 && < 1.1
57 59
58 60 HACKAGE_URL="http://hackage.haskell.org/packages/archive"
59 61
@@ -86,7 +88,7 @@ ${GHC_PKG} list --global ${SCOPE_OF_INSTALLATION} > ghc-pkg.list \
86 88 need_pkg () {
87 89 PKG=$1
88 90 VER_MATCH=$2
89   - if grep " ${PKG}-${VER_MATCH}" ghc-pkg.list > /dev/null 2>&1
  91 + if egrep " ${PKG}-${VER_MATCH}" ghc-pkg.list > /dev/null 2>&1
90 92 then
91 93 return 1;
92 94 else
@@ -186,20 +188,24 @@ do_pkg () {
186 188 info_pkg "Cabal" ${CABAL_VER} ${CABAL_VER_REGEXP}
187 189 info_pkg "transformers" ${TRANS_VER} ${TRANS_VER_REGEXP}
188 190 info_pkg "mtl" ${MTL_VER} ${MTL_VER_REGEXP}
  191 +info_pkg "text" ${TEXT_VER} ${TEXT_VER_REGEXP}
189 192 info_pkg "parsec" ${PARSEC_VER} ${PARSEC_VER_REGEXP}
190 193 info_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP}
191 194 info_pkg "time" ${TIME_VER} ${TIME_VER_REGEXP}
192 195 info_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
193 196 info_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
  197 +info_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
194 198
195 199 do_pkg "Cabal" ${CABAL_VER} ${CABAL_VER_REGEXP}
196 200 do_pkg "transformers" ${TRANS_VER} ${TRANS_VER_REGEXP}
197 201 do_pkg "mtl" ${MTL_VER} ${MTL_VER_REGEXP}
  202 +do_pkg "text" ${TEXT_VER} ${TEXT_VER_REGEXP}
198 203 do_pkg "parsec" ${PARSEC_VER} ${PARSEC_VER_REGEXP}
199 204 do_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP}
200 205 do_pkg "time" ${TIME_VER} ${TIME_VER_REGEXP}
201 206 do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
202 207 do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
  208 +do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
203 209
204 210 install_pkg "cabal-install"
205 211

0 comments on commit f80b86d

Please sign in to comment.
Something went wrong with that request. Please try again.