@@ -15,20 +15,23 @@ import Data.Time (ZonedTime(..), LocalTime(..), TimeZone(..),
1515 NominalDiffTime)
1616import Data.Version
1717import qualified Data.Text as T
18−import qualified Data.Map as Map
1918import Data.Text (Text)
2019import Data.Aeson.Types
2120import Control.Applicative
2221import Functions
2322
23+#if !MIN_VERSION_QuickCheck(2,8,2)
24+import qualified Data.Map as Map
25+
26+instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
27+ arbitrary = Map.fromList <$> arbitrary
28+#endif
29+
2430-- "System" types.
2531
2632instance Arbitrary Text where
2733 arbitrary = T.pack <$> arbitrary
2834
29−instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
30− arbitrary = Map.fromList <$> arbitrary
31−
3235instance Arbitrary TimeOfDay where
3336 arbitrary = do
3437 h <- choose (0, 23)