From 3e2eabd4c671bd926ef33c37ce6cc4458982d38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 5 Nov 2018 15:25:15 +0000
Subject: [PATCH 1/2] Add back: katip, mixpanel-cient, systemd, pretty-sop

---
 build-constraints.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index aa2e16e9..a86beb26 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2623,7 +2623,7 @@ packages:
         - ua-parser
         - hs-GeoIP
         - retry
-        - katip < 0 # via aeson-1.3.1.0
+        - katip
         # - katip-elasticsearch # async 2.2
 
     "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
@@ -3484,6 +3484,8 @@ packages:
     "Domen Kozar <domen@enlambda.com> @domenkozar":
         - cachix
         - cachix-api
+        - mixpanel-client
+        - pretty-sop
         - servant-auth
         - servant-auth-server
         - servant-auth-client
@@ -3494,6 +3496,7 @@ packages:
         - servant-streaming-client
         - servant-streaming-server
         - streaming-wai
+        - systemd
 
     "Andre Van Der Merwe <stackage@andrevdm.com> @andrevdm":
         - bhoogle

From f7d82a4cfa8f30db4e574818fcf459ece0a9ff15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 5 Nov 2018 15:30:33 +0000
Subject: [PATCH 2/2] Re-enable servant-auth-* on GHC 8.6

---
 build-constraints.yaml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index a86beb26..fe9f6200 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -709,6 +709,7 @@ packages:
         - vector-instances
         - void
         - wl-pprint-extras
+        - wreq < 0
         - wl-pprint-terminfo
         - zippers
         - zlib-lens
@@ -3990,7 +3991,6 @@ packages:
         - jmacro < 0
         - jmacro-rpc < 0
         - jmacro-rpc-snap < 0
-        - jose < 0
         - jose-jwt < 0
         - json-feed < 0
         - json-rpc-client < 0
@@ -4130,11 +4130,6 @@ packages:
         - seqid < 0
         - seqid-streams < 0
         - servant-JuicyPixels < 0
-        - servant-auth < 0
-        - servant-auth-client < 0
-        - servant-auth-docs < 0
-        - servant-auth-server < 0
-        - servant-auth-swagger < 0
         - servant-checked-exceptions < 0
         - servant-checked-exceptions-core < 0
         - servant-dhall < 0
@@ -4239,7 +4234,6 @@ packages:
         - withdependencies < 0
         - wl-pprint-extras < 0
         - wl-pprint-terminfo < 0
-        - wreq < 0
         - wreq-stringless < 0
         - ws < 0
         - wss-client < 0
@@ -4584,6 +4578,7 @@ skipped-tests:
     - rss-conduit
     - servant-blaze
     - servant-cassava
+    - servant-auth-server
     - siggy-chardust
     - simple-vec3
     - skews