Allow template-haskell to be upgradable again

This partly reverts 65e9b88 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 haskell#1811, haskell#667, haskell#1761, and haskell#1444
hvr · Jun 9, 2014 · 65ae95c · 65ae95c
1 parent 78c0428
commit 65ae95c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
@@ -258,7 +258,7 @@ dontUpgradeNonUpgradeablePackages params =
       [ PackageConstraintInstalled pkgname
       | all (/=PackageName "base") (depResolverTargets params)
       , pkgname <- map PackageName [ "base", "ghc-prim", "integer-gmp"
-                                   , "integer-simple", "template-haskell" ]
+                                   , "integer-simple" ]
       , isInstalled pkgname ]
     -- TODO: the top down resolver chokes on the base constraints
     -- below when there are no targets and thus no dep on base.

diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs b/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
@@ -56,6 +56,5 @@ solve sc idx userPrefs userConstraints userGoals =
                                                   , PackageName "ghc-prim"
                                                   , PackageName "integer-gmp"
                                                   , PackageName "integer-simple"
-                                                  , PackageName "template-haskell"
                                                   ])
     buildPhase       = buildTree idx (independentGoals sc) userGoals