cabal: rebase against current upstream

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>