[commit: packages/Cabal] ghc-head: 'cabal repl': require Cabal version to be >= 1.18. (6f2d964)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=6f2d9649b6918c7a641ae7f9df78d2449e8117c3

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

commit 6f2d9649b6918c7a641ae7f9df78d2449e8117c3
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Thu Sep 5 20:23:32 2013 +0200

    'cabal repl': require Cabal version to be >= 1.18.
    
    Fixes #1478.


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

6f2d9649b6918c7a641ae7f9df78d2449e8117c3
 cabal-install/Main.hs |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index ab5c453..cf1d227 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -111,7 +111,9 @@ import Distribution.Simple.Utils
 import Distribution.Text
          ( display )
 import Distribution.Verbosity as Verbosity
-       ( Verbosity, normal )
+         ( Verbosity, normal )
+import Distribution.Version
+         ( Version(..), orLaterVersion )
 import qualified Paths_cabal_install (version)
 
 import System.Environment       (getArgs, getProgName)
@@ -309,7 +311,10 @@ replAction replFlags extraArgs globalFlags = do
 
   maybeWithSandboxDirOnSearchPath useSandbox $
     let progConf     = defaultProgramConfiguration
-        setupOptions = defaultSetupScriptOptions { useDistPref = distPref }
+        setupOptions = defaultSetupScriptOptions
+          { useCabalVersion = orLaterVersion $ Version [1,18,0] []
+          , useDistPref     = distPref
+          }
         replFlags'   = replFlags
           { replVerbosity = toFlag verbosity
           , replDistPref  = toFlag distPref