cleanup 2/haskell
3/haskell
fix (1|2)/haskell cabal files