From 197d776e08d85a0bb008636a29b0276e81933de1 Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Wed, 20 Sep 2017 13:44:42 +0100 Subject: [PATCH] servant-foreign: Move -XDeriveDataTypeable to servant-foreign.cabal --- servant-foreign/servant-foreign.cabal | 9 +++++---- servant-foreign/src/Servant/Foreign/Internal.hs | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index a89aeff9..93776a19 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -47,20 +47,21 @@ library if impl(ghc >= 8.0) ghc-options: -Wno-redundant-constraints include-dirs: include - default-extensions: CPP - , ConstraintKinds + default-extensions: ConstraintKinds + , CPP , DataKinds + , DeriveDataTypeable , FlexibleContexts , FlexibleInstances , GeneralizedNewtypeDeriving , MultiParamTypeClasses + , OverloadedStrings + , PolyKinds , ScopedTypeVariables , TemplateHaskell , TypeFamilies , TypeOperators , UndecidableInstances - , OverloadedStrings - , PolyKinds test-suite spec diff --git a/servant-foreign/src/Servant/Foreign/Internal.hs b/servant-foreign/src/Servant/Foreign/Internal.hs index aa72b25f..8cde7d52 100644 --- a/servant-foreign/src/Servant/Foreign/Internal.hs +++ b/servant-foreign/src/Servant/Foreign/Internal.hs @@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveDataTypeable #-} #if !MIN_VERSION_base(4,8,0) {-# LANGUAGE NullaryTypeClasses #-} #endif