From a6e06c7b6ac9d0eb54f09721dbac9b1bed4c8c32 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 9 Mar 2017 13:01:03 -0500
Subject: [PATCH] configure.ac: Bump version to 8.3
Bumps haddock submodule
---
configure.ac | 2 +-
iserv/iserv-bin.cabal | 2 +-
libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +-
libraries/template-haskell/template-haskell.cabal | 2 +-
utils/haddock | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9864f3290fc..736c124ce6b 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.1], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.3], [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 eb332771bf5..5307e7fc0ea 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -24,7 +24,7 @@ Executable iserv
bytestring >= 0.10 && < 0.11,
containers >= 0.5 && < 0.6,
deepseq >= 1.4 && < 1.5,
- ghci == 8.1
+ ghci == 8.3
if os(windows)
Cpp-Options: -DWINDOWS
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index a3cbc8efb52..860ccc3f639 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -608,7 +608,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
-- 3. remove the FamFlavour data type from Syntax module
-- 4. make sure that all references to FamFlavour are gone from DsMeta,
-- Convert, TcSplice (follows from 3)
-#if __GLASGOW_HASKELL__ >= 802
+#if __GLASGOW_HASKELL__ >= 804
#error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD
#endif
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 71e5e02b8ba..dfb3b079b37 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -50,7 +50,7 @@ Library
build-depends:
base >= 4.8 && < 4.11,
- ghc-boot-th == 8.1,
+ ghc-boot-th == 8.3,
pretty == 1.1.*
-- We need to set the unit ID to template-haskell (without a
diff --git a/utils/haddock b/utils/haddock
index dbbdabfd384..9acb2890cdb 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit dbbdabfd3842f70c78d4c64e10f75f47fe5c0f5d
+Subproject commit 9acb2890cdb4369f3bb7fda899ff4d3526040e7d
--
GitLab