[commit: ghc] wip/prettyprinter: Add pretty-printer dependency (6148f5a)

[git at git.haskell.org]

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

On branch  : wip/prettyprinter
Link       : http://ghc.haskell.org/trac/ghc/changeset/6148f5a7e33b916281beaf68148294df5da454a3/ghc

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

commit 6148f5a7e33b916281beaf68148294df5da454a3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jun 24 10:05:14 2017 -0400

    Add pretty-printer dependency


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

6148f5a7e33b916281beaf68148294df5da454a3
 .gitmodules                  | 3 +++
 compiler/ghc.cabal.in        | 1 +
 ghc.mk                       | 3 ++-
 ghc/ghc-bin.cabal.in         | 1 +
 libraries/prettyprinter-core | 1 +
 packages                     | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index bd386b1..0ed88ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -133,3 +133,6 @@
 [submodule ".arc-linters/arcanist-external-json-linter"]
 	path = .arc-linters/arcanist-external-json-linter
 	url = ../arcanist-external-json-linter.git
+[submodule "libraries/prettyprinter-core"]
+	path = libraries/prettyprinter-core
+	url = https://github.com/bollu/prettyprinter-core.git
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 60df429..df9ff12 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -63,6 +63,7 @@ Library
                    hpc        == 0.6.*,
                    transformers == 0.5.*,
                    text          == 1.2.*,
+                   prettyprinter == 1.1.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc-boot-th == @ProjectVersionMunged@,
                    ghci == @ProjectVersionMunged@
diff --git a/ghc.mk b/ghc.mk
index 1e37209..8d44590 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -420,7 +420,7 @@ else # CLEANING
 # programs such as GHC and ghc-pkg, that we do not assume the stage0
 # compiler already has installed (or up-to-date enough).
 
-PACKAGES_STAGE0 = binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghci
+PACKAGES_STAGE0 = binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghci prettyprinter-core
 ifeq "$(Windows_Host)" "NO"
 PACKAGES_STAGE0 += terminfo
 endif
@@ -459,6 +459,7 @@ PACKAGES_STAGE1 += ghc-boot-th
 PACKAGES_STAGE1 += ghc-boot
 PACKAGES_STAGE1 += template-haskell
 PACKAGES_STAGE1 += ghc-compact
+PACKAGES_STAGE1 += prettyprinter-core
 
 ifeq "$(HADDOCK_DOCS)" "YES"
 PACKAGES_STAGE1 += xhtml
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index aa5b02c..385c9f2a 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -35,6 +35,7 @@ Executable ghc
                    process    >= 1   && < 1.7,
                    filepath   >= 1   && < 1.5,
                    text       == 1.2.*,
+                   prettyprinter == 1.1.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc        == @ProjectVersionMunged@
 
diff --git a/libraries/prettyprinter-core b/libraries/prettyprinter-core
new file mode 160000
index 0000000..8697cc9
--- /dev/null
+++ b/libraries/prettyprinter-core
@@ -0,0 +1 @@
+Subproject commit 8697cc9cfe6937d6479396a96c600a4b6d556ab5
diff --git a/packages b/packages
index 9af1b64..62a3373 100644
--- a/packages
+++ b/packages
@@ -41,6 +41,7 @@ ghc-tarballs                 windows     ghc-tarballs.git                -
 libffi-tarballs              -           -                               -
 utils/hsc2hs                 -           -                               -
 utils/haddock                -           -                               ssh://git@github.com/haskell/haddock.git
+libraries/prettyprinter-core -           -                               https://github.com/bollu/prettyprinter-core.git
 libraries/array              -           -                               -
 libraries/binary             -           -                               https://github.com/kolmodin/binary.git
 libraries/bytestring         -           -                               https://github.com/haskell/bytestring.git