Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : 

http://hackage.haskell.org/trac/ghc/changeset/6190b944c04de7bc8ce198bbfc2f611eab721af2

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

commit 6190b944c04de7bc8ce198bbfc2f611eab721af2
Author: Duncan Coutts <[email protected]>
Date:   Sun Feb 27 17:54:55 2011 +0000

    Require Cabal >= 1.10.1
    It contains an important bug fix for some platforms, notably OSX

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

 cabal-install/bootstrap.sh        |    2 +-
 cabal-install/cabal-install.cabal |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 9bc96f1..0eb8384 100644
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -48,7 +48,7 @@ done
 # 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\."  # == 1.10.*
+CABAL_VER="1.10.1.0";  CABAL_VER_REGEXP="1\.10\.[^0]"  # == 1.10.* && >= 1.10.1
 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.*
diff --git a/cabal-install/cabal-install.cabal 
b/cabal-install/cabal-install.cabal
index b2a61d2..0c7bcca 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -88,7 +88,7 @@ Executable cabal
         Paths_cabal_install
 
     build-depends: base     >= 2        && < 5,
-                   Cabal    >= 1.10     && < 1.11,
+                   Cabal    >= 1.10.1   && < 1.11,
                    filepath >= 1.0      && < 1.3,
                    network  >= 1        && < 3,
                    HTTP     >= 4000.0.2 && < 4001,



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to