patches applied to yi / cabal-make.inc