5f520f4 · typeable/yaml

ChangeLog.md+5

compare with master

unifiedsplit

@@ -1,3 +1,8 @@

1+## 0.8.18

2+

3+* Switched yaml decode function for config file readers in `Data.Yaml.Config` to

4+ the one from `Data.Yaml.Include` that supports `!include` syntax.

5+

1## 0.8.17.2

6## 0.8.17.2

2

7

3* Fix pretty-printing order of UnexpectedEvent's fields (fixes [#84](https://github.com/snoyberg/yaml/issues/84)) [#85](https://github.com/snoyberg/yaml/pull/85)

8* Fix pretty-printing order of UnexpectedEvent's fields (fixes [#84](https://github.com/snoyberg/yaml/issues/84)) [#85](https://github.com/snoyberg/yaml/pull/85)

Data/Yaml/Config.hs+2−1

@@ -41,6 +41,7 @@ import Control.Monad (forM)

41import Control.Exception (throwIO)

42import Data.Text.Encoding (encodeUtf8)

43import qualified Data.Yaml as Y

44+import qualified Data.Yaml.Include as YI

44import Data.Maybe (fromMaybe)

45import Data.Maybe (fromMaybe)

45import qualified Data.Text as T

46import qualified Data.Text as T

46

47

@@ -174,7 +175,7 @@ loadYamlSettings

174 -> IO settings

175 -> IO settings

175loadYamlSettings runTimeFiles compileValues envUsage = do

176loadYamlSettings runTimeFiles compileValues envUsage = do

176 runValues <- forM runTimeFiles $ \fp -> do

177 runValues <- forM runTimeFiles $ \fp -> do

177− eres <- Y.decodeFileEither fp

178+ eres <- YI.decodeFileEither fp

178 case eres of

179 case eres of

179 Left e -> do

180 Left e -> do

180 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " ++ fp

181 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " ++ fp

yaml.cabal+1−1

@@ -1,5 +1,5 @@

1name: yaml

2−version: 0.8.17.2

2+version: 0.8.18

3license: BSD3

4license-file: LICENSE

5author: Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov