diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /utils/ghc-pkg/ghc-pkg.cabal | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-5a1b4f814f74ec1c48152d97523744518e212777.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'utils/ghc-pkg/ghc-pkg.cabal')
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal index 317aab7cfa..742e2962ef 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -25,7 +25,7 @@ Executable ghc-pkg filepath, Cabal, binary, - bin-package-db, + ghc-boot, bytestring if !os(windows) Build-Depends: unix, |