From e34001dcb3f98f25bec28f639b34e0175032e8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9cate=20Moonlight?=
<Kleidukos@users.noreply.github.com>
Date: Thu, 20 Jul 2023 16:11:16 +0000
Subject: [PATCH] Fix conflicts
---
.../src/Distribution/Client/Dependency.hs | 5 --
.../Distribution/Solver/Modular/Solver.hs | 50 -------------------
2 files changed, 55 deletions(-)
diff --git a/cabal-install/src/Distribution/Client/Dependency.hs b/cabal-install/src/Distribution/Client/Dependency.hs
index 682983c880..09ea454822 100644
--- a/cabal-install/src/Distribution/Client/Dependency.hs
+++ b/cabal-install/src/Distribution/Client/Dependency.hs
@@ -413,10 +413,6 @@ dontUpgradeNonUpgradeablePackages params =
. InstalledPackageIndex.lookupPackageName
(depResolverInstalledPkgIndex params)
-<<<<<<< HEAD
-addSourcePackages :: [UnresolvedSourcePackage]
- -> DepResolverParams -> DepResolverParams
-=======
-- | The set of non-reinstallable packages includes those which cannot be
-- rebuilt using a GHC installation and Hackage-published source distribution.
-- There are a few reasons why this might be true:
@@ -454,7 +450,6 @@ addSourcePackages
:: [UnresolvedSourcePackage]
-> DepResolverParams
-> DepResolverParams
->>>>>>> 2e32a44f2 (cabal-install: Fix non-reinstallable package set)
addSourcePackages pkgs params =
params {
depResolverSourcePkgIndex =
diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
index 49be06b9e4..599c76f711 100644
--- a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
+++ b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
@@ -26,44 +26,6 @@ import UnitTests.Distribution.Solver.Modular.DSL
import UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils
tests :: [TF.TestTree]
-<<<<<<< HEAD
-tests = [
- testGroup "Simple dependencies" [
- runTest $ mkTest db1 "alreadyInstalled" ["A"] (solverSuccess [])
- , runTest $ mkTest db1 "installLatest" ["B"] (solverSuccess [("B", 2)])
- , runTest $ preferOldest
- $ mkTest db1 "installOldest" ["B"] (solverSuccess [("B", 1)])
- , runTest $ mkTest db1 "simpleDep1" ["C"] (solverSuccess [("B", 1), ("C", 1)])
- , runTest $ mkTest db1 "simpleDep2" ["D"] (solverSuccess [("B", 2), ("D", 1)])
- , runTest $ mkTest db1 "failTwoVersions" ["C", "D"] anySolverFailure
- , runTest $ indep $ mkTest db1 "indepTwoVersions" ["C", "D"] (solverSuccess [("B", 1), ("B", 2), ("C", 1), ("D", 1)])
- , runTest $ indep $ mkTest db1 "aliasWhenPossible1" ["C", "E"] (solverSuccess [("B", 1), ("C", 1), ("E", 1)])
- , runTest $ indep $ mkTest db1 "aliasWhenPossible2" ["D", "E"] (solverSuccess [("B", 2), ("D", 1), ("E", 1)])
- , runTest $ indep $ mkTest db2 "aliasWhenPossible3" ["C", "D"] (solverSuccess [("A", 1), ("A", 2), ("B", 1), ("B", 2), ("C", 1), ("D", 1)])
- , runTest $ mkTest db1 "buildDepAgainstOld" ["F"] (solverSuccess [("B", 1), ("E", 1), ("F", 1)])
- , runTest $ mkTest db1 "buildDepAgainstNew" ["G"] (solverSuccess [("B", 2), ("E", 1), ("G", 1)])
- , runTest $ indep $ mkTest db1 "multipleInstances" ["F", "G"] anySolverFailure
- , runTest $ mkTest db21 "unknownPackage1" ["A"] (solverSuccess [("A", 1), ("B", 1)])
- , runTest $ mkTest db22 "unknownPackage2" ["A"] (solverFailure (isInfixOf "unknown package: C"))
- , runTest $ mkTest db23 "unknownPackage3" ["A"] (solverFailure (isInfixOf "unknown package: B"))
- , runTest $ mkTest [] "unknown target" ["A"] (solverFailure (isInfixOf "unknown package: A"))
- ]
- , testGroup "Flagged dependencies" [
- runTest $ mkTest db3 "forceFlagOn" ["C"] (solverSuccess [("A", 1), ("B", 1), ("C", 1)])
- , runTest $ mkTest db3 "forceFlagOff" ["D"] (solverSuccess [("A", 2), ("B", 1), ("D", 1)])
- , runTest $ indep $ mkTest db3 "linkFlags1" ["C", "D"] anySolverFailure
- , runTest $ indep $ mkTest db4 "linkFlags2" ["C", "D"] anySolverFailure
- , runTest $ indep $ mkTest db18 "linkFlags3" ["A", "B"] (solverSuccess [("A", 1), ("B", 1), ("C", 1), ("D", 1), ("D", 2), ("F", 1)])
- ]
- , testGroup "Lifting dependencies out of conditionals" [
- runTest $ commonDependencyLogMessage "common dependency log message"
- , runTest $ twoLevelDeepCommonDependencyLogMessage "two level deep common dependency log message"
- , runTest $ testBackjumpingWithCommonDependency "backjumping with common dependency"
- ]
- , testGroup "Manual flags" [
- runTest $ mkTest dbManualFlags "Use default value for manual flag" ["pkg"] $
- solverSuccess [("pkg", 1), ("true-dep", 1)]
-=======
tests =
[ testGroup
"Simple dependencies"
@@ -891,7 +853,6 @@ tests =
[ -- See issue #3203. The solver should only choose a version for A once.
runTest $
let db = [Right $ exAv "A" 1 []]
->>>>>>> 249374d16 (Fix tests)
, let checkFullLog =
any $ isInfixOf "rejecting: pkg:-flag (manual flag can only be changed explicitly)"
@@ -1960,21 +1921,10 @@ dbBase = [
]
dbNonupgrade :: ExampleDb
-<<<<<<< HEAD
-dbNonupgrade = [
- Left $ exInst "ghc" 1 "ghc-1" []
- , Left $ exInst "ghci" 1 "ghci-1" []
- , Left $ exInst "ghc-boot" 1 "ghc-boot-1" []
-=======
dbNonupgrade =
[ Left $ exInst "ghc" 1 "ghc-1" []
->>>>>>> 249374d16 (Fix tests)
, Right $ exAv "ghc" 2 []
- , Right $ exAv "ghci" 2 []
- , Right $ exAv "ghc-boot" 2 []
, Right $ exAv "A" 1 [ExFix "ghc" 2]
- , Right $ exAv "B" 1 [ExFix "ghci" 2]
- , Right $ exAv "C" 1 [ExFix "ghc-boot" 2]
]
db13 :: ExampleDb
--
GitLab