[commit: ghc] master: template-haskell: Drop use of Rank2Types/PolymorphicComponents (1a9734a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1a9734a69260e69943c00755952edd7185dcc484/ghc

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

commit 1a9734a69260e69943c00755952edd7185dcc484
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Mar 8 12:42:32 2016 +0100

    template-haskell: Drop use of Rank2Types/PolymorphicComponents
    
    As per #6032, `Rank2Types` and `PolymorphicComponents` have been
    deprecated in favour of `RankNTypes`.
    
    also update `other-extensions` in template-haskell.cabal flag to
    reflect reality.


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

1a9734a69260e69943c00755952edd7185dcc484
 libraries/template-haskell/Language/Haskell/TH/Syntax.hs |  5 ++---
 libraries/template-haskell/template-haskell.cabal        | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
index a3284c5..86242aa 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
@@ -1,8 +1,7 @@
-{-# LANGUAGE CPP, DeriveDataTypeable, PolymorphicComponents,
+{-# LANGUAGE CPP, DeriveDataTypeable,
              DeriveGeneric, FlexibleInstances, DefaultSignatures,
-             ScopedTypeVariables, Rank2Types #-}
+             RankNTypes, RoleAnnotations, ScopedTypeVariables #-}
 
-{-# LANGUAGE RoleAnnotations #-}
 {-# OPTIONS_GHC -fno-warn-inline-rule-shadowing #-}
 
 #if MIN_VERSION_base(4,8,0)
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index b96e122..7241708 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -26,13 +26,15 @@ source-repository head
 Library
     default-language: Haskell2010
     other-extensions:
+        BangPatterns
+        CPP
+        DefaultSignatures
         DeriveDataTypeable
+        DeriveGeneric
         FlexibleInstances
-        MagicHash
-        PolymorphicComponents
         RankNTypes
+        RoleAnnotations
         ScopedTypeVariables
-        UnboxedTuples
 
     exposed-modules:
         Language.Haskell.TH
@@ -47,7 +49,7 @@ Library
         Language.Haskell.TH.Lib.Map
 
     build-depends:
-        base       >= 4.6 && < 4.10,
+        base       >= 4.8 && < 4.10,
         ghc-boot   == 8.1,
         pretty     == 1.1.*