From 5af6185c04ed408a92a93f7b179a0f29f3d80c133b073a93bb264fcdfef55a6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Feb 2022 13:44:51 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-json revision:19, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-json?expand=0&rev=23 --- dhall-json-1.7.8.tar.gz | 3 - dhall-json-1.7.9.tar.gz | 3 + dhall-json.cabal | 131 ++++++++++++++++++++++++++++++++++++++++ dhall-json.changes | 8 +++ dhall-json.spec | 6 +- 5 files changed, 146 insertions(+), 5 deletions(-) delete mode 100644 dhall-json-1.7.8.tar.gz create mode 100644 dhall-json-1.7.9.tar.gz create mode 100644 dhall-json.cabal diff --git a/dhall-json-1.7.8.tar.gz b/dhall-json-1.7.8.tar.gz deleted file mode 100644 index b6ed842..0000000 --- a/dhall-json-1.7.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7034a8367472d92405db9b45052cb0fbc31dc72c524b0597dd268f145b388c3c -size 32694 diff --git a/dhall-json-1.7.9.tar.gz b/dhall-json-1.7.9.tar.gz new file mode 100644 index 0000000..ebcde3f --- /dev/null +++ b/dhall-json-1.7.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6b9f4f6046648d2c51c6a7d11b5c08b0935d820cc5dfb67aaec5363b7213487 +size 33255 diff --git a/dhall-json.cabal b/dhall-json.cabal new file mode 100644 index 0000000..7f6f750 --- /dev/null +++ b/dhall-json.cabal @@ -0,0 +1,131 @@ +Name: dhall-json +Version: 1.7.9 +x-revision: 2 +Cabal-Version: >=1.10 +Build-Type: Simple +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.4.6.0 && < 2.1 , + aeson-pretty < 0.9 , + aeson-yaml >= 1.1.0 && < 1.2 , + bytestring < 0.12, + containers >= 0.5.9 && < 0.7 , + dhall >= 1.40.0 && < 1.41, + exceptions >= 0.8.3 && < 0.11, + filepath < 1.5 , + lens-family-core >= 1.0.0 && < 2.2 , + optparse-applicative >= 0.14.0.0 && < 0.18, + prettyprinter >= 1.7.0 && < 1.8 , + scientific >= 0.3.0.0 && < 0.4 , + text >= 0.11.1.0 && < 2.1 , + unordered-containers < 0.3 , + vector + Exposed-Modules: + Dhall.JSON + Dhall.JSONToDhall + Dhall.JSON.Yaml + Dhall.DhallToYaml.Main + Other-Modules: + Dhall.JSON.Compat + 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 , + 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 , + dhall , + dhall-json , + exceptions >= 0.8.3 && < 0.11, + optparse-applicative , + prettyprinter , + prettyprinter-ansi-terminal >= 1.1.1 && < 1.2 , + text + 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.5, + 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 1fcdc2c..0c410cc 100644 --- a/dhall-json.changes +++ b/dhall-json.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:24 UTC 2022 - psimons@suse.com + +- Update dhall-json to version 1.7.9 revision 2. + 1.7.9 + + * [Build against `aeson-2.0`](https://github.com/dhall-lang/dhall-haskell/pull/2315) + ------------------------------------------------------------------- Sun Aug 22 15:48:17 UTC 2021 - psimons@suse.com diff --git a/dhall-json.spec b/dhall-json.spec index 89e51ab..a3a6549 100644 --- a/dhall-json.spec +++ b/dhall-json.spec @@ -1,7 +1,7 @@ # # spec file for package dhall-json # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,13 @@ %global pkg_name dhall-json %bcond_with tests Name: %{pkg_name} -Version: 1.7.8 +Version: 1.7.9 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/2.cabal#/%{name}.cabal BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -83,6 +84,7 @@ This package provides the Haskell %{name} library development files. %prep %autosetup +cp -p %{SOURCE1} %{name}.cabal %build %ghc_lib_build From 002ac75a474586ed5a496b3cc89cf3fc19207517eb8188eeba5400d4226a4e62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Feb 2022 02:01:30 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-json revision:20, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-json?expand=0&rev=24 --- dhall-json.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall-json.changes b/dhall-json.changes index 0c410cc..1e3885e 100644 --- a/dhall-json.changes +++ b/dhall-json.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 4 12:15:24 UTC 2022 - psimons@suse.com +Thu Feb 3 03:29:24 UTC 2022 - Peter Simons - Update dhall-json to version 1.7.9 revision 2. 1.7.9