LHC doesn't build with the latest Cabal HEAD (1.7.4)

[alexShpilkin]

LHC (as of September 19) doesn't build with the latest Cabal.

$ runhaskell Setup build
Preprocessing executables for lhc-0.9...
Building lhc-0.9...
<lines omitted>
[2 of 2] Compiling Main             ( lhc-pkg/Main.hs, dist/build/lhc-pkg/lhc-pkg-tmp/Main.o )

lhc-pkg/Main.hs:612:36: Not in scope: `package'

lhc-pkg/Main.hs:612:50: Not in scope: `package'

lhc-pkg/Main.hs:626:30: Not in scope: `package'
<etc. About 20 similar errors total>

Simply replacing 'package' with 'sourcePackageId' doesn't work: Cabal seems to have changed package dependency handing a bit:

[2 of 2] Compiling Main             ( lhc-pkg/Main.hs, dist/build/lhc-pkg/lhc-pkg-tmp/Main.o )

lhc-pkg/Main.hs:520:53:
    No instance for (PackageFixedDeps InstalledPackageInfo)
      arising from a use of `depends' at lhc-pkg/Main.hs:520:53-63
    Possible fix:
      add an instance declaration for
      (PackageFixedDeps InstalledPackageInfo)
    In the second argument of `filter', namely `(depends pkg)'
    In the expression: filter (not . realVersion) (depends pkg)
    In the definition of `unversioned_deps':
        unversioned_deps = filter (not . realVersion) (depends pkg)