update to 1.37.1

This commit is contained in:
Jens Petersen 2021-08-05 01:25:49 +08:00
parent cd4100a34f
commit 38e6509678
4 changed files with 86 additions and 41 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/dhall-1.32.0.tar.gz
/dhall-1.37.1.tar.gz

View File

@ -1,9 +1,9 @@
Name: dhall
Version: 1.32.0
x-revision: 4
Version: 1.37.1
x-revision: 1
Cabal-Version: >=1.10
Build-Type: Simple
Tested-With: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
Tested-With: GHC == 8.4.3, GHC == 8.6.1
License: BSD3
License-File: LICENSE
Copyright: 2017 Gabriel Gonzalez
@ -23,11 +23,12 @@ Description:
.
Read "Dhall.Tutorial" to learn how to use this library
Category: Compiler
Data-Files:
man/dhall.1
Extra-Source-Files:
benchmark/deep-nested-large-record/*.dhall
benchmark/examples/*.dhall
benchmark/examples/normalize/*.dhall
man/dhall.1
CHANGELOG.md
dhall-lang/Prelude/Bool/and
dhall-lang/Prelude/Bool/build
@ -38,11 +39,14 @@ Extra-Source-Files:
dhall-lang/Prelude/Bool/or
dhall-lang/Prelude/Bool/package.dhall
dhall-lang/Prelude/Bool/show
dhall-lang/Prelude/Bool/*.dhall
dhall-lang/Prelude/Double/package.dhall
dhall-lang/Prelude/Double/show
dhall-lang/Prelude/Double/*.dhall
dhall-lang/Prelude/Function/compose
dhall-lang/Prelude/Function/identity
dhall-lang/Prelude/Function/package.dhall
dhall-lang/Prelude/Function/*.dhall
dhall-lang/Prelude/Integer/abs
dhall-lang/Prelude/Integer/add
dhall-lang/Prelude/Integer/clamp
@ -62,6 +66,7 @@ Extra-Source-Files:
dhall-lang/Prelude/Integer/subtract
dhall-lang/Prelude/Integer/toDouble
dhall-lang/Prelude/Integer/toNatural
dhall-lang/Prelude/Integer/*.dhall
dhall-lang/Prelude/JSON/Format
dhall-lang/Prelude/JSON/Nesting
dhall-lang/Prelude/JSON/Tagged
@ -81,11 +86,13 @@ Extra-Source-Files:
dhall-lang/Prelude/JSON/package.dhall
dhall-lang/Prelude/JSON/render
dhall-lang/Prelude/JSON/renderAs
dhall-lang/Prelude/JSON/renderCompact.dhall
dhall-lang/Prelude/JSON/renderInteger.dhall
dhall-lang/Prelude/JSON/renderYAML
dhall-lang/Prelude/JSON/string
dhall-lang/Prelude/JSON/tagInline
dhall-lang/Prelude/JSON/tagNested
dhall-lang/Prelude/JSON/*.dhall
dhall-lang/Prelude/List/all
dhall-lang/Prelude/List/any
dhall-lang/Prelude/List/build
@ -111,10 +118,13 @@ Extra-Source-Files:
dhall-lang/Prelude/List/reverse
dhall-lang/Prelude/List/shifted
dhall-lang/Prelude/List/take
dhall-lang/Prelude/List/unpackOptionals
dhall-lang/Prelude/List/unzip
dhall-lang/Prelude/List/zip
dhall-lang/Prelude/List/*.dhall
dhall-lang/Prelude/Location/Type
dhall-lang/Prelude/Location/package.dhall
dhall-lang/Prelude/Location/*.dhall
dhall-lang/Prelude/Map/Entry
dhall-lang/Prelude/Map/Type
dhall-lang/Prelude/Map/empty
@ -124,6 +134,7 @@ Extra-Source-Files:
dhall-lang/Prelude/Map/map
dhall-lang/Prelude/Map/package.dhall
dhall-lang/Prelude/Map/values
dhall-lang/Prelude/Map/*.dhall
dhall-lang/Prelude/Monoid
dhall-lang/Prelude/Natural/build
dhall-lang/Prelude/Natural/enumerate
@ -148,6 +159,8 @@ Extra-Source-Files:
dhall-lang/Prelude/Natural/sum
dhall-lang/Prelude/Natural/toDouble
dhall-lang/Prelude/Natural/toInteger
dhall-lang/Prelude/Natural/*.dhall
dhall-lang/Prelude/Operator/package.dhall
dhall-lang/Prelude/Optional/all
dhall-lang/Prelude/Optional/any
dhall-lang/Prelude/Optional/build
@ -163,6 +176,7 @@ Extra-Source-Files:
dhall-lang/Prelude/Optional/package.dhall
dhall-lang/Prelude/Optional/toList
dhall-lang/Prelude/Optional/unzip
dhall-lang/Prelude/Optional/*.dhall
dhall-lang/Prelude/Text/concat
dhall-lang/Prelude/Text/concatMap
dhall-lang/Prelude/Text/concatMapSep
@ -170,9 +184,11 @@ Extra-Source-Files:
dhall-lang/Prelude/Text/default
dhall-lang/Prelude/Text/defaultMap
dhall-lang/Prelude/Text/package.dhall
dhall-lang/Prelude/Text/replace.dhall
dhall-lang/Prelude/Text/replicate
dhall-lang/Prelude/Text/show
dhall-lang/Prelude/Text/spaces
dhall-lang/Prelude/Text/*.dhall
dhall-lang/Prelude/XML/Type
dhall-lang/Prelude/XML/attribute
dhall-lang/Prelude/XML/element
@ -181,6 +197,8 @@ Extra-Source-Files:
dhall-lang/Prelude/XML/package.dhall
dhall-lang/Prelude/XML/render
dhall-lang/Prelude/XML/text
dhall-lang/Prelude/XML/*.dhall
dhall-lang/Prelude/*.dhall
dhall-lang/Prelude/package.dhall
dhall-lang/tests/alpha-normalization/success/unit/*.dhall
dhall-lang/tests/alpha-normalization/success/regression/*.dhall
@ -189,7 +207,8 @@ Extra-Source-Files:
dhall-lang/tests/binary-decode/success/unit/*.dhallb
dhall-lang/tests/binary-decode/success/unit/imports/*.dhall
dhall-lang/tests/binary-decode/success/unit/imports/*.dhallb
dhall-lang/tests/import/cache/dhall/1220efc43103e49b56c5bf089db8e0365bbfc455b8a2f0dc6ee5727a3586f85969fd
dhall-lang/tests/import/cache/dhall/12203871180b87ecaba8b53fffb2a8b52d3fce98098fab09a6f759358b9e8042eedc
dhall-lang/tests/import/cache/dhall/1220618f785ce8f3930a9144398f576f0a992544b51212bc9108c31b4e670dc6ed21
dhall-lang/tests/import/data/*.dhall
dhall-lang/tests/import/data/*.txt
dhall-lang/tests/import/failure/*.dhall
@ -425,6 +444,7 @@ Extra-Source-Files:
tests/lint/success/*.dhall
tests/recursive/*.dhall
tests/regression/*.dhall
tests/schemas/*.dhall
tests/tags/*.dhall
tests/tags/*.tags
tests/th/*.dhall
@ -439,6 +459,12 @@ Flag with-http
Default: True
Manual: True
Flag use-http-client-tls
Description: Use http-client-tls for resolving HTTP imports by default
(requires with-http to be enabled)
Default: True
Manual: True
Flag cross
Description: Disable TemplateHaskell to make cross-compiling easier
Default: False
@ -447,18 +473,18 @@ Flag cross
Library
Hs-Source-Dirs: src
Build-Depends:
base >= 4.9.1.0 && < 5 ,
base >= 4.11.0.0 && < 5 ,
aeson >= 1.0.0.0 && < 1.6 ,
aeson-pretty < 0.9 ,
ansi-terminal >= 0.6.3.1 && < 0.11,
ansi-terminal >= 0.6.3.1 && < 0.12,
atomic-write >= 0.2.0.7 && < 0.3 ,
bytestring < 0.11,
case-insensitive < 1.3 ,
cborg >= 0.2.0.0 && < 0.3 ,
cborg-json >= 0.2.2.0 && < 0.3 ,
containers >= 0.5.0.0 && < 0.7 ,
containers >= 0.5.8.0 && < 0.7 ,
contravariant < 1.6 ,
data-fix < 0.3 ,
data-fix < 0.4 ,
deepseq < 1.5 ,
Diff >= 0.2 && < 0.5 ,
directory >= 1.3.0.0 && < 1.4 ,
@ -470,36 +496,36 @@ Library
haskeline >= 0.7.2.1 && < 0.9 ,
hashable >= 1.2 && < 1.4 ,
lens-family-core >= 1.0.0 && < 2.2 ,
megaparsec >= 7 && < 8.1 ,
megaparsec >= 7 && < 9.1 ,
memory >= 0.14 && < 0.16,
mmorph < 1.2 ,
mtl >= 2.2.1 && < 2.3 ,
network-uri >= 2.6 && < 2.7 ,
optparse-applicative >= 0.14.0.0 && < 0.16,
optparse-applicative >= 0.14.0.0 && < 0.17,
parsers >= 0.12.4 && < 0.13,
parser-combinators ,
prettyprinter >= 1.5.1 && < 1.7 ,
prettyprinter >= 1.5.1 && < 1.8 ,
prettyprinter-ansi-terminal >= 1.1.1 && < 1.2 ,
pretty-simple < 4 ,
profunctors >= 3.1.2 && < 5.6 ,
repline >= 0.2.1.0 && < 0.4 ,
pretty-simple < 4.1 ,
profunctors >= 3.1.2 && < 5.7 ,
repline >= 0.4.0.0 && < 0.5 ,
serialise >= 0.2.0.0 && < 0.3 ,
scientific >= 0.3.0.0 && < 0.4 ,
template-haskell >= 2.11.1.0 && < 2.17,
template-haskell >= 2.13.0.0 && < 2.17,
text >= 0.11.1.0 && < 1.3 ,
text-manipulate >= 0.2.0.1 && < 0.3 ,
text-manipulate >= 0.2.0.1 && < 0.4 ,
th-lift-instances >= 0.1.13 && < 0.2 ,
transformers >= 0.2.0.0 && < 0.6 ,
transformers-compat >= 0.6.2 && < 0.7 ,
unordered-containers >= 0.1.3.0 && < 0.3 ,
uri-encode < 1.6 ,
vector >= 0.11.0.0 && < 0.13
if !impl(ghc >= 8.0) && !impl(eta >= 0.8.4)
Build-Depends: semigroups == 0.18.*
Build-Depends: transformers == 0.4.2.*
Build-Depends: fail == 4.9.*
if flag(with-http)
CPP-Options:
-DWITH_HTTP
if flag(use-http-client-tls)
CPP-Options:
-DUSE_HTTP_CLIENT_TLS
if impl(ghcjs)
Hs-Source-Dirs: ghcjs-src
Build-Depends:
@ -512,8 +538,10 @@ Library
if flag(with-http)
Build-Depends:
http-types >= 0.7.0 && < 0.13,
http-client >= 0.4.30 && < 0.8 ,
http-client-tls >= 0.2.0 && < 0.4
http-client >= 0.5.0 && < 0.8
if flag(use-http-client-tls)
Build-Depends:
http-client-tls >= 0.2.0 && < 0.4
Other-Extensions:
BangPatterns
@ -563,6 +591,7 @@ Library
Dhall.Parser.Token
Dhall.Pretty
Dhall.Repl
Dhall.Schemas
Dhall.Set
Dhall.Src
Dhall.Substitution
@ -620,6 +649,7 @@ Test-Suite tasty
Dhall.Test.Parser
Dhall.Test.QuickCheck
Dhall.Test.Regression
Dhall.Test.Schemas
Dhall.Test.SemanticHash
Dhall.Test.Substitution
Dhall.Test.TH
@ -639,20 +669,22 @@ Test-Suite tasty
filepath ,
foldl < 1.5 ,
generic-random >= 1.3.0.0 && < 1.4 ,
http-client ,
http-client-tls ,
lens-family-core ,
megaparsec ,
prettyprinter ,
QuickCheck >= 2.10 && < 2.15,
quickcheck-instances >= 0.3.12 && < 0.4 ,
scientific ,
semigroups ,
serialise ,
special-values < 0.2 ,
spoon < 0.4 ,
tasty >= 0.11.2 && < 1.4 ,
tasty-expected-failure < 0.12,
tasty >= 0.11.2 && < 1.5 ,
tasty-expected-failure < 0.13,
tasty-hunit >= 0.10 && < 0.11,
tasty-quickcheck >= 0.9.2 && < 0.11,
tasty-silver < 3.3 ,
template-haskell ,
text >= 0.11.1.0 && < 1.3 ,
transformers ,
@ -676,11 +708,6 @@ Test-Suite doctest
mockery < 0.4 ,
doctest >= 0.7.0 && < 0.18
Default-Language: Haskell2010
-- `doctest` doesn't work with `MIN_VERSION` macros before GHC 8
--
-- See: https://ghc.haskell.org/trac/ghc/ticket/10970
if impl(ghc < 8.0)
Buildable: False
Benchmark dhall-parser
Type: exitcode-stdio-1.0
@ -693,12 +720,11 @@ Benchmark dhall-parser
dhall ,
directory ,
gauge >= 0.2.3 && < 0.3,
serialise ,
text >= 0.11.1.0 && < 1.3
Default-Language: Haskell2010
Other-Extensions:
TypeApplications
ghc-options: -rtsopts
ghc-options: -rtsopts -Wall
Benchmark deep-nested-large-record
Type: exitcode-stdio-1.0
@ -710,3 +736,4 @@ Benchmark deep-nested-large-record
dhall ,
gauge >= 0.2.3 && < 0.3
Default-Language: Haskell2010
ghc-options: -Wall

View File

@ -4,11 +4,11 @@
%global pkg_name dhall
%global pkgver %{pkg_name}-%{version}
# testsuite missing deps: generic-random quickcheck-instances special-values spoon tasty-expected-failure
# testsuite missing deps: generic-random quickcheck-instances special-values spoon tasty-expected-failure tasty-silver
Name: %{pkg_name}
Version: 1.32.0
Release: 5%{?dist}
Version: 1.37.1
Release: 1%{?dist}
Summary: A configuration language guaranteed to terminate
License: BSD
@ -50,6 +50,7 @@ BuildRequires: ghc-http-types-prof
BuildRequires: ghc-lens-family-core-prof
BuildRequires: ghc-megaparsec-prof
BuildRequires: ghc-memory-prof
BuildRequires: ghc-mmorph-prof
BuildRequires: ghc-mtl-prof
BuildRequires: ghc-network-uri-prof
BuildRequires: ghc-optparse-applicative-prof
@ -71,6 +72,7 @@ BuildRequires: ghc-transformers-compat-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-uri-encode-prof
BuildRequires: ghc-vector-prof
Requires: %{name}-common = %{version}-%{release}
# End cabal-rpm deps
%description
@ -85,8 +87,17 @@ type-checks a Dhall file and reduces the file to a fully evaluated normal form.
Read "Dhall.Tutorial" to learn how to use this library.
%package common
Summary: %{name} common files
BuildArch: noarch
%description common
This package provides the %{name} common data files.
%package -n ghc-%{name}
Summary: Haskell %{name} library
Requires: %{name}-common = %{version}-%{release}
%description -n ghc-%{name}
This package provides the Haskell %{name} shared library.
@ -142,6 +153,7 @@ cp -bp %{SOURCE1} %{name}.cabal
%install
# Begin cabal-rpm install
%ghc_lib_install
mv %{buildroot}%{_ghcdocdir}{,-common}
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
%{buildroot}%{_bindir}/%{name} --bash-completion-script %{name} > %{buildroot}%{_datadir}/bash-completion/completions/%{name}
# End cabal-rpm install
@ -150,22 +162,24 @@ install -m 0644 -p -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
%files
# Begin cabal-rpm files:
%license LICENSE
%doc CHANGELOG.md
%{_bindir}/%{name}
%{_datadir}/bash-completion/completions/%{name}
# End cabal-rpm files
%{_mandir}/man1/%{name}.1*
%files -n ghc-%{name} -f ghc-%{name}.files
%files common
# Begin cabal-rpm files:
%license LICENSE
%doc CHANGELOG.md
%{_datadir}/%{pkgver}
# End cabal-rpm files
%files -n ghc-%{name} -f ghc-%{name}.files
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%doc CHANGELOG.md
%if %{with haddock}
@ -180,6 +194,9 @@ install -m 0644 -p -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
%changelog
* Thu Aug 5 2021 Jens Petersen <petersen@redhat.com> - 1.37.1-1
- update to 1.37.1
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (dhall-1.32.0.tar.gz) = 764a0d6f5edcdc46ebedbf3a584bda818efdae80192ac7f69fe9ea26da3f91c0acbac64dcfb9babbb8287869e34b4496d9011a5b9c7bf1811e9533edecd5449c
SHA512 (dhall-1.37.1.tar.gz) = 178dec33d20070f5a3b5d68d701bc7b383090525172dffe991a8ffdd3d8134b813f20d33a6c7cbd963bc04530c7e484b0d35737147870acd8fa3375f4b419c93