Commit 6f2d9649 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

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

Fixes #1478.
parent c1cc5200
...@@ -111,7 +111,9 @@ import Distribution.Simple.Utils ...@@ -111,7 +111,9 @@ import Distribution.Simple.Utils
import Distribution.Text import Distribution.Text
( display ) ( display )
import Distribution.Verbosity as Verbosity import Distribution.Verbosity as Verbosity
( Verbosity, normal ) ( Verbosity, normal )
import Distribution.Version
( Version(..), orLaterVersion )
import qualified Paths_cabal_install (version) import qualified Paths_cabal_install (version)
import System.Environment (getArgs, getProgName) import System.Environment (getArgs, getProgName)
...@@ -309,7 +311,10 @@ replAction replFlags extraArgs globalFlags = do ...@@ -309,7 +311,10 @@ replAction replFlags extraArgs globalFlags = do
maybeWithSandboxDirOnSearchPath useSandbox $ maybeWithSandboxDirOnSearchPath useSandbox $
let progConf = defaultProgramConfiguration let progConf = defaultProgramConfiguration
setupOptions = defaultSetupScriptOptions { useDistPref = distPref } setupOptions = defaultSetupScriptOptions
{ useCabalVersion = orLaterVersion $ Version [1,18,0] []
, useDistPref = distPref
}
replFlags' = replFlags replFlags' = replFlags
{ replVerbosity = toFlag verbosity { replVerbosity = toFlag verbosity
, replDistPref = toFlag distPref , replDistPref = toFlag distPref
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment