From d6fccfb2ba087abfdd4a68b13165e1312f9af022 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 29 Nov 2017 09:54:14 -0500
Subject: [PATCH] Bump version to 8.5
The ghc-8.4 branch has now been cut. Updates the haddock submodule.
---
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 d67e5bd9a66a..6733385b2b9e 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@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.5], [glasgow-haskell-bugs@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 846a111fd14e..a713e6fbdb4e 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 887865d35ecf..7770a3840527 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 ae0d140334ff..aaf07338cbfe 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit ae0d140334fff57f2737dbd7c5804b4868d9c3ab
+Subproject commit aaf07338cbfec7df69532a4d1e8a0f21c9a1cfde
--
GitLab