patch applied (cabal): Merge PackageSet and PackageIndex