Partially fix #9003 by reverting bad numbering.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
(cherry picked from commit 5f3c5384df59717ca8013c5df8d1f65692867825)
Avoid NondecreasingIndentation syntax in ghc-pkg

This also makes ghc-pkg.cabal `default-extensions`-free

NB: Printing this commit via `git show --ignore-all-spaces` shows the
    only non-whitespaces changes are in `ghc-pkg.cabal`

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
(cherry picked from commit 913b3146541e203b2524e756b047b7f90be849b7)

Conflicts:
	utils/ghc-pkg/ghc-pkg.cabal