summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--iserv/iserv-bin.cabal2
-rw-r--r--libraries/template-haskell/Language/Haskell/TH/Lib.hs2
-rw-r--r--libraries/template-haskell/template-haskell.cabal2
m---------utils/haddock0
5 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 9864f3290f..736c124ce6 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 eb332771bf..5307e7fc0e 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 a3cbc8efb5..860ccc3f63 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 71e5e02b8b..dfb3b079b3 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
-Subproject dbbdabfd3842f70c78d4c64e10f75f47fe5c0f5
+Subproject 9acb2890cdb4369f3bb7fda899ff4d3526040e7