diff --git a/ghc-yaml.changes b/ghc-yaml.changes index 66558ee..f9a87fd 100644 --- a/ghc-yaml.changes +++ b/ghc-yaml.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 4 04:42:08 UTC 2023 - Peter Simons + +- Update yaml to version 0.11.11.2 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Sat Jul 1 18:43:54 UTC 2023 - Peter Simons + +- Update yaml to version 0.11.11.2. + ## 0.11.11.2 + + * Compat with aeson 2.2 + ------------------------------------------------------------------- Wed Jun 14 12:46:51 UTC 2023 - Peter Simons diff --git a/ghc-yaml.spec b/ghc-yaml.spec index ef7f02e..2c20767 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -20,12 +20,13 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.11.11.1 +Version: 0.11.11.2 Release: 0 Summary: Support for parsing and rendering YAML documents License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-aeson-prof @@ -110,6 +111,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/yaml-0.11.11.1.tar.gz b/yaml-0.11.11.1.tar.gz deleted file mode 100644 index a94a8b6..0000000 --- a/yaml-0.11.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:209ddc846ee257685dbe715cde66a74e42e31b6004853e7a1952d9ffd650fd48 -size 31861 diff --git a/yaml-0.11.11.2.tar.gz b/yaml-0.11.11.2.tar.gz new file mode 100644 index 0000000..a814c54 --- /dev/null +++ b/yaml-0.11.11.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee74923ee5b0fef74413c58aaa20ea59baf5d29d256a62fb47cc279570d9dc2f +size 31926 diff --git a/yaml.cabal b/yaml.cabal new file mode 100644 index 0000000..d0b2e42 --- /dev/null +++ b/yaml.cabal @@ -0,0 +1,227 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.35.1. +-- +-- see: https://github.com/sol/hpack + +name: yaml +version: 0.11.11.2 +x-revision: 2 +synopsis: Support for parsing and rendering YAML documents. +description: README and API documentation are available at +category: Data +stability: stable +homepage: https://github.com/snoyberg/yaml#readme +bug-reports: https://github.com/snoyberg/yaml/issues +author: Michael Snoyman , Anton Ageev ,Kirill Simonov +maintainer: Michael Snoyman +license: BSD3 +license-file: LICENSE +build-type: Simple +extra-source-files: + test/largest-string.yaml + test/json.yaml + test/resources/foo.yaml + test/resources/bar.yaml + test/resources/baz.yaml + test/resources/accent/foo.yaml + test/resources/loop/foo.yaml + test/resources/loop/bar.yaml + test/resources/empty.yaml + test/resources/empty2.yaml + README.md + ChangeLog.md + +source-repository head + type: git + location: https://github.com/snoyberg/yaml + +flag no-examples + description: don't build the examples + manual: False + default: True + +flag no-exe + description: don't install the yaml2json or json2yaml executables + manual: False + default: True + +library + exposed-modules: + Data.Yaml + Data.Yaml.Aeson + Data.Yaml.Builder + Data.Yaml.Config + Data.Yaml.Include + Data.Yaml.Internal + Data.Yaml.Parser + Data.Yaml.Pretty + Data.Yaml.TH + other-modules: + Paths_yaml + hs-source-dirs: + src + other-extensions: + LambdaCase + ghc-options: -Wall -Wcompat + build-depends: + aeson >=0.11 + , attoparsec >=0.11.3.0 + , base >=4.9.1 && <5 + , bytestring >=0.9.1.4 + , conduit >=1.2.8 && <1.4 + , containers + , directory + , filepath + , libyaml ==0.1.* + , mtl + , resourcet >=0.3 && <1.4 + , scientific >=0.3 + , template-haskell + , text + , transformers >=0.1 + , unordered-containers + , vector + default-language: Haskell2010 + +executable examples + main-is: Main.hs + other-modules: + Config + Simple + Paths_yaml + hs-source-dirs: + examples + ghc-options: -Wall -Wcompat + build-depends: + aeson >=0.11 + , attoparsec >=0.11.3.0 + , base >=4.9.1 && <5 + , bytestring >=0.9.1.4 + , conduit >=1.2.8 && <1.4 + , containers + , directory + , filepath + , libyaml ==0.1.* + , mtl + , resourcet >=0.3 && <1.4 + , scientific >=0.3 + , template-haskell + , text + , transformers >=0.1 + , unordered-containers + , vector + default-language: Haskell2010 + if flag(no-examples) + buildable: False + else + build-depends: + raw-strings-qq + , yaml + +executable json2yaml + main-is: json2yaml.hs + other-modules: + Common + Paths_yaml + hs-source-dirs: + exe + ghc-options: -Wall -Wcompat + build-depends: + aeson >=0.11 + , attoparsec >=0.11.3.0 + , base >=4.9.1 && <5 + , bytestring >=0.9.1.4 + , conduit >=1.2.8 && <1.4 + , containers + , directory + , filepath + , libyaml ==0.1.* + , mtl + , optparse-applicative + , resourcet >=0.3 && <1.4 + , scientific >=0.3 + , template-haskell + , text + , transformers >=0.1 + , unordered-containers + , vector + , yaml + default-language: Haskell2010 + if flag(no-exe) + buildable: False + +executable yaml2json + main-is: yaml2json.hs + other-modules: + Common + Paths_yaml + hs-source-dirs: + exe + other-extensions: + CPP + LambdaCase + NamedFieldPuns + ghc-options: -Wall -Wcompat + build-depends: + aeson >=0.11 + , attoparsec >=0.11.3.0 + , base >=4.9.1 && <5 + , bytestring >=0.9.1.4 + , conduit >=1.2.8 && <1.4 + , containers + , directory + , filepath + , libyaml ==0.1.* + , mtl + , optparse-applicative + , resourcet >=0.3 && <1.4 + , scientific >=0.3 + , template-haskell + , text + , transformers >=0.1 + , unordered-containers + , vector + , yaml + default-language: Haskell2010 + if flag(no-exe) + buildable: False + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: + Data.Yaml.IncludeSpec + Data.Yaml.THSpec + Data.YamlSpec + Paths_yaml + hs-source-dirs: + test + ghc-options: -Wall -Wcompat -with-rtsopts=-K1K + cpp-options: -DTEST + build-depends: + HUnit + , aeson >=0.11 + , attoparsec >=0.11.3.0 + , base >=4.9.1 && <5 + , base-compat + , bytestring >=0.9.1.4 + , conduit >=1.2.8 && <1.4 + , containers + , directory + , filepath + , hspec >=1.3 + , libyaml ==0.1.* + , mockery + , mtl + , raw-strings-qq + , resourcet >=0.3 && <1.4 + , scientific >=0.3 + , template-haskell + , temporary + , text + , transformers >=0.1 + , unordered-containers + , vector + , yaml + default-language: Haskell2010