Flattened directory structure. Required type families

ekmett · Jun 17, 2010 · 6347b17 · 6347b17
1 parent 9116b67
commit 6347b17
Show file tree

Hide file tree

Showing 119 changed files with 16 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.45.0
+------
+* Removed workarounds for GHC 6.8
+
 0.44.5
 ------
 

diff --git a/src/Control/Allegory.hs → Control/Allegory.hs b/src/Control/Allegory.hs → Control/Allegory.hs
diff --git a/src/Control/Applicative/Parameterized.hs → Control/Applicative/Parameterized.hs b/src/Control/Applicative/Parameterized.hs → Control/Applicative/Parameterized.hs
diff --git a/src/Control/Arrow/BiKleisli.hs → Control/Arrow/BiKleisli.hs b/src/Control/Arrow/BiKleisli.hs → Control/Arrow/BiKleisli.hs
diff --git a/src/Control/Arrow/CoKleisli.hs → Control/Arrow/CoKleisli.hs b/src/Control/Arrow/CoKleisli.hs → Control/Arrow/CoKleisli.hs
diff --git a/src/Control/Category/Associative.hs → Control/Category/Associative.hs b/src/Control/Category/Associative.hs → Control/Category/Associative.hs
diff --git a/src/Control/Category/Braided.hs → Control/Category/Braided.hs b/src/Control/Category/Braided.hs → Control/Category/Braided.hs
diff --git a/src/Control/Category/Cartesian.hs → Control/Category/Cartesian.hs b/src/Control/Category/Cartesian.hs → Control/Category/Cartesian.hs
diff --git a/src/Control/Category/Cartesian/Closed.hs → Control/Category/Cartesian/Closed.hs b/src/Control/Category/Cartesian/Closed.hs → Control/Category/Cartesian/Closed.hs
diff --git a/src/Control/Category/Discrete.hs → Control/Category/Discrete.hs b/src/Control/Category/Discrete.hs → Control/Category/Discrete.hs
diff --git a/src/Control/Category/Distributive.hs → Control/Category/Distributive.hs b/src/Control/Category/Distributive.hs → Control/Category/Distributive.hs
diff --git a/src/Control/Category/Dual.hs → Control/Category/Dual.hs b/src/Control/Category/Dual.hs → Control/Category/Dual.hs
diff --git a/src/Control/Category/Hask.hs → Control/Category/Hask.hs b/src/Control/Category/Hask.hs → Control/Category/Hask.hs
diff --git a/src/Control/Category/Monoidal.hs → Control/Category/Monoidal.hs b/src/Control/Category/Monoidal.hs → Control/Category/Monoidal.hs
diff --git a/src/Control/Category/Object.hs → Control/Category/Object.hs b/src/Control/Category/Object.hs → Control/Category/Object.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Category.Object
@@ -25,23 +24,13 @@ import Control.Category
 
 -- | The @Category k@ has a terminal object @Terminal k@ such that for all objects @a@ in @k@, 
 -- there exists a unique morphism from @a@ to @Terminal k@.
-#ifdef USE_TYPE_FAMILIES
 class Category k => HasTerminalObject k where
 	type Terminal k :: *
 	terminate :: k a (Terminal k)
-#else 
-class Category k => HasTerminalObject k t | k -> t where
-	terminate :: k a t
-#endif
 
 -- | The @Category k@ has an initial (coterminal) object @Initial k@ such that for all objects 
 -- @a@ in @k@, there exists a unique morphism from @Initial k @ to @a@.
 
-#ifdef USE_TYPE_FAMILIES
 class Category k => HasInitialObject k where
 	type Initial k :: *
 	initiate :: k (Initial k) a
