Compile with lts-7.14

music-score.cabal

@@ -22,23 +22,23 @@ source-repository head
 
 library
     build-depends:      base                    >= 4 && < 5,
-                        base-orphans            >= 0.1 && < 0.4,
+                        base-orphans            >= 0.1 && < 0.6,
                         aeson                   >= 0.7.0.6 && < 1,
                         lens                    >= 4.11     && < 5,
-                        process                 >= 1.2 && < 1.3,
+                        process                 >= 1.2 && < 1.5,
                         containers,
                         nats,          
                         average                 >= 0.6.1    && < 1,
                         semigroups              >= 0.13.0.1 && < 1,
-                        comonad                 >= 4.2.2 && < 5,
+                        comonad                 >= 4.2.2 && < 6,
                         contravariant           >= 1.2 && < 2,
                         bifunctors              >= 5 && < 6,
                         -- profunctors             >= 4.2.0.1 && < 5,
                         distributive            >= 0.4.4 && < 5,
                         adjunctions             >= 4.2 && < 5,
                         mtl                     >= 2.1.3.1 && < 3,
-                        transformers            >= 0.4.3.0 && < 0.5,
-                        transformers-compat     >= 0.4.0.4 && < 0.5,
+                        transformers            >= 0.4.3.0 && < 0.6,
+                        transformers-compat     >= 0.4.0.4 && < 0.6,
                         monadplus,
                         NumInstances,
                         colour                  >= 2.3.3 && < 3.0,

src/Data/PairMonad.hs

@@ -17,11 +17,6 @@ import Data.Monoid
 import Data.Foldable
 import Data.Traversable
 
--- Equivalent to the Monad Writer instance.
-instance Monoid o => Monad ((,) o) where
-  return      = pure
-  (o,a) >>= f = (o `mappend` o', a') where (o',a') = f a
-
 -- #ifndef __HAS_LENS__
 -- deriving instance Foldable ((,) o)
 -- deriving instance Traversable ((,) o)

src/Data/Semigroup/Instances.hs

@@ -49,17 +49,6 @@ deriving instance IsDynamics a => IsDynamics (Product a)
 deriving instance IsPitch a => IsPitch (Sum a)
 deriving instance IsPitch a => IsPitch (Product a)
 
-deriving instance Functor Product
-instance Applicative Product where
-  pure = Product
-  Product f <*> Product x = Product (f x)
-
-deriving instance Functor Sum
-instance Applicative Sum where
-  pure = Sum
-  Sum f <*> Sum x = Sum (f x)
-
-
 {-
 deriving instance Floating a => Floating (Product a)
 instance Num a => Num (Product a) where

src/Music/Score/Export/Lilypond.hs

@@ -6,6 +6,7 @@
 {-# LANGUAGE DeriveFunctor             #-}
 {-# LANGUAGE DeriveTraversable         #-}
 {-# LANGUAGE FlexibleContexts          #-}
+{-# LANGUAGE AllowAmbiguousTypes       #-}
 {-# LANGUAGE FlexibleInstances         #-}
 {-# LANGUAGE MultiParamTypeClasses     #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}

src/Music/Time/Event.hs

@@ -86,14 +86,6 @@ import           Music.Time.Meta
 -- TODO move
 instance Traversable AddMeta where
   traverse = annotated
-instance Eq1 AddMeta where
-  eq1 = (==)
-instance Eq a => Eq1 (Couple a) where
-  eq1 = (==)
-instance Ord1 AddMeta where
-  compare1 = compare
-instance Ord a => Ord1 (Couple a) where
-  compare1 = compare
 
 instance Num (f (g a)) => Num (Compose f g a) where
   Compose a + Compose b = Compose (a + b)

src/Music/Time/Meta.hs

@@ -75,6 +75,7 @@ import           Control.Monad.Plus
 import           Data.Foldable            (Foldable)
 import qualified Data.Foldable            as F
 import           Data.Functor.Adjunction  (unzipR)
+import           Data.Functor.Classes
 import           Data.Functor.Couple
 import           Data.Functor.Rep
 import qualified Data.List                as List
@@ -252,6 +253,15 @@ instance HasMeta (AddMeta a) where
   -- twain, pair, element
   meta = _Wrapped . _Wrapped . _1
 
+instance Eq1 AddMeta where
+  liftEq k (AddMeta (Twain (m,a))) (AddMeta (Twain (m',b))) = k a b
+instance Eq a => Eq1 (Couple a) where
+  liftEq k (Couple (b,a)) (Couple (b',a')) = k a a'
+instance Ord1 AddMeta where
+  liftCompare k (AddMeta (Twain (m,a))) (AddMeta (Twain (m',b))) = k a b
+instance Ord a => Ord1 (Couple a) where
+  liftCompare k (Couple (b,a)) (Couple (b',a')) = k a a'
+
 
 -- instance FunctorWithIndex i AddMeta where
   -- imap f = over annotated $ imap f

src/Music/Time/Voice.hs

@@ -11,6 +11,7 @@
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE ViewPatterns               #-}
+{-# LANGUAGE FlexibleContexts           #-}
 
 -------------------------------------------------------------------------------------
 -- |