[commit: ghc] wip/prettyprinter: Add pretty-printer dependency (6778e70)
git at git.haskell.org
git at git.haskell.org
Wed Aug 16 22:47:34 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/prettyprinter
Link : http://ghc.haskell.org/trac/ghc/changeset/6778e709d4c4c1d963a6a7352a73470dff182d75/ghc
>---------------------------------------------------------------
commit 6778e709d4c4c1d963a6a7352a73470dff182d75
Author: Ben Gamari <ben at smart-cactus.org>
Date: Sat Jun 24 10:05:14 2017 -0400
Add pretty-printer dependency
>---------------------------------------------------------------
6778e709d4c4c1d963a6a7352a73470dff182d75
.gitmodules | 3 +++
compiler/ghc.cabal.in | 2 ++
ghc.mk | 3 ++-
ghc/ghc-bin.cabal.in | 2 ++
libraries/Cabal | 2 +-
libraries/Win32 | 2 +-
libraries/binary | 2 +-
libraries/deepseq | 2 +-
libraries/parallel | 2 +-
libraries/prettyprinter-core | 1 +
libraries/process | 2 +-
libraries/text | 2 +-
libraries/time | 2 +-
libraries/unix | 2 +-
libraries/xhtml | 2 +-
nofib | 2 +-
packages | 1 +
utils/haddock | 2 +-
18 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 9e0e805..9b75158 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -129,3 +129,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 152e156..a14297b 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -62,6 +62,8 @@ Library
template-haskell == 2.12.*,
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 55cc119..774753c 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 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
@@ -469,6 +469,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 b04c13a..74793bc 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -34,6 +34,8 @@ Executable ghc
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
filepath >= 1 && < 1.5,
+ text == 1.2.*,
+ prettyprinter == 1.1.*,
ghc-boot == @ProjectVersionMunged@,
ghc == @ProjectVersionMunged@
diff --git a/libraries/Cabal b/libraries/Cabal
index 082cf20..ece0273 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 082cf2066b7206d3b12a9f92d832236e2484b4c1
+Subproject commit ece0273b48b7ff19fff6cd82913717d86d3ffbfa
diff --git a/libraries/Win32 b/libraries/Win32
index 147a0af..b5ebb64 160000
--- a/libraries/Win32
+++ b/libraries/Win32
@@ -1 +1 @@
-Subproject commit 147a0af92ac74ec58b209e16aeb1cf03bddf9482
+Subproject commit b5ebb64894cf166f9ee84ee91802486c76e480cf
diff --git a/libraries/binary b/libraries/binary
index d4a030a..0147456 160000
--- a/libraries/binary
+++ b/libraries/binary
@@ -1 +1 @@
-Subproject commit d4a030ab448191f664fc734bfbee61450a6fa5af
+Subproject commit 0147456b11c38d1121fd84a2b53effefde111240
diff --git a/libraries/deepseq b/libraries/deepseq
index 0b22c98..65dd864 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit 0b22c9825ef79c1ee41d2f19e7c997f5cdc93494
+Subproject commit 65dd864d0d2f5cf415064fc214261b9270a924cf
diff --git a/libraries/parallel b/libraries/parallel
index d2e2a5e..040c4f0 160000
--- a/libraries/parallel
+++ b/libraries/parallel
@@ -1 +1 @@
-Subproject commit d2e2a5e630fdfa0e9bc8c2d8c7d134ad3500b5de
+Subproject commit 040c4f0226a5a9a1e720d89a9e1239028d9f62d9
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/libraries/process b/libraries/process
index 423a9ef..88547b0 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 423a9efa8b1b22304af0acc8b950289026b288eb
+Subproject commit 88547b0fae8644f8f69be32c7ee5a3b76051c82f
diff --git a/libraries/text b/libraries/text
index 1707aa5..f127122 160000
--- a/libraries/text
+++ b/libraries/text
@@ -1 +1 @@
-Subproject commit 1707aa5f2ad5c254c45ac9ffcac749e4d6b67a6e
+Subproject commit f12712241987d5b8f0ebb1bdcd64edfc26ea582e
diff --git a/libraries/time b/libraries/time
index 1fcaa07..d03429e 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 1fcaa07e10d7966356373ed0e946eb078fcdd6e6
+Subproject commit d03429e1913b6babd3b59d0bfdd7d3904b1b6f0b
diff --git a/libraries/unix b/libraries/unix
index 063aea3..eb5fc94 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 063aea3fbc5a8caa03d0deb9a887763006ab86df
+Subproject commit eb5fc942f8f570e754bba0f57a8fdaec3400194f
diff --git a/libraries/xhtml b/libraries/xhtml
index 6358594..8a8c8a4 160000
--- a/libraries/xhtml
+++ b/libraries/xhtml
@@ -1 +1 @@
-Subproject commit 6358594eb5139f6760e2ada72718d69fed5a1015
+Subproject commit 8a8c8a48bac2d3ed306b610a2e9fa393b5a7ffa5
diff --git a/nofib b/nofib
index 63ce82a..eccf532 160000
--- a/nofib
+++ b/nofib
@@ -1 +1 @@
-Subproject commit 63ce82acf38ef20d20fde6e80c5075c14fe8246c
+Subproject commit eccf532410eee45f30c07f389f7029871fd603db
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
diff --git a/utils/haddock b/utils/haddock
index c8a01b8..7cecbd9 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit c8a01b83be52e45d3890db173ffe7b09ccd4f351
+Subproject commit 7cecbd969298d5aa576750864a69fa5f70f71c32
More information about the ghc-commits
mailing list