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

Allow template-haskell to be upgradable again

This partly reverts 65e9b88b
which marked `template-haskell` non-upgradable. However, since are now
able to fix-up wrong .cabal meta-data on Hackage, previous `template-haskell`
releases have been augmented by proper version bounds so that it's now
safe again to let the Cabal solver handle reinstalling `template-haskell`

See also #1811, #667, #1761, and #1444
parent 78c0428f
...@@ -258,7 +258,7 @@ dontUpgradeNonUpgradeablePackages params = ...@@ -258,7 +258,7 @@ dontUpgradeNonUpgradeablePackages params =
[ PackageConstraintInstalled pkgname [ PackageConstraintInstalled pkgname
| all (/=PackageName "base") (depResolverTargets params) | all (/=PackageName "base") (depResolverTargets params)
, pkgname <- map PackageName [ "base", "ghc-prim", "integer-gmp" , pkgname <- map PackageName [ "base", "ghc-prim", "integer-gmp"
, "integer-simple", "template-haskell" ] , "integer-simple" ]
, 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.
......
...@@ -56,6 +56,5 @@ solve sc idx userPrefs userConstraints userGoals = ...@@ -56,6 +56,5 @@ solve sc idx userPrefs userConstraints userGoals =
, PackageName "ghc-prim" , PackageName "ghc-prim"
, PackageName "integer-gmp" , PackageName "integer-gmp"
, PackageName "integer-simple" , PackageName "integer-simple"
, PackageName "template-haskell"
]) ])
buildPhase = buildTree idx (independentGoals sc) userGoals buildPhase = buildTree idx (independentGoals sc) userGoals
Supports Markdown
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