[commit: ghc] wip/annotate-core: Add text dependency (5d0551b)

[git at git.haskell.org]

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

On branch  : wip/annotate-core
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d0551be7c8b4106e67938d9958bac20abd657c0/ghc

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

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

    Add text dependency


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

5d0551be7c8b4106e67938d9958bac20abd657c0
 .gitmodules              | 4 ++++
 compiler/ghc.cabal.in    | 1 +
 compiler/main/HscMain.hs | 1 +
 ghc.mk                   | 3 ++-
 ghc/Main.hs              | 1 +
 ghc/ghc-bin.cabal.in     | 1 +
 libraries/text           | 1 +
 packages                 | 1 +
 8 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 55d360a..5a2e8e0 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 f40c8ba..aff9ee4 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 c514e5b..0f99909 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -166,6 +166,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.mk b/ghc.mk
index 4eb1658..3aae89b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -430,7 +430,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 Cabal/Cabal hpc ghc-boot-th ghc-boot transformers template-haskell ghci
+PACKAGES_STAGE0 = binary Cabal/Cabal hpc ghc-boot-th ghc-boot transformers template-haskell ghci text
 ifeq "$(Windows_Host)" "NO"
 PACKAGES_STAGE0 += terminfo
 endif
@@ -463,6 +463,7 @@ PACKAGES_STAGE1 += ghc-boot
 PACKAGES_STAGE1 += template-haskell
 PACKAGES_STAGE1 += transformers
 PACKAGES_STAGE1 += ghc-compact
+PACKAGES_STAGE1 += text
 
 ifeq "$(HADDOCK_DOCS)" "YES"
 PACKAGES_STAGE1 += xhtml
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 b04c13a..011cf4a 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@
 
diff --git a/libraries/text b/libraries/text
new file mode 160000
index 0000000..f127122
--- /dev/null
+++ b/libraries/text
@@ -0,0 +1 @@
+Subproject commit f12712241987d5b8f0ebb1bdcd64edfc26ea582e
diff --git a/packages b/packages
index 6ee8071..054626a 100644
--- a/packages
+++ b/packages
@@ -55,6 +55,7 @@ libraries/hpc                -           -                               -
 libraries/pretty             -           -                               https://github.com/haskell/pretty.git
 libraries/process            -           -                               ssh://git@github.com/haskell/process.git
 libraries/terminfo           -           -                               https://github.com/judah/terminfo.git
+libraries/text               -           -                               https://github.com/bollu/text
 libraries/time               -           -                               https://github.com/haskell/time.git
 libraries/transformers       -           -                               https://git.haskell.org/darcs-mirrors/transformers.git
 libraries/unix               -           -                               ssh://git@github.com/haskell/unix.git