Commit 87b650d7 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub
Browse files

Merge pull request #4185 from hvr/pr/issue-4098

Mark `template-haskell` non-upgradable (again)
parents 49ecb690 0eb4e517
......@@ -348,8 +348,14 @@ dontUpgradeNonUpgradeablePackages params =
(PackageConstraintInstalled pkgname)
ConstraintSourceNonUpgradeablePackage
| Set.notMember (mkPackageName "base") (depResolverTargets params)
, pkgname <- map mkPackageName [ "base", "ghc-prim", "integer-gmp"
, "integer-simple" ]
-- If you change this enumeration, make sure to update the list in
-- "Distribution.Solver.Modular.Solver" as well
, pkgname <- [ mkPackageName "base"
, mkPackageName "ghc-prim"
, mkPackageName "integer-gmp"
, mkPackageName "integer-simple"
, mkPackageName "template-haskell"
]
, isInstalled pkgname ]
isInstalled = not . null
......
......@@ -130,11 +130,14 @@ solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals =
validateLinking idx .
validateTree cinfo idx pkgConfigDB
prunePhase = (if asBool (avoidReinstalls sc) then P.avoidReinstalls (const True) else id) .
-- packages that can never be "upgraded":
-- packages that can never be "upgraded"
-- If you change this enumeration, make sure to update the list in
-- "Distribution.Client.Dependency" as well
P.requireInstalled (`elem` [ mkPackageName "base"
, mkPackageName "ghc-prim"
, mkPackageName "integer-gmp"
, mkPackageName "integer-simple"
, mkPackageName "template-haskell"
])
buildPhase = traceTree "build.json" id
$ buildTree idx (independentGoals sc) (S.toList userGoals)
......
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