From 523d266a3f848e0e06e1f9e82010ead8c77bdf33 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 27 Jul 2017 13:00:01 +0300
Subject: [PATCH] Remove upper bounds and close #2595

---
 build-constraints.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 71a993bc..3a9fc9f8 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -288,7 +288,6 @@ packages:
         - async
         - base16-bytestring
         - c2hs
-        - cassava
         - csv-conduit
         - executable-hash
         - executable-path
@@ -3188,6 +3187,7 @@ packages:
         - type-list
         - vinyl-utils
         - language-lua2 # https://github.com/mitchellwrosen/language-lua2/issues/4
+        - cassava
 
      # If you want to make sure a package is removed from stackage,
      # place it here with a `< 0` constraint and send a pull
@@ -3214,10 +3214,6 @@ packages:
         # https://github.com/haskell/haddock/issues/634 - causes other docs to fail to build
         - haddock < 2.17.5
 
-        # https://github.com/fpco/stackage/issues/2595
-        - cassava < 0.5.0.0
-        - cassava-conduit < 0.4.0.0 # because of above and #2586
-
         # https://github.com/fpco/stackage/issues/2607
         - http-media < 0.7.0
 
@@ -3350,6 +3346,9 @@ package-flags:
     mintty:
         win32-2-5: false
 
+    cassava:
+        pre-bytestring-0-10-4: false
+
 # end of package-flags
 
 # Special configure options for individual packages
@@ -3580,6 +3579,7 @@ skipped-tests:
     - tar
     - vector-builder
     - zlib
+    - text-short
 
 # end of skipped-tests