Commit 6248c742 authored by Oleg Grenrus's avatar Oleg Grenrus

Remove sandboxes.

Removes command and cleanups cabal-testsuite.
The tests for #3199 #4099 #3436 are removed, but they seem to be
sandbox specific issues.

Removes Sandbox.Types, Sandbox.Index and Sandbox.Timestamp modules.
The Sandbox and Sandbox.PackageEnvironment are still
there as some configuration in v1-commands happens through them
(~/.cabal/config vs ./cabal.config).

BuildExFlags contained only sandbox specific parameter,
so it's removed as well.

Remove sandbox support from cabal-testsuite
Remove sandbox from GlobalFlags and Sandbox unit-tests
parent 3150547f
......@@ -39,7 +39,7 @@ wrapperAction command verbosityFlag distPrefFlag =
let verbosity' = Setup.fromFlagOrDefault normal (verbosityFlag flags)
load <- try (loadConfigOrSandboxConfig verbosity' globalFlags)
let config = either (\(SomeException _) -> mempty) snd load
let config = either (\(SomeException _) -> mempty) id load
distPref <- findSavedDistPref config (distPrefFlag flags)
let setupScriptOptions = defaultSetupScriptOptions { useDistPref = distPref }
......@@ -59,8 +59,8 @@ instance HasVerbosity (Setup.Flag Verbosity) where
instance (HasVerbosity a) => HasVerbosity (a, b) where
verbosity (a, _) = verbosity a
instance (HasVerbosity b) => HasVerbosity (a, b, c) where
verbosity (_ , b, _) = verbosity b
instance (HasVerbosity a) => HasVerbosity (a, b, c) where
verbosity (a , _, _) = verbosity a
instance (HasVerbosity a) => HasVerbosity (a, b, c, d) where
verbosity (a, _, _, _) = verbosity a
......@@ -95,12 +95,6 @@ instance HasVerbosity Client.UpdateFlags where
instance HasVerbosity Setup.CleanFlags where
verbosity = verbosity . Setup.cleanVerbosity
instance HasVerbosity Client.SDistFlags where
verbosity = verbosity . Client.sDistVerbosity
instance HasVerbosity Client.SandboxFlags where
verbosity = verbosity . Client.sandboxVerbosity
instance HasVerbosity Setup.DoctestFlags where
verbosity = verbosity . Setup.doctestVerbosity
......
......@@ -247,7 +247,6 @@ instance Semigroup SavedConfig where
globalVersion = combine globalVersion,
globalNumericVersion = combine globalNumericVersion,
globalConfigFile = combine globalConfigFile,
globalSandboxConfigFile = combine globalSandboxConfigFile,
globalConstraintsFile = combine globalConstraintsFile,
globalRemoteRepos = lastNonEmptyNL globalRemoteRepos,
globalCacheDir = combine globalCacheDir,
......@@ -255,8 +254,6 @@ instance Semigroup SavedConfig where
globalLocalNoIndexRepos = lastNonEmptyNL globalLocalNoIndexRepos,
globalLogsDir = combine globalLogsDir,
globalWorldFile = combine globalWorldFile,
globalRequireSandbox = combine globalRequireSandbox,
globalIgnoreSandbox = combine globalIgnoreSandbox,
globalIgnoreExpiry = combine globalIgnoreExpiry,
globalHttpTransport = combine globalHttpTransport,
globalNix = combine globalNix,
......@@ -890,7 +887,7 @@ configFieldDescriptions src =
toSavedConfig liftGlobalFlag
(commandOptions (globalCommand []) ParseArgs)
["version", "numeric-version", "config-file", "sandbox-config-file"] []
["version", "numeric-version", "config-file"] []
++ toSavedConfig liftConfigFlag
(configureOptions ParseArgs)
......
......@@ -34,9 +34,6 @@ module Distribution.Client.Dependency (
standardInstallPolicy,
PackageSpecifier(..),
-- ** Sandbox policy
applySandboxInstallPolicy,
-- ** Extra policy options
upgradeDependencies,
reinstallTargets,
......@@ -83,8 +80,6 @@ import Distribution.Client.Types
import Distribution.Client.Dependency.Types
( PreSolver(..), Solver(..)
, PackagesPreferenceDefault(..) )
import Distribution.Client.Sandbox.Types
( SandboxPackageInfo(..) )
import Distribution.Package
( PackageName, mkPackageName, PackageIdentifier(PackageIdentifier), PackageId
, Package(..), packageName, packageVersion )
......@@ -686,48 +681,6 @@ standardInstallPolicy installedPkgIndex sourcePkgDb pkgSpecifiers
alwaysTrue (PD.Lit True) = True
alwaysTrue _ = False
applySandboxInstallPolicy :: SandboxPackageInfo
-> DepResolverParams
-> DepResolverParams
applySandboxInstallPolicy
(SandboxPackageInfo modifiedDeps otherDeps allSandboxPkgs _allDeps)
params
= addPreferences [ PackageInstalledPreference n PreferInstalled
| n <- installedNotModified ]
. addTargets installedNotModified
. addPreferences
[ PackageVersionPreference (packageName pkg)
(thisVersion (packageVersion pkg)) | pkg <- otherDeps ]
. addConstraints
[ let pc = PackageConstraint
(scopeToplevel $ packageName pkg)
(PackagePropertyVersion $ thisVersion (packageVersion pkg))
in LabeledPackageConstraint pc ConstraintSourceModifiedAddSourceDep
| pkg <- modifiedDeps ]
. addTargets [ packageName pkg | pkg <- modifiedDeps ]
. hideInstalledPackagesSpecificBySourcePackageId
[ packageId pkg | pkg <- modifiedDeps ]
-- We don't need to add source packages for add-source deps to the
-- 'installedPkgIndex' since 'getSourcePackages' did that for us.
$ params
where
installedPkgIds =
map fst . InstalledPackageIndex.allPackagesBySourcePackageId
$ allSandboxPkgs
modifiedPkgIds = map packageId modifiedDeps
installedNotModified = [ packageName pkg | pkg <- installedPkgIds,
pkg `notElem` modifiedPkgIds ]
-- ------------------------------------------------------------
-- * Interface to the standard resolver
-- ------------------------------------------------------------
......
......@@ -14,44 +14,29 @@ module Distribution.Client.Exec ( exec
import Prelude ()
import Distribution.Client.Compat.Prelude
import qualified Distribution.Simple.GHC as GHC
import qualified Distribution.Simple.GHCJS as GHCJS
import Distribution.Client.Sandbox (getSandboxConfigFilePath)
import Distribution.Client.Sandbox.PackageEnvironment (sandboxPackageDBPath)
import Distribution.Client.Sandbox.Types (UseSandbox (..))
import Distribution.Simple.Compiler (Compiler, CompilerFlavor(..), compilerFlavor)
import Distribution.Simple.Program (ghcProgram, ghcjsProgram, lookupProgram)
import Distribution.Simple.Compiler (Compiler)
import Distribution.Simple.Program.Db (ProgramDb, requireProgram, modifyProgramSearchPath)
import Distribution.Simple.Program.Find (ProgramSearchPathEntry(..))
import Distribution.Simple.Program.Run (programInvocation, runProgramInvocation)
import Distribution.Simple.Program.Types ( simpleProgram, ConfiguredProgram(..) )
import Distribution.Simple.Utils (die', warn)
import Distribution.Simple.Utils (die')
import Distribution.System (Platform(..), OS(..), buildOS)
import Distribution.System (Platform(..))
import Distribution.Verbosity (Verbosity)
import System.Directory ( doesDirectoryExist )
import System.Environment (lookupEnv)
import System.FilePath (searchPathSeparator, (</>))
-- | Execute the given command in the package's environment.
--
-- The given command is executed with GHC configured to use the correct
-- package database and with the sandbox bin directory added to the PATH.
exec :: Verbosity
-> UseSandbox
-> Compiler
-> Platform
-> ProgramDb
-> [String]
-> IO ()
exec verbosity useSandbox comp platform programDb extraArgs =
exec verbosity _comp _platform programDb extraArgs =
case extraArgs of
(exe:args) -> do
program <- requireProgram' verbosity useSandbox programDb exe
program <- requireProgram' verbosity programDb exe
env <- environmentOverrides (programOverrideEnv program)
let invocation = programInvocation
program { programOverrideEnv = env }
......@@ -60,113 +45,15 @@ exec verbosity useSandbox comp platform programDb extraArgs =
[] -> die' verbosity "Please specify an executable to run"
where
environmentOverrides env =
case useSandbox of
NoSandbox -> return env
(UseSandbox sandboxDir) ->
sandboxEnvironment verbosity sandboxDir comp platform programDb env
-- | Return the package's sandbox environment.
--
-- The environment sets GHC_PACKAGE_PATH so that GHC will use the sandbox.
sandboxEnvironment :: Verbosity
-> FilePath
-> Compiler
-> Platform
-> ProgramDb
-> [(String, Maybe String)] -- environment overrides so far
-> IO [(String, Maybe String)]
sandboxEnvironment verbosity sandboxDir comp platform programDb iEnv =
case compilerFlavor comp of
GHC -> env GHC.getGlobalPackageDB ghcProgram "GHC_PACKAGE_PATH"
GHCJS -> env GHCJS.getGlobalPackageDB ghcjsProgram "GHCJS_PACKAGE_PATH"
_ -> die' verbosity "exec only works with GHC and GHCJS"
where
(Platform _ os) = platform
ldPath = case os of
OSX -> "DYLD_LIBRARY_PATH"
Windows -> "PATH"
_ -> "LD_LIBRARY_PATH"
env getGlobalPackageDB hcProgram packagePathEnvVar = do
let program = fromMaybe (error "failed to find hcProgram") $ lookupProgram hcProgram programDb
gDb <- getGlobalPackageDB verbosity program
sandboxConfigFilePath <- getSandboxConfigFilePath mempty
let sandboxPackagePath = sandboxPackageDBPath sandboxDir comp platform
compilerPackagePaths = prependToSearchPath gDb sandboxPackagePath
-- Packages database must exist, otherwise things will start
-- failing in mysterious ways.
exists <- doesDirectoryExist sandboxPackagePath
unless exists $ warn verbosity $ "Package database is not a directory: "
++ sandboxPackagePath
-- MASSIVE HACK. We need this to be synchronized with installLibDir
-- in defaultInstallDirs' in Distribution.Simple.InstallDirs,
-- which has a special case for Windows (WHY? Who knows; it's been
-- around as long as Windows exists.) The sane thing to do here
-- would be to read out the actual install dirs that were associated
-- with the package in question, but that's not a well-formed question
-- here because there is not actually install directory for the
-- "entire" sandbox. Since we want to kill this code in favor of
-- new-build, I decided it wasn't worth fixing this "properly."
-- Also, this doesn't handle LHC correctly but I don't care -- ezyang
let extraLibPath =
case buildOS of
Windows -> sandboxDir
_ -> sandboxDir </> "lib"
-- 2016-11-26 Apologies for the spaghetti code here.
-- Essentially we just want to add the sandbox's lib/ dir to
-- whatever the library search path environment variable is:
-- this allows running existing executables against foreign
-- libraries (meaning Haskell code with a bunch of foreign
-- exports). However, on Windows this variable is equal to the
-- executable search path env var. And we try to keep not only
-- what was already set in the environment, but also the
-- additional directories we add below in requireProgram'. So
-- the strategy is that we first take the environment
-- overrides from requireProgram' below. If the library search
-- path env is overridden (e.g. because we're on windows), we
-- prepend the lib/ dir to the relevant override. If not, we
-- want to avoid wiping the user's own settings, so we first
-- read the env var's current value, and then prefix ours if
-- the user had any set.
iEnv' <-
if any ((==ldPath) . fst) iEnv
then return $ updateLdPath extraLibPath iEnv
else do
currentLibraryPath <- lookupEnv ldPath
let updatedLdPath =
case currentLibraryPath of
Nothing -> Just extraLibPath
Just paths ->
Just $ extraLibPath ++ [searchPathSeparator] ++ paths
return $ (ldPath, updatedLdPath) : iEnv
-- Build the environment
return $ [ (packagePathEnvVar, Just compilerPackagePaths)
, ("CABAL_SANDBOX_PACKAGE_PATH", Just compilerPackagePaths)
, ("CABAL_SANDBOX_CONFIG", Just sandboxConfigFilePath)
] ++ iEnv'
prependToSearchPath path newValue =
newValue ++ [searchPathSeparator] ++ path
updateLdPath path = map update
where
update (name, Just current)
| name == ldPath = (ldPath, Just $ path ++ [searchPathSeparator] ++ current)
update (name, Nothing)
| name == ldPath = (ldPath, Just path)
update x = x
environmentOverrides env = return env
-- | Check that a program is configured and available to be run. If
-- a sandbox is available check in the sandbox's directory.
requireProgram' :: Verbosity
-> UseSandbox
-> ProgramDb
-> String
-> IO ConfiguredProgram
requireProgram' verbosity useSandbox programDb exe = do
requireProgram' verbosity programDb exe = do
(program, _) <- requireProgram
verbosity
(simpleProgram exe)
......@@ -174,8 +61,4 @@ requireProgram' verbosity useSandbox programDb exe = do
return program
where
updateSearchPath =
flip modifyProgramSearchPath programDb $ \searchPath ->
case useSandbox of
NoSandbox -> searchPath
UseSandbox sandboxDir ->
ProgramSearchPathDir (sandboxDir </> "bin") : searchPath
flip modifyProgramSearchPath programDb $ \searchPath -> searchPath
......@@ -33,8 +33,6 @@ import Distribution.Client.Setup
import Distribution.Client.Sandbox.PackageEnvironment
( loadUserConfig, pkgEnvSavedConfig, showPackageEnvironment,
userPackageEnvironmentFile )
import Distribution.Client.Sandbox.Types
( SandboxPackageInfo(..) )
import Distribution.Solver.Types.ConstraintSource
import Distribution.Solver.Types.LabeledPackageConstraint
......@@ -77,15 +75,14 @@ freeze :: Verbosity
-> Compiler
-> Platform
-> ProgramDb
-> Maybe SandboxPackageInfo
-> GlobalFlags
-> FreezeFlags
-> IO ()
freeze verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
freeze verbosity packageDBs repoCtxt comp platform progdb
globalFlags freezeFlags = do
pkgs <- getFreezePkgs
verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
verbosity packageDBs repoCtxt comp platform progdb
globalFlags freezeFlags
if null pkgs
......@@ -109,11 +106,10 @@ getFreezePkgs :: Verbosity
-> Compiler
-> Platform
-> ProgramDb
-> Maybe SandboxPackageInfo
-> GlobalFlags
-> FreezeFlags
-> IO [SolverPlanPackage]
getFreezePkgs verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
getFreezePkgs verbosity packageDBs repoCtxt comp platform progdb
globalFlags freezeFlags = do
installedPkgIndex <- getInstalledPackages verbosity comp packageDBs progdb
......@@ -127,7 +123,7 @@ getFreezePkgs verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
sanityCheck pkgSpecifiers
planPackages
verbosity comp platform mSandboxPkgInfo freezeFlags
verbosity comp platform freezeFlags
installedPkgIndex sourcePkgDb pkgConfigDb pkgSpecifiers
where
sanityCheck pkgSpecifiers = do
......@@ -141,14 +137,13 @@ getFreezePkgs verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
planPackages :: Verbosity
-> Compiler
-> Platform
-> Maybe SandboxPackageInfo
-> FreezeFlags
-> InstalledPackageIndex
-> SourcePackageDb
-> PkgConfigDb
-> [PackageSpecifier UnresolvedSourcePackage]
-> IO [SolverPlanPackage]
planPackages verbosity comp platform mSandboxPkgInfo freezeFlags
planPackages verbosity comp platform freezeFlags
installedPkgIndex sourcePkgDb pkgConfigDb pkgSpecifiers = do
solver <- chooseSolver verbosity
......@@ -196,8 +191,6 @@ planPackages verbosity comp platform mSandboxPkgInfo freezeFlags
in LabeledPackageConstraint pc ConstraintSourceFreeze
| pkgSpecifier <- pkgSpecifiers ]
. maybe id applySandboxInstallPolicy mSandboxPkgInfo
$ standardInstallPolicy installedPkgIndex sourcePkgDb pkgSpecifiers
logMsg message rest = debug verbosity message >> rest
......
......@@ -23,8 +23,6 @@ import Distribution.Client.Init
( incVersion )
import Distribution.Client.Freeze
( getFreezePkgs )
import Distribution.Client.Sandbox.Types
( SandboxPackageInfo(..) )
import Distribution.Client.Setup
( GlobalFlags(..), FreezeFlags(..), RepoContext )
import Distribution.Package
......@@ -103,13 +101,10 @@ genBounds
-> Compiler
-> Platform
-> ProgramDb
-> Maybe SandboxPackageInfo
-> GlobalFlags
-> FreezeFlags
-> IO ()
genBounds verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
globalFlags freezeFlags = do
genBounds verbosity packageDBs repoCtxt comp platform progdb globalFlags freezeFlags = do
let cinfo = compilerInfo comp
cwd <- getCurrentDirectory
......@@ -133,7 +128,7 @@ genBounds verbosity packageDBs repoCtxt comp platform progdb mSandboxPkgInfo
go needBounds = do
pkgs <- getFreezePkgs
verbosity packageDBs repoCtxt comp platform progdb
mSandboxPkgInfo globalFlags freezeFlags
globalFlags freezeFlags
putStrLn boundsNeededMsg
......
......@@ -59,7 +59,6 @@ data GlobalFlags = GlobalFlags {
globalVersion :: Flag Bool,
globalNumericVersion :: Flag Bool,
globalConfigFile :: Flag FilePath,
globalSandboxConfigFile :: Flag FilePath,
globalConstraintsFile :: Flag FilePath,
globalRemoteRepos :: NubList RemoteRepo, -- ^ Available Hackage servers.
globalCacheDir :: Flag FilePath,
......@@ -67,8 +66,6 @@ data GlobalFlags = GlobalFlags {
globalLocalNoIndexRepos :: NubList LocalRepo,
globalLogsDir :: Flag FilePath,
globalWorldFile :: Flag FilePath,
globalRequireSandbox :: Flag Bool,
globalIgnoreSandbox :: Flag Bool,
globalIgnoreExpiry :: Flag Bool, -- ^ Ignore security expiry dates
globalHttpTransport :: Flag String,
globalNix :: Flag Bool, -- ^ Integrate with Nix
......@@ -81,7 +78,6 @@ defaultGlobalFlags = GlobalFlags {
globalVersion = Flag False,
globalNumericVersion = Flag False,
globalConfigFile = mempty,
globalSandboxConfigFile = mempty,
globalConstraintsFile = mempty,
globalRemoteRepos = mempty,
globalCacheDir = mempty,
......@@ -89,8 +85,6 @@ defaultGlobalFlags = GlobalFlags {
globalLocalNoIndexRepos = mempty,
globalLogsDir = mempty,
globalWorldFile = mempty,
globalRequireSandbox = Flag False,
globalIgnoreSandbox = Flag False,
globalIgnoreExpiry = Flag False,
globalHttpTransport = mempty,
globalNix = Flag False,
......
......@@ -37,7 +37,6 @@ module Distribution.Client.IndexUtils (
updatePackageIndexCacheFile,
writeIndexTimestamp,
currentIndexTimestamp,
readCacheStrict, -- only used by soon-to-be-obsolete sandbox code
BuildTreeRefType(..), refTypeFromTypeCode, typeCodeFromRefType
) where
......@@ -328,13 +327,6 @@ instance Monoid RepoData where
mempty = RepoData mempty mempty mempty
mappend = (<>)
readCacheStrict :: NFData pkg => Verbosity -> Index -> (PackageEntry -> pkg) -> IO ([pkg], [Dependency])
readCacheStrict verbosity index mkPkg = do
updateRepoIndexCache verbosity index
cache <- readIndexCache verbosity index
withFile (indexFile index) ReadMode $ \indexHnd ->
evaluate . force =<< packageListFromCache verbosity mkPkg indexHnd cache
-- | Read a repository index from disk, from the local file specified by
-- the 'Repo'.
--
......
......@@ -35,7 +35,6 @@ import Distribution.Utils.Generic(safeLast)
import qualified Data.List.NonEmpty as NE
import qualified Data.Map as Map
import qualified Data.Set as S
import Control.Exception as Exception
( Exception(toException), bracket, catches
, Handler(Handler), handleJust, IOException, SomeException )
......@@ -84,11 +83,6 @@ import Distribution.Client.Setup
, filterTestFlags )
import Distribution.Client.Config
( getCabalDir, defaultUserInstall )
import Distribution.Client.Sandbox.Timestamp
( withUpdateTimestamps )
import Distribution.Client.Sandbox.Types
( SandboxPackageInfo(..), UseSandbox(..), isUseSandbox
, whenUsingSandbox )
import Distribution.Client.Tar (extractTarGzFile)
import Distribution.Client.Types as Source
import Distribution.Client.BuildReports.Types
......@@ -167,7 +161,7 @@ import Distribution.Simple.Utils as Utils
, withTempDirectory )
import Distribution.Client.Utils
( determineNumJobs, logDirChange, mergeBy, MergeResult(..)
, tryCanonicalizePath, ProgressPhase(..), progressMessage )
, ProgressPhase(..), progressMessage )
import Distribution.System
( Platform, OS(Windows), buildOS, buildPlatform )
import Distribution.Verbosity as Verbosity
......@@ -201,8 +195,6 @@ install
-> Compiler
-> Platform
-> ProgramDb
-> UseSandbox
-> Maybe SandboxPackageInfo
-> GlobalFlags
-> ConfigFlags
-> ConfigExFlags
......@@ -212,7 +204,7 @@ install
-> BenchmarkFlags
-> [UserTarget]
-> IO ()
install verbosity packageDBs repos comp platform progdb useSandbox mSandboxPkgInfo
install verbosity packageDBs repos comp platform progdb
globalFlags configFlags configExFlags installFlags
haddockFlags testFlags benchmarkFlags userTargets0 = do
......@@ -222,7 +214,6 @@ install verbosity packageDBs repos comp platform progdb useSandbox mSandboxPkgIn
++ " (if you didn't type --root-cmd, comment out root-cmd"
++ " in your ~/.cabal/config file)"
let userOrSandbox = fromFlag (configUserInstall configFlags)
|| isUseSandbox useSandbox
unless userOrSandbox $
warn verbosity $ "the --global flag is deprecated -- "
++ "it is generally considered a bad idea to install packages "
......@@ -240,18 +231,12 @@ install verbosity packageDBs repos comp platform progdb useSandbox mSandboxPkgIn
processInstallPlan verbosity args installContext installPlan
where
args :: InstallArgs
args = (packageDBs, repos, comp, platform, progdb, useSandbox,
mSandboxPkgInfo, globalFlags, configFlags, configExFlags,
args = (packageDBs, repos, comp, platform, progdb,
globalFlags, configFlags, configExFlags,
installFlags, haddockFlags, testFlags, benchmarkFlags)
die'' message = die' verbosity (message ++ if isUseSandbox useSandbox
then installFailedInSandbox else [])
-- TODO: use a better error message, remove duplication.
installFailedInSandbox =
"\nNote: when using a sandbox, all packages are required to have "
++ "consistent dependencies. "
++ "Try reinstalling/unregistering the offending packages or "
++ "recreating the sandbox."
die'' = die' verbosity
logMsg message rest = debugNoWrap verbosity message >> rest
-- TODO: Make InstallContext a proper data type with documented fields.
......@@ -269,8 +254,6 @@ type InstallArgs = ( PackageDBStack
, Compiler
, Platform
, ProgramDb
, UseSandbox
, Maybe SandboxPackageInfo
, GlobalFlags
, ConfigFlags
, ConfigExFlags
......@@ -283,7 +266,7 @@ type InstallArgs = ( PackageDBStack
makeInstallContext :: Verbosity -> InstallArgs -> Maybe [UserTarget]
-> IO InstallContext
makeInstallContext verbosity
(packageDBs, repoCtxt, comp, _, progdb,_,_,
(packageDBs, repoCtxt, comp, _, progdb,
globalFlags, _, configExFlags, installFlags, _, _, _) mUserTargets = do
let idxState = flagToMaybe (installIndexState installFlags)
......@@ -321,7 +304,7 @@ makeInstallContext verbosity
makeInstallPlan :: Verbosity -> InstallArgs -> InstallContext
-> IO (Progress String String SolverInstallPlan)
makeInstallPlan verbosity
(_, _, comp, platform, _, _, mSandboxPkgInfo,
(_, _, comp, platform,_,
_, configFlags, configExFlags, installFlags,
_, _, _)
(installedPkgIndex, sourcePkgDb, pkgConfigDb,
......@@ -330,7 +313,7 @@ makeInstallPlan verbosity
solver <- chooseSolver verbosity (fromFlag (configSolver configExFlags))
(compilerInfo comp)
notice verbosity "Resolving dependencies..."
return $ planPackages verbosity comp platform mSandboxPkgInfo solver
return $ planPackages verbosity comp platform solver
configFlags configExFlags installFlags
installedPkgIndex sourcePkgDb pkgConfigDb pkgSpecifiers
......@@ -339,7 +322,7 @@ processInstallPlan :: Verbosity -> InstallArgs -> InstallContext
-> SolverInstallPlan
-> IO ()
processInstallPlan verbosity
args@(_,_, _, _, _, _, _, _, configFlags, _, installFlags, _, _, _)
args@(_,_, _, _, _, _, configFlags, _, installFlags, _, _, _)
(installedPkgIndex, sourcePkgDb, _,
userTargets, pkgSpecifiers, _) installPlan0 = do
......@@ -362,7 +345,6 @@ processInstallPlan verbosity
planPackages :: Verbosity
-> Compiler
-> Platform
-> Maybe SandboxPackageInfo
-> Solver
-> ConfigFlags
-> ConfigExFlags
......@@ -372,7 +354,7 @@ planPackages :: Verbosity
-> PkgConfigDb
-> [PackageSpecifier UnresolvedSourcePackage]
-> Progress String String SolverInstallPlan
planPackages verbosity comp platform mSandboxPkgInfo solver
planPackages verbosity comp platform solver
configFlags configExFlags installFlags
installedPkgIndex sourcePkgDb pkgConfigDb pkgSpecifiers =
......@@ -445,8 +427,6 @@ planPackages verbosity comp platform mSandboxPkgInfo solver
in LabeledPackageConstraint pc ConstraintSourceConfigFlagOrTarget