Adapt to Cabal library changes
Adapt to Cabal library changes

sdiehl/ghc,sdiehl/ghc,sdiehl/ghc,snowleopard/hadrian,izgzhen/hadrian,bgamari/shaking-up-ghc,sdiehl/ghc,sdiehl/ghc,sdiehl/ghc,snowleopard/shaking-up-ghc,sdiehl/ghc