From 59baa2f45aedc036b462ac1981a7c3591e9aa427 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Thu, 9 Jun 2011 01:04:15 +0200 Subject: Remove -fglasgow-exts for deriving Data/Typeable needed with ghc-6.6 Ignore-this: 8f9e33a86a9919406792383c49ac4555 This gets rid of a warning with ghc-7.0.2, and -XDeriveDataTypeable seems to have been added with 6.8, which should be far back enough: http://www.haskell.org/ghc/docs/6.8-latest/html/users_guide/deriving.html#deriving-typeable darcs-hash:20110608230415-1499c-2929ccda56381f501e548f5a00e7d8f03e80c016 --- XMonad/Core.hs | 4 +--- XMonad/Layout.hs | 3 +-- XMonad/Operations.hs | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/XMonad/Core.hs b/XMonad/Core.hs index 765985f..ba12455 100644 --- a/XMonad/Core.hs +++ b/XMonad/Core.hs @@ -1,7 +1,5 @@ {-# LANGUAGE ExistentialQuantification, FlexibleInstances, GeneralizedNewtypeDeriving, - MultiParamTypeClasses, TypeSynonymInstances, CPP #-} --- required for deriving Typeable -{-# OPTIONS_GHC -fglasgow-exts #-} + MultiParamTypeClasses, TypeSynonymInstances, CPP, DeriveDataTypeable #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout.hs b/XMonad/Layout.hs index a8821d5..8eff488 100644 --- a/XMonad/Layout.hs +++ b/XMonad/Layout.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} +{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances, DeriveDataTypeable #-} -- -------------------------------------------------------------------------- -- | diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index e26d733..f89c5ef 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -1,5 +1,4 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} -- -------------------------------------------------------------------------- -- cgit v1.2.3