Merge branch 'master' of github.com:fpco/stackage

build-constraints.yaml

@@ -100,7 +100,10 @@ packages:
         - criterion
         - th-lift
         - singletons
-        - th-desugar
+
+        # https://github.com/fpco/stackage/issues/433
+        - th-desugar < 1.5
+
         - quickcheck-assertions
 
         - distributed-process-simplelocalnet
@@ -681,6 +684,9 @@ packages:
         - pipes-binary
         - pipes-network
 
+    "Tomas Carnecky":
+        - rethinkdb-client-driver
+
     "Stackage upper bounds":
 
         # Force a specific version that's compatible with transformers 0.3