From 055fc856dcade15ec5abdf90eba88375419d0f16883165b921998e22a535ab79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Sep 2020 18:12:10 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-json revision:2, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-json?expand=0&rev=2 --- dhall-json-1.7.1.tar.gz | 3 - dhall-json-1.7.2.tar.gz | 3 + dhall-json.cabal | 131 ---------------------------------------- dhall-json.changes | 8 +++ dhall-json.spec | 4 +- 5 files changed, 12 insertions(+), 137 deletions(-) delete mode 100644 dhall-json-1.7.1.tar.gz create mode 100644 dhall-json-1.7.2.tar.gz delete mode 100644 dhall-json.cabal diff --git a/dhall-json-1.7.1.tar.gz b/dhall-json-1.7.1.tar.gz deleted file mode 100644 index e603f37..0000000 --- a/dhall-json-1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eefdce642c5ada8c3c7c08dc389fcdc52f88f9e6c50c8b7bc84404d5e14e0c95 -size 33261 diff --git a/dhall-json-1.7.2.tar.gz b/dhall-json-1.7.2.tar.gz new file mode 100644 index 0000000..7abd711 --- /dev/null +++ b/dhall-json-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:926d8f0028a4ccd8e26e26882125825c4c9e3c1f0a6f1a187fa15a27a0bd35a1 +size 33502 diff --git a/dhall-json.cabal b/dhall-json.cabal deleted file mode 100644 index 3282cf4..0000000 --- a/dhall-json.cabal +++ /dev/null @@ -1,131 +0,0 @@ -Name: dhall-json -Version: 1.7.1 -x-revision: 3 -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 -Author: Gabriel Gonzalez -Maintainer: Gabriel439@gmail.com -Bug-Reports: https://github.com/dhall-lang/dhall-haskell/issues -Synopsis: Convert between Dhall and JSON or YAML -Description: - Use this package if you want to convert between Dhall expressions and JSON - or YAML. You can use this package as a library or an executable: - . - * See the "Dhall.JSON" or "Dhall.JSONToDhall" modules if you want to use - this package as a library - . - * Use the @dhall-to-json@, @dhall-to-yaml@, or @json-to-dhall@ programs from - this package if you want an executable - . - The "Dhall.JSON" and "Dhall.JSONToDhall" modules also contains instructions - for how to use this package -Category: Compiler -Extra-Source-Files: - CHANGELOG.md - tasty/data/*.dhall - tasty/data/*.json - tasty/data/error/*.golden - tasty/data/error/*.json - tasty/data/error/*.dhall - -Source-Repository head - Type: git - Location: https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-json - -Library - Hs-Source-Dirs: src - Build-Depends: - base >= 4.11.0.0 && < 5 , - aeson >= 1.0.0.0 && < 1.6 , - aeson-pretty < 0.9 , - aeson-yaml >= 1.1.0 && < 1.2 , - bytestring < 0.11, - containers >= 0.5.9 && < 0.7 , - dhall >= 1.34.0 && < 1.35, - exceptions >= 0.8.3 && < 0.11, - filepath < 1.5 , - lens-family-core >= 1.0.0 && < 2.2 , - optparse-applicative >= 0.14.0.0 && < 0.17, - prettyprinter >= 1.5.1 && < 1.8 , - scientific >= 0.3.0.0 && < 0.4 , - text >= 0.11.1.0 && < 1.3 , - unordered-containers < 0.3 , - vector - Exposed-Modules: - Dhall.JSON - Dhall.JSONToDhall - Dhall.JSON.Yaml - Dhall.DhallToYaml.Main - Other-Modules: - Dhall.JSON.Util - GHC-Options: -Wall - Default-Language: Haskell2010 - -Executable dhall-to-json - Hs-Source-Dirs: dhall-to-json - Main-Is: Main.hs - Build-Depends: - base , - aeson , - aeson-pretty >= 0.8.5 && < 0.9 , - bytestring < 0.11, - dhall , - dhall-json , - optparse-applicative , - text - Other-Modules: - Paths_dhall_json - GHC-Options: -Wall - Default-Language: Haskell2010 - -Executable dhall-to-yaml - Hs-Source-Dirs: dhall-to-yaml - Main-Is: Main.hs - Build-Depends: - base , - dhall-json - Other-Modules: - Paths_dhall_json - GHC-Options: -Wall - Default-Language: Haskell2010 - -Executable json-to-dhall - Hs-Source-Dirs: json-to-dhall - Main-Is: Main.hs - Build-Depends: - base , - aeson , - ansi-terminal >= 0.6.3.1 && < 0.12, - bytestring < 0.11, - dhall , - dhall-json , - exceptions >= 0.8.3 && < 0.11, - optparse-applicative , - prettyprinter , - prettyprinter-ansi-terminal >= 1.1.1 && < 1.2 , - text < 1.3 - Other-Modules: - Paths_dhall_json - GHC-Options: -Wall - Default-Language: Haskell2010 - -Test-Suite tasty - Type: exitcode-stdio-1.0 - Hs-Source-Dirs: tasty - Main-Is: Main.hs - Build-Depends: - base , - aeson , - bytestring , - dhall , - dhall-json , - tasty < 1.4, - text , - tasty-hunit >= 0.2, - tasty-silver >= 3.0 - GHC-Options: -Wall - Default-Language: Haskell2010 diff --git a/dhall-json.changes b/dhall-json.changes index d98e019..729147e 100644 --- a/dhall-json.changes +++ b/dhall-json.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 12 16:17:54 UTC 2020 - psimons@suse.com + +- Update dhall-json to version 1.7.2. + 1.7.2 + + * [The `--documents` flag now wraps non-`List`s in a document](https://github.com/dhall-lang/dhall-haskell/pull/1977) + ------------------------------------------------------------------- Tue Sep 8 10:21:32 UTC 2020 - psimons@suse.com diff --git a/dhall-json.spec b/dhall-json.spec index fd3ca66..2867d06 100644 --- a/dhall-json.spec +++ b/dhall-json.spec @@ -19,13 +19,12 @@ %global pkg_name dhall-json %bcond_with tests Name: %{pkg_name} -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Convert between Dhall and JSON or YAML License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/3.cabal#/%{name}.cabal BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -83,7 +82,6 @@ This package provides the Haskell %{name} library development files. %prep %autosetup -cp -p %{SOURCE1} %{name}.cabal %build %ghc_lib_build From 3211fa954096c51bf0a0d0ec218ccee602ba4669cb9210ec566507817c5ba5c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Sep 2020 12:34:57 +0000 Subject: [PATCH 2/2] Accepting request 834854 from home:michel_mno:branches:devel:languages:haskell - Add _constraints with 4GB min disk space OBS-URL: https://build.opensuse.org/request/show/834854 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-json?expand=0&rev=4 --- _constraints | 8 ++++++++ dhall-json.changes | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 _constraints diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..b8e23cb --- /dev/null +++ b/_constraints @@ -0,0 +1,8 @@ + + + + 4 + + + + diff --git a/dhall-json.changes b/dhall-json.changes index 729147e..79ae6b6 100644 --- a/dhall-json.changes +++ b/dhall-json.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 15 15:56:54 UTC 2020 - Michel Normand + +- Add _constraints with 4GB min disk space + ------------------------------------------------------------------- Sat Sep 12 16:17:54 UTC 2020 - psimons@suse.com