c41822b · typeable/yaml

git.iko.soy/typeable/yaml

on master help sign in

Make the patch more conservative.

c41822bJohn MacFarlane3 years ago

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

@@ -50,7 +50,7 @@ import qualified Data.HashMap.Strict as M

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

51#else

52import Data.Aeson.Types hiding (parse)

53−import Data.Aeson.Internal (formatError)

53+import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)

54#endif

55import qualified Data.Attoparsec.Text as Atto

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

yaml/test/Data/Yaml/IncludeSpec.hs+5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE QuasiQuotes #-}

2{-# LANGUAGE QuasiQuotes #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

3module Data.Yaml.IncludeSpec (main, spec) where

4module Data.Yaml.IncludeSpec (main, spec) where

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

6import Data.List (isPrefixOf)

7import Data.List (isPrefixOf)

7import qualified Data.ByteString.Lazy as LB

8import qualified Data.ByteString.Lazy as LB

8import Data.Aeson

9import Data.Aeson

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

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

11import Data.Aeson.Types (JSONPathElement(..))

12+#else

13+import Data.Aeson.Internal (JSONPathElement(..))

14+#endif

10import Data.Yaml (ParseException(InvalidYaml))

15import Data.Yaml (ParseException(InvalidYaml))

11import Data.Yaml.Include

16import Data.Yaml.Include

12import Data.Yaml.Internal

17import Data.Yaml.Internal