Fix variable names for haskell-cabal-{compile,test}-cmd

Oops, I missed two variable names when renaming from haskell-* to haskell-cabal-*