From 34e09e3e84debcb8395947a4f05e12250a8e2f5c Mon Sep 17 00:00:00 2001
From: Johan Tibell <johan.tibell@gmail.com>
Date: Sat, 24 May 2014 08:16:13 +0200
Subject: [PATCH] Fix compilation issue due to merge
---
cabal-install/Distribution/Client/Dependency.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
index eb3ae61be5..67d4994688 100644
--- a/cabal-install/Distribution/Client/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency.hs
@@ -422,7 +422,7 @@ resolveDependencies platform comp solver params =
noReinstalls
shadowing
strFlags
- maxBkjumps = dontUpgradeNonUpgradeablePackages
+ maxBkjumps = dontUpgradeBasePackage
-- TODO:
-- The modular solver can properly deal with broken
-- packages and won't select them. So the
--
GitLab