version bumps for base and Cabal This reverts commit 083d826dd60e6a529308f038d8fa6a1900729a3f. Conflicts: ghc.spec