From 5087e4d22a1ce5ef8b40f411049a2ca2bcf6c530 Mon Sep 17 00:00:00 2001 From: Patrick Mylund Nielsen Date: Tue, 15 Oct 2019 09:18:21 -0400 Subject: [PATCH] Bump aeson-yaml, and add YAML regression test for 'y' (#1420) --- dhall-json/dhall-json.cabal | 2 +- dhall-json/tasty/data/normal.dhall | 1 + dhall-json/tasty/data/normal.yaml | 1 + dhall-json/tasty/data/quoted.dhall | 1 + dhall-json/tasty/data/quoted.yaml | 1 + stack.yaml | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index 3887aa16c..646ebfe31 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -72,7 +72,7 @@ Library HsYAML-aeson >= 0.2 && < 0.3 else Build-Depends: - aeson-yaml >= 1.0.1 && < 1.1 + aeson-yaml >= 1.0.2 && < 1.1 Executable dhall-to-json Hs-Source-Dirs: dhall-to-json diff --git a/dhall-json/tasty/data/normal.dhall b/dhall-json/tasty/data/normal.dhall index e5351366c..366d0329b 100644 --- a/dhall-json/tasty/data/normal.dhall +++ b/dhall-json/tasty/data/normal.dhall @@ -2,4 +2,5 @@ , text = ./yaml.txt as Text , int_value = 1 , bool_value = True +, yes = "y" } diff --git a/dhall-json/tasty/data/normal.yaml b/dhall-json/tasty/data/normal.yaml index 0026fe3fc..95e25952d 100644 --- a/dhall-json/tasty/data/normal.yaml +++ b/dhall-json/tasty/data/normal.yaml @@ -3,3 +3,4 @@ int_value: 1 string_value: 2000-01-01 text: | Plain text +yes: y diff --git a/dhall-json/tasty/data/quoted.dhall b/dhall-json/tasty/data/quoted.dhall index e5351366c..366d0329b 100644 --- a/dhall-json/tasty/data/quoted.dhall +++ b/dhall-json/tasty/data/quoted.dhall @@ -2,4 +2,5 @@ , text = ./yaml.txt as Text , int_value = 1 , bool_value = True +, yes = "y" } diff --git a/dhall-json/tasty/data/quoted.yaml b/dhall-json/tasty/data/quoted.yaml index 1f4be1af7..c78f986bf 100644 --- a/dhall-json/tasty/data/quoted.yaml +++ b/dhall-json/tasty/data/quoted.yaml @@ -3,3 +3,4 @@ 'string_value': '2000-01-01' 'text': | Plain text +'yes': 'y' diff --git a/stack.yaml b/stack.yaml index 811025100..266fe8f4c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -21,7 +21,7 @@ extra-deps: - HsYAML-aeson-0.2.0.0@sha256:04796abfc01cffded83f37a10e6edba4f0c0a15d45bef44fc5bb4313d9c87757,1791 - ordered-containers-0.2.2@sha256:ebf2be3f592d9cf148ea6b8375f8af97148d44f82d8d04476899285e965afdbf,810 - lsp-test-0.6.1.0@sha256:df0fc403c03b6d036be13de3ff23d9951ae2506080135cd6862eded2c969a6da,3483 - - aeson-yaml-1.0.1.0@sha256:2861ca3a35120f0a3a06b209174e4530529861956c0443ef57a2f2f09de9cbee,1975 + - aeson-yaml-1.0.2.0@sha256:c578472845478a35756131f4f4a6a929a9021aa2e494e6efe610c033e09868d0,1975 nix: packages: - ncurses