Skip to content
Snippets Groups Projects
Commit c6858567 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Rename a function.

parent 65e9b88b
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ module Distribution.Client.Dependency ( ...@@ -37,7 +37,7 @@ module Distribution.Client.Dependency (
applySandboxInstallPolicy, applySandboxInstallPolicy,
-- ** Extra policy options -- ** Extra policy options
dontUpgradeBasePackage, dontUpgradeBuiltinPackages,
hideBrokenInstalledPackages, hideBrokenInstalledPackages,
upgradeDependencies, upgradeDependencies,
reinstallTargets, reinstallTargets,
...@@ -221,8 +221,10 @@ setMaxBackjumps n params = ...@@ -221,8 +221,10 @@ setMaxBackjumps n params =
depResolverMaxBackjumps = n depResolverMaxBackjumps = n
} }
dontUpgradeBasePackage :: DepResolverParams -> DepResolverParams -- | Some packages are specific to a given compiler version and should never be
dontUpgradeBasePackage params = -- upgraded.
dontUpgradeBuiltinPackages :: DepResolverParams -> DepResolverParams
dontUpgradeBuiltinPackages params =
addConstraints extraConstraints params addConstraints extraConstraints params
where where
extraConstraints = extraConstraints =
...@@ -479,7 +481,7 @@ resolveDependencies :: Platform ...@@ -479,7 +481,7 @@ resolveDependencies :: Platform
-> DepResolverParams -> DepResolverParams
-> Progress String String InstallPlan -> Progress String String InstallPlan
--TODO: is this needed here? see dontUpgradeBasePackage --TODO: is this needed here? see dontUpgradeBuiltinPackages
resolveDependencies platform comp _solver params resolveDependencies platform comp _solver params
| null (depResolverTargets params) | null (depResolverTargets params)
= return (mkInstallPlan platform comp []) = return (mkInstallPlan platform comp [])
...@@ -501,7 +503,7 @@ resolveDependencies platform comp solver params = ...@@ -501,7 +503,7 @@ resolveDependencies platform comp solver params =
indGoals indGoals
noReinstalls noReinstalls
shadowing shadowing
maxBkjumps = dontUpgradeBasePackage maxBkjumps = dontUpgradeBuiltinPackages
-- 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment