diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-06-24 10:05:14 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-07-20 22:45:15 -0400 |
| commit | f3de97f67bbcf5edbcb56c9b4b8d593ea8d1c139 (patch) | |
| tree | 80d0730c6d5d3781395a723273f81a626bbf1d29 | |
| parent | 5d0551be7c8b4106e67938d9958bac20abd657c0 (diff) | |
| download | haskell-f3de97f67bbcf5edbcb56c9b4b8d593ea8d1c139.tar.gz | |
Add pretty-printer dependency
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | compiler/ghc.cabal.in | 1 | ||||
| -rw-r--r-- | ghc.mk | 3 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 1 | ||||
| m--------- | libraries/prettyprinter-core | 0 | ||||
| -rw-r--r-- | packages | 1 |
6 files changed, 8 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 5a2e8e0158..05ca581cad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -125,3 +125,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 aff9ee4243..4f2db5e4a5 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@ @@ -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 text +PACKAGES_STAGE0 = binary Cabal/Cabal hpc ghc-boot-th ghc-boot transformers template-haskell ghci text prettyprinter-core ifeq "$(Windows_Host)" "NO" PACKAGES_STAGE0 += terminfo endif @@ -464,6 +464,7 @@ PACKAGES_STAGE1 += template-haskell PACKAGES_STAGE1 += transformers PACKAGES_STAGE1 += ghc-compact PACKAGES_STAGE1 += text +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 011cf4a547..74793bc4b7 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 +Subproject 8697cc9cfe6937d6479396a96c600a4b6d556ab @@ -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 |