configure: Bump version to 8.6.0

Bumps haddock submodule.

7 files changed, 11 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index 09889abeaf..622ec96daf 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.5], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.6.0], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal
index dc3076de54..8cf7c41c72 100644
--- a/libraries/libiserv/libiserv.cabal
+++ b/libraries/libiserv/libiserv.cabal
@@ -1,5 +1,5 @@
 Name: libiserv
-Version: 8.5
+Version: 8.6.1
 Copyright: XXX
 License: BSD3
 License-File: LICENSE
@@ -25,7 +25,7 @@ Library
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.5.*
+                   ghci       == 8.6.*
     if flag(network)
        Exposed-Modules: Remote.Message
                       , Remote.Slave
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index f265e07650..590babd2f4 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.13,
-        ghc-boot-th == 8.5,
+        ghc-boot-th == 8.6.*,
         pretty      == 1.1.*
 
     ghc-options: -Wall
diff --git a/testsuite/tests/ghci/should_fail/all.T b/testsuite/tests/ghci/should_fail/all.T
index d62c3baa6a..01e5c36579 100644
--- a/testsuite/tests/ghci/should_fail/all.T
+++ b/testsuite/tests/ghci/should_fail/all.T
@@ -1,4 +1,4 @@
 test('T10549', [], ghci_script, ['T10549.script'])
 test('T10549a', [], ghci_script, ['T10549a.script'])
 test('T14608', [], ghci_script, ['T14608.script'])
-test('T15055', [], ghci_script, ['T15055.script'])
+test('T15055', normalise_version('ghc'), ghci_script, ['T15055.script'])
diff --git a/utils/haddock b/utils/haddock
-Subproject d58fff78de7d48546a22392cefdd0abab1f1cce
+Subproject 5e3cf5d8868323079ff5494a8225b0467404a5d
diff --git a/utils/iserv-proxy/iserv-proxy.cabal b/utils/iserv-proxy/iserv-proxy.cabal
index 1d1a2d499f..5d276b244d 100644
--- a/utils/iserv-proxy/iserv-proxy.cabal
+++ b/utils/iserv-proxy/iserv-proxy.cabal
@@ -1,5 +1,5 @@
 Name: iserv-proxy
-Version: 8.5
+Version: 8.6
 Copyright: XXX
 License: BSD3
 -- XXX License-File: LICENSE
@@ -71,8 +71,8 @@ Executable iserv-proxy
                   bytestring >= 0.10 && < 0.11,
                   containers >= 0.5 && < 0.6,
                   deepseq    >= 1.4 && < 1.5,
-                  ghci       == 8.5,
                   directory  >= 1.3 && < 1.4,
                   network    >= 2.6,
                   filepath   >= 1.4 && < 1.5,
-                  libiserv   == 8.5
+                  ghci       == 8.6.*,
+                  libiserv   == 8.6.*
diff --git a/utils/iserv/iserv.cabal b/utils/iserv/iserv.cabal
index f02d208262..405b26f0d8 100644
--- a/utils/iserv/iserv.cabal
+++ b/utils/iserv/iserv.cabal
@@ -1,5 +1,5 @@
 Name: iserv
-Version: 8.5
+Version: 8.6.1
 Copyright: XXX
 License: BSD3
 -- XXX License-File: LICENSE
@@ -35,8 +35,8 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.5.*,
-                   libiserv   == 8.5
+                   ghci       == 8.6.*,
+                   libiserv   == 8.6.*
 
     if os(windows)
         Cpp-Options: -DWINDOWS