[cvs-nhc98] patch applied (nhc98): remove fps from default-packages, and get Cabal head rather than branch