From 99b956ef1d4bbb2252c0bbaa956094c2f837d111 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Mon, 21 Dec 2015 18:37:37 +0100 Subject: [PATCH] Fix-up GHC 7.12 artifacts The haddock submodule also still assumed that GHC 7.12 would be the next major release (rather than GHC 8.0) --- libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +- utils/haddock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs index 96a58a3a73..71e614b1ac 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs @@ -471,7 +471,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__ > 712 +#if __GLASGOW_HASKELL__ > 800 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD #endif diff --git a/utils/haddock b/utils/haddock index 105869f209..a8d1ea9a67 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit 105869f209f49721794e3ff5e35822178db72895 +Subproject commit a8d1ea9a6735209746b184001e40da26a83f0509 -- GitLab