-#else
-class Category k => HasInitialObject k i | k -> i where
-	initiate :: k i a
-#endif
diff --git a/src/Control/Comonad.hs → Control/Comonad.hs b/src/Control/Comonad.hs → Control/Comonad.hs
diff --git a/src/Control/Comonad/Cofree.hs → Control/Comonad/Cofree.hs b/src/Control/Comonad/Cofree.hs → Control/Comonad/Cofree.hs
diff --git a/src/Control/Comonad/Cofree/Alt.hs → Control/Comonad/Cofree/Alt.hs b/src/Control/Comonad/Cofree/Alt.hs → Control/Comonad/Cofree/Alt.hs
diff --git a/src/Control/Comonad/Coideal.hs → Control/Comonad/Coideal.hs b/src/Control/Comonad/Coideal.hs → Control/Comonad/Coideal.hs
diff --git a/src/Control/Comonad/Context.hs → Control/Comonad/Context.hs b/src/Control/Comonad/Context.hs → Control/Comonad/Context.hs
diff --git a/src/Control/Comonad/Context/Class.hs → Control/Comonad/Context/Class.hs b/src/Control/Comonad/Context/Class.hs → Control/Comonad/Context/Class.hs
diff --git a/src/Control/Comonad/Density.hs → Control/Comonad/Density.hs b/src/Control/Comonad/Density.hs → Control/Comonad/Density.hs
diff --git a/src/Control/Comonad/Exponent.hs → Control/Comonad/Exponent.hs b/src/Control/Comonad/Exponent.hs → Control/Comonad/Exponent.hs
diff --git a/src/Control/Comonad/Fix.hs → Control/Comonad/Fix.hs b/src/Control/Comonad/Fix.hs → Control/Comonad/Fix.hs
diff --git a/src/Control/Comonad/HigherOrder.hs → Control/Comonad/HigherOrder.hs b/src/Control/Comonad/HigherOrder.hs → Control/Comonad/HigherOrder.hs
diff --git a/src/Control/Comonad/Indexed.hs → Control/Comonad/Indexed.hs b/src/Control/Comonad/Indexed.hs → Control/Comonad/Indexed.hs
diff --git a/src/Control/Comonad/Memo.hs → Control/Comonad/Memo.hs b/src/Control/Comonad/Memo.hs → Control/Comonad/Memo.hs
diff --git a/src/Control/Comonad/Parameterized.hs → Control/Comonad/Parameterized.hs b/src/Control/Comonad/Parameterized.hs → Control/Comonad/Parameterized.hs
diff --git a/src/Control/Comonad/Pointer.hs → Control/Comonad/Pointer.hs b/src/Control/Comonad/Pointer.hs → Control/Comonad/Pointer.hs
diff --git a/src/Control/Comonad/Reader.hs → Control/Comonad/Reader.hs b/src/Control/Comonad/Reader.hs → Control/Comonad/Reader.hs
diff --git a/src/Control/Comonad/Reader/Class.hs → Control/Comonad/Reader/Class.hs b/src/Control/Comonad/Reader/Class.hs → Control/Comonad/Reader/Class.hs
diff --git a/src/Control/Comonad/Stream.hs → Control/Comonad/Stream.hs b/src/Control/Comonad/Stream.hs → Control/Comonad/Stream.hs
diff --git a/src/Control/Comonad/Supply.hs → Control/Comonad/Supply.hs b/src/Control/Comonad/Supply.hs → Control/Comonad/Supply.hs
diff --git a/src/Control/Comonad/Trans.hs → Control/Comonad/Trans.hs b/src/Control/Comonad/Trans.hs → Control/Comonad/Trans.hs
diff --git a/src/Control/Comonad/Zipper.hs → Control/Comonad/Zipper.hs b/src/Control/Comonad/Zipper.hs → Control/Comonad/Zipper.hs
diff --git a/src/Control/Dyad.hs → Control/Dyad.hs b/src/Control/Dyad.hs → Control/Dyad.hs
diff --git a/src/Control/Functor.hs → Control/Functor.hs b/src/Control/Functor.hs → Control/Functor.hs
diff --git a/src/Control/Functor/Abides.hs → Control/Functor/Abides.hs b/src/Control/Functor/Abides.hs → Control/Functor/Abides.hs
diff --git a/src/Control/Functor/Adjunction.hs → Control/Functor/Adjunction.hs b/src/Control/Functor/Adjunction.hs → Control/Functor/Adjunction.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Functor.Adjunction

