Commit 65e9b88b authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Add `integer-{gmp,simple}` and `template-haskell` to list of non-upgradables

This is related to #667 and similiar issues
parent 3c7a7408
...@@ -228,7 +228,8 @@ dontUpgradeBasePackage params = ...@@ -228,7 +228,8 @@ dontUpgradeBasePackage params =
extraConstraints = extraConstraints =
[ PackageConstraintInstalled pkgname [ PackageConstraintInstalled pkgname
| all (/=PackageName "base") (depResolverTargets params) | all (/=PackageName "base") (depResolverTargets params)
, pkgname <- [ PackageName "base", PackageName "ghc-prim" ] , pkgname <- map PackageName [ "base", "ghc-prim", "integer-gmp"
, "integer-simple", "template-haskell" ]
, isInstalled pkgname ] , isInstalled pkgname ]
-- TODO: the top down resolver chokes on the base constraints -- TODO: the top down resolver chokes on the base constraints
-- below when there are no targets and thus no dep on base. -- below when there are no targets and thus no dep on base.
......
...@@ -49,6 +49,10 @@ solve sc idx userPrefs userConstraints userGoals = ...@@ -49,6 +49,10 @@ solve sc idx userPrefs userConstraints userGoals =
validateTree idx validateTree idx
prunePhase = (if avoidReinstalls sc then P.avoidReinstalls (const True) else id) . prunePhase = (if avoidReinstalls sc then P.avoidReinstalls (const True) else id) .
-- packages that can never be "upgraded": -- packages that can never be "upgraded":
P.requireInstalled (`elem` [PackageName "base", P.requireInstalled (`elem` [ PackageName "base"
PackageName "ghc-prim"]) , PackageName "ghc-prim"
, PackageName "integer-gmp"
, PackageName "integer-simple"
, PackageName "template-haskell"
])
buildPhase = buildTree idx (independentGoals sc) userGoals buildPhase = buildTree idx (independentGoals sc) 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