Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Mapper.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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 ()
Expand Down
14 changes: 6 additions & 8 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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: []
Expand Down