[commit: ghc] master: Update Cabal to HEAD, IPID renamed to Component ID. (5b0191f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5b0191f74ab05b187f81ea037623338a615b1619/ghc

>---------------------------------------------------------------

commit 5b0191f74ab05b187f81ea037623338a615b1619
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Aug 25 11:24:28 2015 -0700

    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 at 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


>---------------------------------------------------------------

5b0191f74ab05b187f81ea037623338a615b1619
 compiler/ghci/Linker.hs                            |   3 +-
 compiler/main/DynFlags.hs                          |   3 +-
 compiler/main/HscTypes.hs                          |  11 +-
 compiler/main/PackageConfig.hs                     |   1 -
 compiler/main/Packages.hs                          | 260 +++++++--------------
 libraries/Cabal                                    |   2 +-
 libraries/ghc-boot/GHC/PackageDb.hs                |  23 +-
 rts/package.conf.in                                |   2 +-
 testsuite/.gitignore                               |   1 +
 testsuite/tests/cabal/Makefile                     |  40 ++--
 testsuite/tests/cabal/T1750A.pkg                   |   1 -
 testsuite/tests/cabal/T1750B.pkg                   |   1 -
 testsuite/tests/cabal/T5442d.stdout                |   4 +-
 testsuite/tests/cabal/cabal03/Makefile             |   4 +-
 testsuite/tests/cabal/cabal06/Makefile             |  12 +-
 testsuite/tests/cabal/cabal07/all.T                |   5 +-
 testsuite/tests/cabal/cabal07/cabal07.stderr       |   2 +-
 testsuite/tests/cabal/ghcpkg01.stdout              |  30 ++-
 testsuite/tests/cabal/ghcpkg03.stderr              |   6 +-
 testsuite/tests/cabal/ghcpkg05.stderr              |  25 +-
 testsuite/tests/cabal/shadow.stderr                |   8 +-
 testsuite/tests/cabal/shadow.stdout                |  11 +-
 testsuite/tests/cabal/shadow1.pkg                  |   3 +-
 testsuite/tests/cabal/shadow2.pkg                  |   2 +-
 testsuite/tests/cabal/shadow3.pkg                  |   5 +-
 testsuite/tests/cabal/shadow4.pkg                  |   6 +
 testsuite/tests/cabal/test.pkg                     |   4 +-
 testsuite/tests/cabal/test2.pkg                    |   4 +-
 testsuite/tests/cabal/test3.pkg                    |   2 +-
 testsuite/tests/cabal/test4.pkg                    |   2 +-
 testsuite/tests/cabal/test5.pkg                    |   4 +-
 testsuite/tests/cabal/test7a.pkg                   |   4 +-
 testsuite/tests/cabal/test7b.pkg                   |   4 +-
 testsuite/tests/cabal/testdup.pkg                  |   2 +-
 testsuite/tests/ghci/scripts/T5979.stderr          |   8 +-
 testsuite/tests/ghci/scripts/all.T                 |   5 +-
 testsuite/tests/rename/prog006/Makefile            |   6 +-
 .../safeHaskell/check/pkg01/ImpSafeOnly07.stderr   |   4 +-
 .../safeHaskell/check/pkg01/ImpSafeOnly08.stderr   |   8 +-
 testsuite/tests/safeHaskell/check/pkg01/all.T      |   7 +-
 .../tests/safeHaskell/check/pkg01/safePkg01.stdout |   6 +-
 testsuite/tests/th/TH_Roles2.stderr                |   6 +-
 utils/ghc-cabal/Main.hs                            |  56 ++---
 utils/ghc-pkg/Main.hs                              | 132 +++++------
 44 files changed, 324 insertions(+), 411 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5b0191f74ab05b187f81ea037623338a615b1619