Commit 2c22c0ea authored by tibbe's avatar tibbe
Browse files

Merge branch '1.20'

Post cabal-install-1.20.0.3 release.

Conflicts:
	Cabal/Cabal.cabal
	Cabal/Makefile
	cabal-install/cabal-install.cabal
parents 5c46e785 17cb4729
name: Cabal
<<<<<<< HEAD
version: 1.21.0.0
=======
version: 1.20.0.1
>>>>>>> 1.20
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
......
......@@ -32,6 +32,16 @@ simplifyVar (P qpn) = P qpn
simplifyVar (F (FN pi _)) = F (FN pi (mkFlag "flag"))
simplifyVar (S qsn) = S qsn
-- | For computing conflict sets, we map flag choice vars to a
-- single flag choice. This means that all flag choices are treated
-- as interdependent. So if one flag of a package ends up in a
-- conflict set, then all flags are being treated as being part of
-- the conflict set.
simplifyVar :: Var qpn -> Var qpn
simplifyVar (P qpn) = P qpn
simplifyVar (F (FN pi _)) = F (FN pi (mkFlag "flag"))
simplifyVar (S qsn) = S qsn
showVar :: Var QPN -> String
showVar (P qpn) = showQPN qpn
showVar (F qfn) = showQFN qfn
......
-*-change-log-*-
1.20.0.3 Johan Tibell <johan.tibell@gmail.com> June 2014
* Don't attempt to rename dist if it is already named correctly
* Treat all flags of a package as interdependent.
* Allow template-haskell to be upgradable again
1.20.0.2 Johan Tibell <johan.tibell@gmail.com> May 2014
* Increase max-backjumps to 2000.
* Fix solver bug which led to missed install plans.
......
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