@@ -140,12 +140,12 @@ import Data.Aeson.Types ( Value(..) )
140import Control.Applicative ( pure, (<$>), (<*>) )
140import Control.Applicative ( pure, (<$>), (<*>) )
141import Control.Monad ( return, mapM, mzero, liftM2 )
141import Control.Monad ( return, mapM, mzero, liftM2 )
142import Data.Bool ( otherwise )
142import Data.Bool ( otherwise )
143−import GHC.Base ( String )
143+import GHC.Base ( Monad(..), String )
144import Data.Eq ( (==) )
144import Data.Eq ( (==) )
145import Data.Function ( ($), (.), id )
145import Data.Function ( ($), (.), id )
146import Data.Functor ( fmap )
146import Data.Functor ( fmap )
147import Data.List ( (++), foldl', map, zip, genericLength )
147import Data.List ( (++), foldl', map, zip, genericLength )
148−import Prelude ( (-), Integer, error )
148+import Prelude ( (-), Integer, fromInteger, error )
149import Text.Show ( show )
149import Text.Show ( show )
150-- from containers:
150-- from containers:
151import qualified Data.Map as M ( toList )
151import qualified Data.Map as M ( toList )