template-haskell: Drop use of Rank2Types/PolymorphicComponents
authorHerbert Valerio Riedel <hvr@gnu.org>
Tue, 8 Mar 2016 11:42:32 +0000 (12:42 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Tue, 8 Mar 2016 11:42:32 +0000 (12:42 +0100)
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.

libraries/template-haskell/Language/Haskell/TH/Syntax.hs
libraries/template-haskell/template-haskell.cabal

index a3284c5..86242aa 100644 (file)
@@ -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)
index b96e122..7241708 100644 (file)
@@ -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.*