3ec4100 · typeable/yaml

git.iko.soy/typeable/yaml

on master help sign in

Allow compilation with aeson 2.2.0.0.

3ec4100John MacFarlane3 years ago

yaml/src/Data/Yaml/Internal.hs+5−1

@@ -46,8 +46,12 @@ import Data.Aeson.KeyMap (KeyMap)

46#else

47import qualified Data.HashMap.Strict as M

48#endif

49−import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)

49+#if MIN_VERSION_aeson(2,2,0)

50+import Data.Aeson.Types hiding (AesonException, parse)

51+#else

50import Data.Aeson.Types hiding (parse)

52import Data.Aeson.Types hiding (parse)

53+import Data.Aeson.Internal (formatError)

54+#endif

51import qualified Data.Attoparsec.Text as Atto

55import qualified Data.Attoparsec.Text as Atto

52import Data.Bits (shiftL, (.|.))

56import Data.Bits (shiftL, (.|.))

53import Data.ByteString (ByteString)

57import Data.ByteString (ByteString)

yaml/test/Data/Yaml/IncludeSpec.hs+1−1

@@ -6,7 +6,7 @@ import Test.Hspec

6import Data.List (isPrefixOf)

7import qualified Data.ByteString.Lazy as LB

8import Data.Aeson

9−import Data.Aeson.Internal (JSONPathElement(..))

9+import Data.Aeson.Types (JSONPathElement(..))

10import Data.Yaml (ParseException(InvalidYaml))

11import Data.Yaml.Include

12import Data.Yaml.Internal