[commit: ghc] master: Bump GHC HEAD's Version from 7.11 to 8.1 (947c8a5)

[git at git.haskell.org]

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

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

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

commit 947c8a530e2f977f56601289e1b11cde42f95322
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 30 17:28:13 2015 +0100

    Bump GHC HEAD's Version from 7.11 to 8.1
    
    This updates the haddock submodule


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

947c8a530e2f977f56601289e1b11cde42f95322
 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 f5d624d..0ff4769 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], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.1], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # 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 c7bd823..a770b4f 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -23,4 +23,4 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       >= 7.11 && < 8.1
+                   ghci       == 8.1
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index 3d77a4a..0dcf81a 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -478,7 +478,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__ > 800
+#if __GLASGOW_HASKELL__ >= 802
 #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 ff9fe05..aae8afe 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -48,7 +48,7 @@ Library
 
     build-depends:
         base       >= 4.6 && < 4.10,
-        ghc-boot   >= 7.11 && < 8.1,
+        ghc-boot   == 8.1,
         pretty     == 1.1.*
 
     -- We need to set the unit ID to template-haskell (without a
diff --git a/utils/haddock b/utils/haddock
index 80f2f98..6ddd758 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 80f2f9805b61e8cea291bae8ce22db626dc11f21
+Subproject commit 6ddd758be0e7b50bd19d33400b3c3013d60786cb