get building

fadno.cabal

@@ -1,7 +1,7 @@
 name:                fadno
 category:            Music
 synopsis:            Minimal library for music generation and notation
-version:             1.1.8.2
+version:             1.1.9.1
 homepage:            http://github.com/slpopejoy/fadno
 description:         Provides the Note type and HasNote class with polymorphic pitch and duration representations,
                      metering, barring and time signature utilities, plus midi and MusicXML support.
@@ -29,11 +29,11 @@ library
   -- other-extensions:
   build-depends:       Decimal >= 0.4
                      , HUnit >= 1.5
-                     , base >= 4.9 && < 4.15
+                     , base >= 4.9 && < 4.20
                      , containers >= 0.5
                      , data-default >= 0.7
                      , event-list >= 0.1
-                     , fadno-xml >= 1.2
+                     , fadno-xml >= 1.2.1
                      , lens >= 4.15
                      , midi >= 0.2
                      , mtl >= 2.2

src/Fadno/Note.hs

@@ -33,7 +33,7 @@ import Data.Foldable
 
 -- | Note = pitch and duration.
 data Note p d = Note { _pitch :: p, _dur :: d }
-                deriving (Eq,Generic)
+                deriving (Eq,Generic,Functor)
 $(makeLenses ''Note)
 
 instance (Show p, Show d) => Show (Note p d) where

src/Fadno/Util.hs

@@ -6,6 +6,7 @@ import Data.Function (on)
 import qualified Debug.Trace as T
 import qualified Data.Map as M
 import qualified Data.Set as S
+import Control.Monad
 import Control.Monad.State
 import Control.Lens