Use ghcjs/cabal git repo instead of the fixed patch (but rebase it onto the upstream haskell master branch).  Tries to make it possible to rerun stage2_cabal.sh if it fails.