patch applied (cabal-install): Rename and rearrange the PackagePreferences type