diff --git a/...Control/Functor/Adjunction/HigherOrder.hs → Control/Functor/Adjunction/HigherOrder.hs b/...Control/Functor/Adjunction/HigherOrder.hs → Control/Functor/Adjunction/HigherOrder.hs
diff --git a/src/Control/Functor/Algebra.hs → Control/Functor/Algebra.hs b/src/Control/Functor/Algebra.hs → Control/Functor/Algebra.hs
diff --git a/src/Control/Functor/Algebra/Elgot.hs → Control/Functor/Algebra/Elgot.hs b/src/Control/Functor/Algebra/Elgot.hs → Control/Functor/Algebra/Elgot.hs
diff --git a/src/Control/Functor/Categorical.hs → Control/Functor/Categorical.hs b/src/Control/Functor/Categorical.hs → Control/Functor/Categorical.hs
@@ -33,11 +33,9 @@ import Control.Monad.Writer as LW
 import Control.Monad.State as LS
 
 import Control.Monad.RWS as LRWS
-#if __GLASGOW_HASKELL__ >= 608
 import Control.Monad.Writer.Strict as SW
 import Control.Monad.State.Strict as SS
 import Control.Monad.RWS.Strict as SRWS
-#endif
 
 class (Category r, Category s) => CFunctor f r s | f r -> s,  f s -> r where
 	cmap :: r a b -> s (f a) (f b)

