relax upstream depends
Revert "relax upstream depends"

This reverts commit 4b044b24d8ddfeed053bb5522e8cefb20a19f6de.
Add command line options for controlling ghc and cabal paths