[commit: ghc] master: Bump version to 8.5 (d6fccfb)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d6fccfb2ba087abfdd4a68b13165e1312f9af022/ghc

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

commit d6fccfb2ba087abfdd4a68b13165e1312f9af022
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 29 09:54:14 2017 -0500

    Bump version to 8.5
    
    The ghc-8.4 branch has now been cut. Updates the haddock submodule.


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

d6fccfb2ba087abfdd4a68b13165e1312f9af022
 configure.ac                                      | 2 +-
 iserv/iserv-bin.cabal                             | 6 +++---
 libraries/template-haskell/template-haskell.cabal | 2 +-
 utils/haddock                                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index d67e5bd..6733385 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.3], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.5], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index 846a111..a713e6f 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -85,7 +85,7 @@ Library
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.3,
+                   ghci       == 8.5,
                    network    >= 2.6 && < 2.7,
                    directory  >= 1.3 && < 1.4,
                    filepath   >= 1.4 && < 1.5
@@ -112,7 +112,7 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.3
+                   ghci       == 8.5
 
     if os(windows)
         Cpp-Options: -DWINDOWS
@@ -133,7 +133,7 @@ Executable iserv-proxy
                   bytestring >= 0.10 && < 0.11,
                   containers >= 0.5 && < 0.6,
                   deepseq    >= 1.4 && < 1.5,
-                  ghci       == 8.3,
+                  ghci       == 8.5,
                   directory  >= 1.3 && < 1.4,
                   network    >= 2.6,
                   filepath   >= 1.4 && < 1.5,
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 887865d..7770a38 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -52,7 +52,7 @@ Library
 
     build-depends:
         base        >= 4.9 && < 4.12,
-        ghc-boot-th == 8.3,
+        ghc-boot-th == 8.5,
         pretty      == 1.1.*
 
     ghc-options: -Wall
diff --git a/utils/haddock b/utils/haddock
index ae0d140..aaf0733 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit ae0d140334fff57f2737dbd7c5804b4868d9c3ab
+Subproject commit aaf07338cbfec7df69532a4d1e8a0f21c9a1cfde