Update cabal build

The test suite still won't build (probably because of a bug in Cabal I'm still investigating), but git-annex now compiles fine.