From c709334f27d5b8bb240f3d3e90ddab1d5bb2de6a Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 15 Jan 2020 21:21:05 -0800 Subject: [PATCH] Unblock dhall, in the spirit of #4860 --- build-constraints.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 42f0c815..e5272d07 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -158,7 +158,7 @@ packages: "Phil de Joux @philderbeast": - siggy-chardust - detour-via-sci - - hpack-dhall < 0 # via dhall & dhall-json + - hpack-dhall < 0 # via hpack "Matthew Ahrens @mpahrens": - forkable-monad @@ -1048,9 +1048,10 @@ packages: - turtle - foldl - bench - - dhall < 0 # via cborg-json - - dhall-bash < 0 # via dhall - - dhall-json < 0 # via dhall + - dhall + - dhall-bash + - dhall-json + - aeson-yaml # req'd by dhall-json # - dhall-nix # deriving-compat via hnix "Andrew Thaddeus Martin @andrewthad": @@ -1119,7 +1120,7 @@ packages: "Ben Gamari @bgamari": - vector-fftw < 0 # GHC 8.4 via base-4.11.0.0 - - cborg-json < 0 # via base-4.13.0.0 + - cborg-json "Roman Cheplyaka @feuerbach": - action-permutations @@ -3414,7 +3415,7 @@ packages: "Peter Trško @trskop": - between - connection-pool - - verbosity < 0 # via dhall + - verbosity "Devon Hollowood @devonhollowood": - search-algorithms @@ -5263,7 +5264,6 @@ expected-test-failures: # Missing test files in sdist # Hopefully gets fixed in the next release... - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - - dhall-json # https://github.com/dhall-lang/dhall-haskell/issues/996 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254