diff --git a/src/Mapper.hs b/src/Mapper.hs index 75537fd..3f2e4c6 100644 --- a/src/Mapper.hs +++ b/src/Mapper.hs @@ -38,7 +38,7 @@ import Data.Map (toList) import Data.Word (Word8) import Control.Monad.State import Codec.Midi (Key) -import Dhall hiding (maybe) +import Dhall hiding (maybe, map) import Chord (Chord(..) , chordTonesTensionAsPassing @@ -67,7 +67,7 @@ data ChordMapConfig | Deg DegreeChord deriving (Show, Generic) -instance Interpret ChordMapConfig where +instance FromDhall ChordMapConfig where autoWith _ = Dhall.union ( ( constructor "Abs" (Abs <$> Dhall.auto)) @@ -104,12 +104,12 @@ data FullConfig = FullConfig , specialInputs :: [SpecialInput] } deriving (Show, Generic) -instance Dhall.Interpret AbsoluteChord -instance Dhall.Interpret DegreeChord -instance Dhall.Interpret ChordMapEntry -instance Dhall.Interpret ChordMapSet -instance Dhall.Interpret SpecialInput -instance Dhall.Interpret FullConfig +instance Dhall.FromDhall AbsoluteChord +instance Dhall.FromDhall DegreeChord +instance Dhall.FromDhall ChordMapEntry +instance Dhall.FromDhall ChordMapSet +instance Dhall.FromDhall SpecialInput +instance Dhall.FromDhall FullConfig mapperMain :: IO () diff --git a/stack.yaml b/stack.yaml index 8458380..767e34c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -20,7 +20,7 @@ # snapshot: # url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/21.yaml -snapshot: lts-14.27 +snapshot: lts-23.27 # User packages to be built. # Various formats can be used as shown in the example below. @@ -47,16 +47,14 @@ packages: # extra-deps: [] extra-deps: - PortMidi-0.2.0.0 -- arrows-0.4.4.2 -- Stream-0.4.7.2 -- lazysmallcheck-0.6 -- monomer-1.3.0.0 +- monomer-1.6.0.1 - nanovg-0.8.1.0 -- c2hs-0.28.8 -- language-c-0.10.0 +- sdl2-2.5.5.1 # Override default flag values for project packages and extra-deps -# flags: {} +flags: + sdl2: + recent-ish: false # Extra package databases containing global packages # extra-package-dbs: []