New GHC doesn't need AutoDeriveTypeable

phadej · phadej · commit 0dec80956278 · 2019-08-27T12:06:27.000+03:00
diff --git a/cabal.project b/cabal.project
@@ -1 +1 @@
-packages: sop-core/ generics-sop/
+packages: sop-core/ generics-sop/
diff --git a/generics-sop/generics-sop.cabal b/generics-sop/generics-sop.cabal
@@ -90,7 +90,10 @@ library
                        KindSignatures
                        DataKinds
                        FunctionalDependencies
-                       AutoDeriveTypeable
+
+  if impl(ghc <8.2)
+    default-extensions: AutoDeriveTypeable
+
   -- if impl(ghc >= 8.6)
   --   default-extensions: NoStarIsType
   other-extensions:    PolyKinds
diff --git a/sop-core/sop-core.cabal b/sop-core/sop-core.cabal
@@ -64,7 +64,10 @@ library
                        KindSignatures
                        DataKinds
                        FunctionalDependencies
-                       AutoDeriveTypeable
+
+  if impl(ghc <8.2)
+    default-extensions: AutoDeriveTypeable
+
   -- if impl(ghc >= 8.6)
   --   default-extensions: NoStarIsType
   other-extensions:    PolyKinds

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-packages: sop-core/ generics-sop/`
	`1`	`+packages: sop-core/ generics-sop/`