diff --git a/src/Control/Functor/Combinators.hs → Control/Functor/Combinators.hs b/src/Control/Functor/Combinators.hs → Control/Functor/Combinators.hs
diff --git a/src/Control/Functor/Combinators/Biff.hs → Control/Functor/Combinators/Biff.hs b/src/Control/Functor/Combinators/Biff.hs → Control/Functor/Combinators/Biff.hs
diff --git a/src/Control/Functor/Combinators/Const.hs → Control/Functor/Combinators/Const.hs b/src/Control/Functor/Combinators/Const.hs → Control/Functor/Combinators/Const.hs
diff --git a/src/Control/Functor/Combinators/Flip.hs → Control/Functor/Combinators/Flip.hs b/src/Control/Functor/Combinators/Flip.hs → Control/Functor/Combinators/Flip.hs
diff --git a/src/Control/Functor/Combinators/Join.hs → Control/Functor/Combinators/Join.hs b/src/Control/Functor/Combinators/Join.hs → Control/Functor/Combinators/Join.hs
diff --git a/src/Control/Functor/Combinators/Lift.hs → Control/Functor/Combinators/Lift.hs b/src/Control/Functor/Combinators/Lift.hs → Control/Functor/Combinators/Lift.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fallow-undecidable-instances #-}
+{-# LANGUAGE UndecidableInstances #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Functor.Combinators.Lift

diff --git a/src/Control/Functor/Combinators/Of.hs → Control/Functor/Combinators/Of.hs b/src/Control/Functor/Combinators/Of.hs → Control/Functor/Combinators/Of.hs
diff --git a/src/Control/Functor/Composition.hs → Control/Functor/Composition.hs b/src/Control/Functor/Composition.hs → Control/Functor/Composition.hs
diff --git a/src/Control/Functor/Cone.hs → Control/Functor/Cone.hs b/src/Control/Functor/Cone.hs → Control/Functor/Cone.hs
diff --git a/src/Control/Functor/Contra.hs → Control/Functor/Contra.hs b/src/Control/Functor/Contra.hs → Control/Functor/Contra.hs
diff --git a/src/Control/Functor/Derivative.hs → Control/Functor/Derivative.hs b/src/Control/Functor/Derivative.hs → Control/Functor/Derivative.hs
diff --git a/src/Control/Functor/End.hs → Control/Functor/End.hs b/src/Control/Functor/End.hs → Control/Functor/End.hs
diff --git a/src/Control/Functor/Exponential.hs → Control/Functor/Exponential.hs b/src/Control/Functor/Exponential.hs → Control/Functor/Exponential.hs
diff --git a/src/Control/Functor/Extras.hs → Control/Functor/Extras.hs b/src/Control/Functor/Extras.hs → Control/Functor/Extras.hs
diff --git a/src/Control/Functor/Fix.hs → Control/Functor/Fix.hs b/src/Control/Functor/Fix.hs → Control/Functor/Fix.hs
diff --git a/src/Control/Functor/Full.hs → Control/Functor/Full.hs b/src/Control/Functor/Full.hs → Control/Functor/Full.hs
diff --git a/src/Control/Functor/HigherOrder.hs → Control/Functor/HigherOrder.hs b/src/Control/Functor/HigherOrder.hs → Control/Functor/HigherOrder.hs
diff --git a/...ontrol/Functor/HigherOrder/Composition.hs → Control/Functor/HigherOrder/Composition.hs b/...ontrol/Functor/HigherOrder/Composition.hs → Control/Functor/HigherOrder/Composition.hs
diff --git a/src/Control/Functor/Ideal.hs → Control/Functor/Ideal.hs b/src/Control/Functor/Ideal.hs → Control/Functor/Ideal.hs
diff --git a/src/Control/Functor/Indexed.hs → Control/Functor/Indexed.hs b/src/Control/Functor/Indexed.hs → Control/Functor/Indexed.hs
diff --git a/src/Control/Functor/Indexed/Lift.hs → Control/Functor/Indexed/Lift.hs b/src/Control/Functor/Indexed/Lift.hs → Control/Functor/Indexed/Lift.hs
diff --git a/src/Control/Functor/Instances.hs → Control/Functor/Instances.hs b/src/Control/Functor/Instances.hs → Control/Functor/Instances.hs
diff --git a/src/Control/Functor/Internal/Adjunction.hs → Control/Functor/Internal/Adjunction.hs b/src/Control/Functor/Internal/Adjunction.hs → Control/Functor/Internal/Adjunction.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Functor.Internal.Adjunction

diff --git a/src/Control/Functor/Internal/Ideal.hs → Control/Functor/Internal/Ideal.hs b/src/Control/Functor/Internal/Ideal.hs → Control/Functor/Internal/Ideal.hs
diff --git a/src/Control/Functor/KanExtension.hs → Control/Functor/KanExtension.hs b/src/Control/Functor/KanExtension.hs → Control/Functor/KanExtension.hs
diff --git a/...ntrol/Functor/KanExtension/Interpreter.hs → Control/Functor/KanExtension/Interpreter.hs b/...ntrol/Functor/KanExtension/Interpreter.hs → Control/Functor/KanExtension/Interpreter.hs
diff --git a/src/Control/Functor/Lambek.hs → Control/Functor/Lambek.hs b/src/Control/Functor/Lambek.hs → Control/Functor/Lambek.hs
diff --git a/src/Control/Functor/Limit.hs → Control/Functor/Limit.hs b/src/Control/Functor/Limit.hs → Control/Functor/Limit.hs
diff --git a/src/Control/Functor/Pointed.hs → Control/Functor/Pointed.hs b/src/Control/Functor/Pointed.hs → Control/Functor/Pointed.hs
diff --git a/src/Control/Functor/Pointed/Composition.hs → Control/Functor/Pointed/Composition.hs b/src/Control/Functor/Pointed/Composition.hs → Control/Functor/Pointed/Composition.hs
diff --git a/src/Control/Functor/Representable.hs → Control/Functor/Representable.hs b/src/Control/Functor/Representable.hs → Control/Functor/Representable.hs
diff --git a/src/Control/Functor/Strong.hs → Control/Functor/Strong.hs b/src/Control/Functor/Strong.hs → Control/Functor/Strong.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Functor.Strong

diff --git a/src/Control/Functor/Yoneda.hs → Control/Functor/Yoneda.hs b/src/Control/Functor/Yoneda.hs → Control/Functor/Yoneda.hs
diff --git a/src/Control/Functor/Zap.hs → Control/Functor/Zap.hs b/src/Control/Functor/Zap.hs → Control/Functor/Zap.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -------------------------------------------------------------------------------------------
 -- |
 -- Module	: Control.Functor.Zap

diff --git a/src/Control/Functor/Zip.hs → Control/Functor/Zip.hs b/src/Control/Functor/Zip.hs → Control/Functor/Zip.hs
diff --git a/src/Control/Monad/Categorical.hs → Control/Monad/Categorical.hs b/src/Control/Monad/Categorical.hs → Control/Monad/Categorical.hs
diff --git a/src/Control/Monad/Codensity.hs → Control/Monad/Codensity.hs b/src/Control/Monad/Codensity.hs → Control/Monad/Codensity.hs
diff --git a/src/Control/Monad/Either.hs → Control/Monad/Either.hs b/src/Control/Monad/Either.hs → Control/Monad/Either.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.Either

diff --git a/src/Control/Monad/Free.hs → Control/Monad/Free.hs b/src/Control/Monad/Free.hs → Control/Monad/Free.hs
diff --git a/src/Control/Monad/HigherOrder.hs → Control/Monad/HigherOrder.hs b/src/Control/Monad/HigherOrder.hs → Control/Monad/HigherOrder.hs
diff --git a/src/Control/Monad/Hyper.hs → Control/Monad/Hyper.hs b/src/Control/Monad/Hyper.hs → Control/Monad/Hyper.hs
diff --git a/src/Control/Monad/Ideal.hs → Control/Monad/Ideal.hs b/src/Control/Monad/Ideal.hs → Control/Monad/Ideal.hs
diff --git a/src/Control/Monad/Indexed.hs → Control/Monad/Indexed.hs b/src/Control/Monad/Indexed.hs → Control/Monad/Indexed.hs
diff --git a/src/Control/Monad/Indexed/Cont.hs → Control/Monad/Indexed/Cont.hs b/src/Control/Monad/Indexed/Cont.hs → Control/Monad/Indexed/Cont.hs
diff --git a/src/Control/Monad/Indexed/Fix.hs → Control/Monad/Indexed/Fix.hs b/src/Control/Monad/Indexed/Fix.hs → Control/Monad/Indexed/Fix.hs
diff --git a/src/Control/Monad/Indexed/State.hs → Control/Monad/Indexed/State.hs b/src/Control/Monad/Indexed/State.hs → Control/Monad/Indexed/State.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.Indexed.State

diff --git a/src/Control/Monad/Indexed/Trans.hs → Control/Monad/Indexed/Trans.hs b/src/Control/Monad/Indexed/Trans.hs → Control/Monad/Indexed/Trans.hs
diff --git a/src/Control/Monad/KanExtension.hs → Control/Monad/KanExtension.hs b/src/Control/Monad/KanExtension.hs → Control/Monad/KanExtension.hs
diff --git a/src/Control/Monad/Parameterized.hs → Control/Monad/Parameterized.hs b/src/Control/Monad/Parameterized.hs → Control/Monad/Parameterized.hs
diff --git a/src/Control/Morphism/Ana.hs → Control/Morphism/Ana.hs b/src/Control/Morphism/Ana.hs → Control/Morphism/Ana.hs
diff --git a/src/Control/Morphism/Apo.hs → Control/Morphism/Apo.hs b/src/Control/Morphism/Apo.hs → Control/Morphism/Apo.hs
diff --git a/src/Control/Morphism/Build.hs → Control/Morphism/Build.hs b/src/Control/Morphism/Build.hs → Control/Morphism/Build.hs
diff --git a/src/Control/Morphism/Cata.hs → Control/Morphism/Cata.hs b/src/Control/Morphism/Cata.hs → Control/Morphism/Cata.hs
diff --git a/src/Control/Morphism/Chrono.hs → Control/Morphism/Chrono.hs b/src/Control/Morphism/Chrono.hs → Control/Morphism/Chrono.hs
diff --git a/src/Control/Morphism/Destroy.hs → Control/Morphism/Destroy.hs b/src/Control/Morphism/Destroy.hs → Control/Morphism/Destroy.hs
diff --git a/src/Control/Morphism/Dyna.hs → Control/Morphism/Dyna.hs b/src/Control/Morphism/Dyna.hs → Control/Morphism/Dyna.hs
diff --git a/src/Control/Morphism/Exo.hs → Control/Morphism/Exo.hs b/src/Control/Morphism/Exo.hs → Control/Morphism/Exo.hs
diff --git a/src/Control/Morphism/Futu.hs → Control/Morphism/Futu.hs b/src/Control/Morphism/Futu.hs → Control/Morphism/Futu.hs
diff --git a/src/Control/Morphism/Histo.hs → Control/Morphism/Histo.hs b/src/Control/Morphism/Histo.hs → Control/Morphism/Histo.hs
diff --git a/src/Control/Morphism/Hylo.hs → Control/Morphism/Hylo.hs b/src/Control/Morphism/Hylo.hs → Control/Morphism/Hylo.hs
diff --git a/src/Control/Morphism/Meta/Erwig.hs → Control/Morphism/Meta/Erwig.hs b/src/Control/Morphism/Meta/Erwig.hs → Control/Morphism/Meta/Erwig.hs
diff --git a/src/Control/Morphism/Meta/Gibbons.hs → Control/Morphism/Meta/Gibbons.hs b/src/Control/Morphism/Meta/Gibbons.hs → Control/Morphism/Meta/Gibbons.hs
diff --git a/src/Control/Morphism/Para.hs → Control/Morphism/Para.hs b/src/Control/Morphism/Para.hs → Control/Morphism/Para.hs
diff --git a/src/Control/Morphism/Postpro.hs → Control/Morphism/Postpro.hs b/src/Control/Morphism/Postpro.hs → Control/Morphism/Postpro.hs
diff --git a/src/Control/Morphism/Prepro.hs → Control/Morphism/Prepro.hs b/src/Control/Morphism/Prepro.hs → Control/Morphism/Prepro.hs
diff --git a/src/Control/Morphism/Span.hs → Control/Morphism/Span.hs b/src/Control/Morphism/Span.hs → Control/Morphism/Span.hs
diff --git a/src/Control/Morphism/Synchro.hs → Control/Morphism/Synchro.hs b/src/Control/Morphism/Synchro.hs → Control/Morphism/Synchro.hs
diff --git a/src/Control/Morphism/Universal.hs → Control/Morphism/Universal.hs b/src/Control/Morphism/Universal.hs → Control/Morphism/Universal.hs
diff --git a/src/Control/Morphism/Zygo.hs → Control/Morphism/Zygo.hs b/src/Control/Morphism/Zygo.hs → Control/Morphism/Zygo.hs
diff --git a/src/Data/Void.hs → Data/Void.hs b/src/Data/Void.hs → Data/Void.hs
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2008 Edward Kmett
+Copyright 2008-2010 Edward Kmett
 Copyright 2007 Iavor Diatchki
 Copyright 2004-2008 Dave Menendez
 

diff --git a/Makefile b/Makefile
diff --git a/Setup.lhs b/Setup.lhs
diff --git a/category-extras.cabal b/category-extras.cabal
@@ -18,20 +18,11 @@ description:   A vastly expanded collection of modules implementing various
                /Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire/.
 build-type:    Simple
 
-flag ArrowSubclassesCategory
-  description: Indicates Control.Category is available and that the standard library has
-               its arrows subclass Control.Category.Category
-  default:     True
-
-flag TypeFamilies
-  description: Support for Type Families is available to us
-
 flag Optimize
   description: Enable optimizations
   default:     False
 
 library
-  build-depends:  mtl >= 1.1
   extensions:
     CPP,
     EmptyDataDecls,
@@ -40,11 +31,19 @@ library
     FunctionalDependencies,
     MultiParamTypeClasses,
     TypeOperators,
-    TypeSynonymInstances
+    TypeSynonymInstances,
+    TypeFamilies,
     UndecidableInstances,
     ExistentialQuantification,
+    GeneralizedNewtypeDeriving,
     Rank2Types
 
+
+  build-depends: 
+    base > 4, 
+    array >= 0.3 && < 0.4,
+    mtl >= 1.1
+
   other-modules:
     Control.Functor.Internal.Adjunction,
     Control.Functor.Internal.Ideal
@@ -148,20 +147,7 @@ library
     Control.Morphism.Zygo,
     Data.Void
 
-  hs-source-dirs:   src
   ghc-options:      -Wall 
 
-  if flag(ArrowSubclassesCategory)
-    build-depends: ghc >= 6.9, base > 3, array
-    cpp-options: -D__ARROW_SUBCLASSES_CATEGORY__=1
-  else
-    build-depends: ghc < 6.9, base, array 
-    hs-source-dirs: pre-6.9
-    exposed-modules: Control.Category
-
-  if flag(TypeFamilies)
-    extensions: TypeFamilies
-    cpp-options: -D__TYPE_FAMILIES__=1
-
   if flag(Optimize)
     ghc-options: -funbox-strict-fields -O2
diff --git a/pre-6.9/Control/Category.hs b/pre-6.9/Control/Category.hs