Fix hyphenated packages

This is a fix for packages with names like `haskell-ghc-paths`, where their hyphens were replaced by commas, causing them not to be found correctly.

Also included `ghc` in the list of `--distro-pkg` packages as some hackage packages have a dependency on `ghc` (like hdevtools)