git.iko.soy/typeable/yaml
on master help sign in
Merge pull request #87 from lehins/master

Add `!include` syntax support for config file reading.

commit5f520f4029809da8cc9ff1d26f7d4094bd8b7879 authorMichael Snoyman <michael@snoyman.com> dateTue 21 Jun 2016, 19:51 (10 years ago) parent07335e132c8fc5
3 files changed+8−2
compare with master
unifiedsplit
ChangeLog.md+5 Data/Yaml/Config.hs+2−1 yaml.cabal+1−1
ChangeLog.md+5
@@ -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+
16## 0.8.17.2
27
38* 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)
4141import Control.Exception (throwIO)
4242import Data.Text.Encoding (encodeUtf8)
4343import qualified Data.Yaml as Y
44+import qualified Data.Yaml.Include as YI
4445import Data.Maybe (fromMaybe)
4546import qualified Data.Text as T
4647
@@ -174,7 +175,7 @@ loadYamlSettings
174175 -> IO settings
175176loadYamlSettings runTimeFiles compileValues envUsage = do
176177 runValues <- forM runTimeFiles $ \fp -> do
177− eres <- Y.decodeFileEither fp
178+ eres <- YI.decodeFileEither fp
178179 case eres of
179180 Left e -> do
180181 putStrLn $ "loadYamlSettings: Could not parse file as YAML: " ++ fp
yaml.cabal+1−1
@@ -1,5 +1,5 @@
11name: yaml
2−version: 0.8.17.2
2+version: 0.8.18
33license: BSD3
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov