Merge branch 'master' into add-binary-search

build-constraints.yaml

@@ -1162,9 +1162,25 @@ packages:
 
     "Index Int <vlad.z.4096@gmail.com>":
         - transformers-lift
+        - ether
 
     "Juan Pedro Villa Isaza jvilla@stackbuilders.com @jpvillaisaza":
         - inflections
+        - twitter-feed
+
+    "Sergey Alirzaev <zl29ah@gmail.com>":
+        - monad-peel
+        - Network-NineP
+
+    "Oliver Charles <ollie@ocharles.org.uk>":
+        - engine-io
+        - diff3
+        - digestive-functors-aeson
+        - exhaustive
+        # Needs pkg-config libsystemd
+        # - libsystemd-journal
+        - network-carbon
+        - socket-io
 
     "Scott Murphy scott.murphy@plowtech.net @smurphy8":
         - binary-search 
@@ -1179,9 +1195,6 @@ packages:
         - aeson < 0.8.1.0
         - smoothie < 0.3.2
 
-        # https://github.com/fpco/stackage/issues/602
-        - errors < 2
-
         # https://github.com/gtk2hs/gtk2hs/issues/109
         - gtk < 0.13.8
 
@@ -1253,6 +1266,9 @@ package-flags:
     cabal-rpm:
         old-locale: false
 
+    NineP:
+        bytestring-in-base: false
+
 # By skipping a test suite, we do not pull in the build dependencies
 skipped-tests:
     - ReadArgs # old version of hspec
@@ -1588,6 +1604,12 @@ expected-test-failures:
     # https://github.com/rcallahan/xlsior/issues/1
     - xlsior
 
+    # https://github.com/stackbuilders/inflections-hs/issues/10
+    - inflections
+
+    # https://github.com/stackbuilders/twitter-feed/issues/12
+    - twitter-feed
+
 # Haddocks which are expected to fail. Same concept as expected test failures.
 expected-haddock-failures:
     # https://github.com/acw/bytestring-progress/issues/4