Commit 64d70f85 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Rename that function again.

parent 270957ea
...@@ -37,7 +37,7 @@ module Distribution.Client.Dependency ( ...@@ -37,7 +37,7 @@ module Distribution.Client.Dependency (
applySandboxInstallPolicy, applySandboxInstallPolicy,
-- ** Extra policy options -- ** Extra policy options
dontUpgradeBuiltinPackages, dontUpgradeNonUpgradeablePackages,
hideBrokenInstalledPackages, hideBrokenInstalledPackages,
upgradeDependencies, upgradeDependencies,
reinstallTargets, reinstallTargets,
...@@ -223,8 +223,8 @@ setMaxBackjumps n params = ...@@ -223,8 +223,8 @@ setMaxBackjumps n params =
-- | Some packages are specific to a given compiler version and should never be -- | Some packages are specific to a given compiler version and should never be
-- upgraded. -- upgraded.
dontUpgradeBuiltinPackages :: DepResolverParams -> DepResolverParams dontUpgradeNonUpgradeablePackages :: DepResolverParams -> DepResolverParams
dontUpgradeBuiltinPackages params = dontUpgradeNonUpgradeablePackages params =
addConstraints extraConstraints params addConstraints extraConstraints params
where where
extraConstraints = extraConstraints =
...@@ -481,7 +481,7 @@ resolveDependencies :: Platform ...@@ -481,7 +481,7 @@ resolveDependencies :: Platform
-> DepResolverParams -> DepResolverParams
-> Progress String String InstallPlan -> Progress String String InstallPlan
--TODO: is this needed here? see dontUpgradeBuiltinPackages --TODO: is this needed here? see dontUpgradeNonUpgradeablePackages
resolveDependencies platform comp _solver params resolveDependencies platform comp _solver params
| null (depResolverTargets params) | null (depResolverTargets params)
= return (mkInstallPlan platform comp []) = return (mkInstallPlan platform comp [])
...@@ -503,7 +503,7 @@ resolveDependencies platform comp solver params = ...@@ -503,7 +503,7 @@ resolveDependencies platform comp solver params =
indGoals indGoals
noReinstalls noReinstalls
shadowing shadowing
maxBkjumps = dontUpgradeBuiltinPackages maxBkjumps = dontUpgradeNonUpgradeablePackages
-- TODO: -- TODO:
-- The modular solver can properly deal with broken -- The modular solver can properly deal with broken
-- packages and won't select them. So the -- packages and won't select them. So the
......
Markdown is supported
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