From 6f2d9649b6918c7a641ae7f9df78d2449e8117c3 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Thu, 5 Sep 2013 20:23:32 +0200
Subject: [PATCH] 'cabal repl': require Cabal version to be >= 1.18.
Fixes #1478.
---
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 ab5c4538ba..cf1d227cb6 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
--
GitLab