Bump stackage version, uses later version of GHC

src/Dodge/Data/CWorld.hs

@@ -1,7 +1,7 @@
+{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
 
 module Dodge.Data.CWorld (
     module Dodge.Data.CWorld,
@@ -112,7 +112,8 @@ data CWCam = CWCam
     , _cwcBoundBox :: [Point2]
     , _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CWorld = CWorld
     --{ _cameraCenter :: Point2
@@ -186,8 +187,9 @@ data CWorld = CWorld
     , _cwTime :: CWTime
     , _cwGen :: CWGen
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CWTime = CWTime
     { _maybeWorld :: Maybe' CWorld
@@ -195,9 +197,9 @@ data CWTime = CWTime
     , _worldClock :: Int
     , _deathDelay :: Maybe Int
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
-    
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CWGen = CWGen
     { _cwgParams :: GenParams
@@ -206,7 +208,8 @@ data CWGen = CWGen
     , _cwgRoomClipping :: [ConvexPoly]
     , _cwgSeed :: Int
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WorldBeams = WorldBeams
     { _blockingBeams :: [Beam]
@@ -214,15 +217,20 @@ data WorldBeams = WorldBeams
     , _positronBeams :: [Beam]
     , _electronBeams :: [Beam]
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-deriveJSON defaultOptions ''CWorld
-deriveJSON defaultOptions ''WorldBeams
-deriveJSON defaultOptions ''CWCam
-deriveJSON defaultOptions ''CWGen
-deriveJSON defaultOptions ''CWTime
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
 makeLenses ''CWorld
 makeLenses ''WorldBeams
 makeLenses ''CWCam
 makeLenses ''CWGen
 makeLenses ''CWTime
+concat
+    <$> mapM
+        (deriveJSON defaultOptions)
+        [ ''WorldBeams
+        , ''CWCam
+        , ''CWGen
+        , ''CWTime
+        , ''CWorld
+        ]