Update Cabal to HEAD, IPID renamed to Component ID.
authorEdward Z. Yang <ezyang@cs.stanford.edu>
Tue, 25 Aug 2015 18:24:28 +0000 (11:24 -0700)
committerEdward Z. Yang <ezyang@cs.stanford.edu>
Thu, 15 Oct 2015 04:39:47 +0000 (21:39 -0700)
commit5b0191f74ab05b187f81ea037623338a615b1619
tree5f46c51ec53b5ecf16e4ca224aa13d19ebbe9df3
parent729bf08e8311736aec7dc894b640a3a8d7dd24ad
Update Cabal to HEAD, IPID renamed to Component ID.

This commit contains a Cabal submodule update which unifies installed
package IDs and package keys under a single notion, a Component ID.
We update GHC to keep follow this unification.  However, this commit
does NOT rename installed package ID to component ID and package key to
unit ID; the plan is to do that in a companion commit.

    - Compiler info now has "Requires unified installed package IDs"

    - 'exposed' is now expected to contain unit keys, not IPIDs.

    - Shadowing is no more.  We now just have a very simple strategy
      to deal with duplicate unit keys in combined package databases:
      if their ABIs are the same, use the latest one; otherwise error.
      Package databases maintain the invariant that there can only
      be one entry of a unit ID.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate

Reviewers: simonpj, austin, bgamari, hvr, goldfire

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1184

GHC Trac Issues: #10714
44 files changed:
compiler/ghci/Linker.hs
compiler/main/DynFlags.hs
compiler/main/HscTypes.hs
compiler/main/PackageConfig.hs
compiler/main/Packages.hs
libraries/Cabal
libraries/ghc-boot/GHC/PackageDb.hs
rts/package.conf.in
testsuite/.gitignore
testsuite/tests/cabal/Makefile
testsuite/tests/cabal/T1750A.pkg
testsuite/tests/cabal/T1750B.pkg
testsuite/tests/cabal/T5442d.stdout
testsuite/tests/cabal/cabal03/Makefile
testsuite/tests/cabal/cabal06/Makefile
testsuite/tests/cabal/cabal07/all.T
testsuite/tests/cabal/cabal07/cabal07.stderr
testsuite/tests/cabal/ghcpkg01.stdout
testsuite/tests/cabal/ghcpkg03.stderr
testsuite/tests/cabal/ghcpkg05.stderr
testsuite/tests/cabal/shadow.stderr
testsuite/tests/cabal/shadow.stdout
testsuite/tests/cabal/shadow1.pkg
testsuite/tests/cabal/shadow2.pkg
testsuite/tests/cabal/shadow3.pkg
testsuite/tests/cabal/shadow4.pkg [new file with mode: 0644]
testsuite/tests/cabal/test.pkg
testsuite/tests/cabal/test2.pkg
testsuite/tests/cabal/test3.pkg
testsuite/tests/cabal/test4.pkg
testsuite/tests/cabal/test5.pkg
testsuite/tests/cabal/test7a.pkg
testsuite/tests/cabal/test7b.pkg
testsuite/tests/cabal/testdup.pkg
testsuite/tests/ghci/scripts/T5979.stderr
testsuite/tests/ghci/scripts/all.T
testsuite/tests/rename/prog006/Makefile
testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
testsuite/tests/safeHaskell/check/pkg01/all.T
testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
testsuite/tests/th/TH_Roles2.stderr
utils/ghc-cabal/Main.hs
utils/ghc-pkg/Main.hs