Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dhall-json for openSUSE:Factory checked in at 2021-09-10 23:40:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhall-json (Old) and /work/SRC/openSUSE:Factory/.dhall-json.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhall-json" Fri Sep 10 23:40:53 2021 rev:10 rq:917321 version:1.7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/dhall-json/dhall-json.changes 2021-06-13 23:06:10.955672856 +0200 +++ /work/SRC/openSUSE:Factory/.dhall-json.new.1899/dhall-json.changes 2021-09-10 23:41:02.290541950 +0200 @@ -1,0 +2,8 @@ +Sun Aug 22 15:48:17 UTC 2021 - [email protected] + +- Update dhall-json to version 1.7.8. + 1.7.8 + + * [Add support for `Date` / `Time` / `TimeZone`](https://github.com/dhall-lang/dhall-haskell/pull/2247) + +------------------------------------------------------------------- Old: ---- dhall-json-1.7.7.tar.gz New: ---- dhall-json-1.7.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhall-json.spec ++++++ --- /var/tmp/diff_new_pack.S0xrHt/_old 2021-09-10 23:41:02.830542524 +0200 +++ /var/tmp/diff_new_pack.S0xrHt/_new 2021-09-10 23:41:02.834542528 +0200 @@ -19,7 +19,7 @@ %global pkg_name dhall-json %bcond_with tests Name: %{pkg_name} -Version: 1.7.7 +Version: 1.7.8 Release: 0 Summary: Convert between Dhall and JSON or YAML License: BSD-3-Clause ++++++ dhall-json-1.7.7.tar.gz -> dhall-json-1.7.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/CHANGELOG.md new/dhall-json-1.7.8/CHANGELOG.md --- old/dhall-json-1.7.7/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-json-1.7.8/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +1.7.8 + +* [Add support for `Date` / `Time` / `TimeZone`](https://github.com/dhall-lang/dhall-haskell/pull/2247) + 1.7.7 * Build against `dhall-1.39.0` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/dhall-json.cabal new/dhall-json-1.7.8/dhall-json.cabal --- old/dhall-json-1.7.7/dhall-json.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-json-1.7.8/dhall-json.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,8 +1,7 @@ Name: dhall-json -Version: 1.7.7 +Version: 1.7.8 Cabal-Version: >=1.10 Build-Type: Simple -Tested-With: GHC == 8.4.3, GHC == 8.6.1 License: BSD3 License-File: LICENSE Copyright: 2017 Gabriel Gonzalez @@ -44,7 +43,7 @@ aeson-yaml >= 1.1.0 && < 1.2 , bytestring < 0.12, containers >= 0.5.9 && < 0.7 , - dhall >= 1.39.0 && < 1.40, + dhall >= 1.40.0 && < 1.41, exceptions >= 0.8.3 && < 0.11, filepath < 1.5 , lens-family-core >= 1.0.0 && < 2.2 , diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/json-to-dhall/Main.hs new/dhall-json-1.7.8/json-to-dhall/Main.hs --- old/dhall-json-1.7.7/json-to-dhall/Main.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-json-1.7.8/json-to-dhall/Main.hs 2001-09-09 03:46:40.000000000 +0200 @@ -17,16 +17,11 @@ import qualified Control.Exception import qualified Data.Aeson as Aeson import qualified Data.ByteString.Lazy.Char8 as ByteString -import qualified Data.Text.IO as Text.IO -import qualified Data.Text.Prettyprint.Doc as Pretty -import qualified Data.Text.Prettyprint.Doc.Render.Terminal as Pretty.Terminal -import qualified Data.Text.Prettyprint.Doc.Render.Text as Pretty.Text import qualified Dhall.Core -import qualified Dhall.Pretty +import qualified Dhall.Util import qualified GHC.IO.Encoding import qualified Options.Applicative as Options import qualified Paths_dhall_json as Meta -import qualified System.Console.ANSI as ANSI import qualified System.Exit import qualified System.IO as IO @@ -161,31 +156,6 @@ typeCheckSchemaExpr id finalSchema - let renderExpression characterSet plain output expression = do - let document = - Dhall.Pretty.prettyCharacterSet characterSet expression - - let stream = Dhall.Pretty.layout document - - case output of - Nothing -> do - supportsANSI <- ANSI.hSupportsANSI IO.stdout - - let ansiStream = - if supportsANSI && not plain - then fmap Dhall.Pretty.annToAnsiStyle stream - else Pretty.unAnnotateS stream - - Pretty.Terminal.renderIO IO.stdout ansiStream - - Text.IO.putStrLn "" - - Just file_ -> - IO.withFile file_ IO.WriteMode $ \h -> do - Pretty.Text.renderIO h stream - - Text.IO.hPutStrLn h "" - case options of Version -> putStrLn (showVersion Meta.version) @@ -200,7 +170,7 @@ expression <- Dhall.Core.throws (dhallFromJSON conversion finalSchema value) - renderExpression characterSet plain output expression + Dhall.Util.renderExpression characterSet plain output expression Type{..} -> do let characterSet = toCharacterSet ascii @@ -210,7 +180,7 @@ finalSchema <- toSchema Nothing value - renderExpression characterSet plain output finalSchema + Dhall.Util.renderExpression characterSet plain output finalSchema handle :: IO a -> IO a handle = Control.Exception.handle handler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/src/Dhall/JSON.hs new/dhall-json-1.7.8/src/Dhall/JSON.hs --- old/dhall-json-1.7.7/src/Dhall/JSON.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-json-1.7.8/src/Dhall/JSON.hs 2001-09-09 03:46:40.000000000 +0200 @@ -430,6 +430,8 @@ -- -- See: https://github.com/dhall-lang/dhall-lang/issues/492 Core.None -> Left BareNone + _ | Just text <- Dhall.Pretty.temporalToText e -> + loop (Core.TextLit (Core.Chunks [] text)) Core.RecordLit a -> case toOrderedList a of [ ( "contents" @@ -882,6 +884,24 @@ Core.TextShow -> Core.TextShow + Core.Date -> + Core.Date + + Core.DateLiteral d -> + Core.DateLiteral d + + Core.Time -> + Core.Time + + Core.TimeLiteral t p -> + Core.TimeLiteral t p + + Core.TimeZone -> + Core.TimeZone + + Core.TimeZoneLiteral z -> + Core.TimeZoneLiteral z + Core.List -> Core.List diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/tasty/Main.hs new/dhall-json-1.7.8/tasty/Main.hs --- old/dhall-json-1.7.7/tasty/Main.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/dhall-json-1.7.8/tasty/Main.hs 2001-09-09 03:46:40.000000000 +0200 @@ -57,6 +57,7 @@ , testDhallToJSON "./tasty/data/nesting3" , testDhallToJSON "./tasty/data/nestingLegacy0" , testDhallToJSON "./tasty/data/nestingLegacy1" + , testDhallToJSON "./tasty/data/time" ] , Test.Tasty.testGroup "Union keys" [ testJSONToDhall "./tasty/data/unionKeys" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/tasty/data/time.dhall new/dhall-json-1.7.8/tasty/data/time.dhall --- old/dhall-json-1.7.7/tasty/data/time.dhall 1970-01-01 01:00:00.000000000 +0100 +++ new/dhall-json-1.7.8/tasty/data/time.dhall 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,7 @@ +{ example0 = 2020-01-01 +, example1 = 00:00:00 +, example2 = +00:00 +, example3 = 2020-01-01T00:00:00 +, example4 = 00:00:00+00:00 +, example5 = 2020-01-01T00:00:00+00:00 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dhall-json-1.7.7/tasty/data/time.json new/dhall-json-1.7.8/tasty/data/time.json --- old/dhall-json-1.7.7/tasty/data/time.json 1970-01-01 01:00:00.000000000 +0100 +++ new/dhall-json-1.7.8/tasty/data/time.json 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,8 @@ +{ + "example0": "2020-01-01", + "example1": "00:00:00", + "example2": "+00:00", + "example3": "2020-01-01T00:00:00", + "example4": "00:00:00+00:00", + "example5": "2020-01-01T00:00:00+00:00" +}
