From 94cce480bd8c6d0a7d3af22d13889d1d5f72b3ea Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 13 Mar 2018 14:44:05 -0700 Subject: [PATCH] Revert "Revert "Remove constraint "Cabal < 2.2", see #3340"" This reverts commit ea03b95ea1e39aab6c0c2a6821e6df2712d55460. --- build-constraints.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb411241..5b5f93a0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5558,6 +5558,10 @@ packages: - cipher-rc4 < 0 # GHC 8.4 via crypto-cipher-types - cryptocipher < 0 # GHC 8.4 via crypto-cipher-types - plot < 0 # GHC 8.4 via pango + - cabal-toolkit < 0 # GHC 8.4 via Cabal-2.2.0.0 + - entropy < 0 # GHC 8.4 via Cabal-2.2.0.0 + - crypto-random-api < 0 # GHC 8.4 via entropy + - scrypt < 0 # GHC 8.4 via entropy "GHC upper bounds": @@ -5626,21 +5630,10 @@ packages: # https://github.com/fpco/stackage/issues/3337 - aeson < 1.3 - # https://github.com/fpco/stackage/issues/3340 - - Cabal < 2.2 - # https://github.com/athanclark/websockets-rpc/issues/2 # (downstream build failure) - websockets-simple < 0.0.7 - # Requires too-new or too-old Cabal - - cabal2nix < 2.9 # Cabal >2.2 - - distribution-nixpkgs < 1.1.1 # Cabal >2.2 - - hackage-db < 2.0.1 # Cabal >2.2 - - # Requires too-new base - - xhtml < 3000.2.2.1 # base >= 4.11 - # https://github.com/jtdaugherty/vty/issues/147 # (downstream build failure) - microlens < 0.4.9