[commit: ghc] wip/prettyprinter: Add text dependency (d93019e)

[git at git.haskell.org]

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

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

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

commit d93019e9f9651055548b925f01a702270af7de6e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Jun 22 11:59:32 2017 -0400

    Add text dependency


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

d93019e9f9651055548b925f01a702270af7de6e
 .gitmodules              | 4 ++++
 compiler/ghc.cabal.in    | 1 +
 compiler/main/HscMain.hs | 1 +
 ghc/Main.hs              | 1 +
 ghc/ghc-bin.cabal.in     | 1 +
 5 files changed, 8 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 9e0e805..bd386b1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,10 @@
 	path = libraries/bytestring
 	url = ../packages/bytestring.git
 	ignore = untracked
+[submodule "libraries/text"]
+	path = libraries/text
+	url = https://github.com/bollu/text.git
+	ignore = untracked
 [submodule "libraries/Cabal"]
 	path = libraries/Cabal
 	url = ../packages/Cabal.git
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 247d2ee..60df429 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -62,6 +62,7 @@ Library
                    template-haskell == 2.12.*,
                    hpc        == 0.6.*,
                    transformers == 0.5.*,
+                   text          == 1.2.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc-boot-th == @ProjectVersionMunged@,
                    ghci == @ProjectVersionMunged@
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index e99ca31..30b9410 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -167,6 +167,7 @@ import qualified Data.Map as Map
 import qualified Data.Set as S
 import Data.Set (Set)
 
+import qualified Data.Text as DontUseText
 #include "HsVersions.h"
 
 
diff --git a/ghc/Main.hs b/ghc/Main.hs
index a75aba3..ef05846 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -73,6 +73,7 @@ import Control.Monad
 import Data.Char
 import Data.List
 import Data.Maybe
+import qualified Data.Text as DontUseText
 
 -----------------------------------------------------------------------------
 -- ToDo:
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 5fe7c9d..aa5b02c 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -34,6 +34,7 @@ Executable ghc
                    directory  >= 1   && < 1.4,
                    process    >= 1   && < 1.7,
                    filepath   >= 1   && < 1.5,
+                   text       == 1.2.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc        == @ProjectVersionMunged@