From 64d70f85d70054c6b8afba7195e0b9890ec87b62 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Thu, 10 Apr 2014 04:08:45 +0200
Subject: [PATCH] Rename that function again.
---
cabal-install/Distribution/Client/Dependency.hs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
index e0ba82bd88..d2e35d1300 100644
--- a/cabal-install/Distribution/Client/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency.hs
@@ -37,7 +37,7 @@ module Distribution.Client.Dependency (
applySandboxInstallPolicy,
-- ** Extra policy options
- dontUpgradeBuiltinPackages,
+ dontUpgradeNonUpgradeablePackages,
hideBrokenInstalledPackages,
upgradeDependencies,
reinstallTargets,
@@ -223,8 +223,8 @@ setMaxBackjumps n params =
-- | Some packages are specific to a given compiler version and should never be
-- upgraded.
-dontUpgradeBuiltinPackages :: DepResolverParams -> DepResolverParams
-dontUpgradeBuiltinPackages params =
+dontUpgradeNonUpgradeablePackages :: DepResolverParams -> DepResolverParams
+dontUpgradeNonUpgradeablePackages params =
addConstraints extraConstraints params
where
extraConstraints =
@@ -481,7 +481,7 @@ resolveDependencies :: Platform
-> DepResolverParams
-> Progress String String InstallPlan
- --TODO: is this needed here? see dontUpgradeBuiltinPackages
+ --TODO: is this needed here? see dontUpgradeNonUpgradeablePackages
resolveDependencies platform comp _solver params
| null (depResolverTargets params)
= return (mkInstallPlan platform comp [])
@@ -503,7 +503,7 @@ resolveDependencies platform comp solver params =
indGoals
noReinstalls
shadowing
- maxBkjumps = dontUpgradeBuiltinPackages
+ maxBkjumps = dontUpgradeNonUpgradeablePackages
-- TODO:
-- The modular solver can properly deal with broken
-- packages and won't select them. So the
--
GitLab