diff --git a/.appveyor.yml b/.appveyor.yml
index 8c09121f8107cbba7dcd8886dc353c4821881a2c..26ac92ef9380ef676011e65269f5ae4b97dbf439 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-# ~*~ auto-generated by haskell-ci with config : 38018d70f0eae470b08e5cbec7eca488e57e227627db463c3999acfaa8b2fb30 ~*~
+# ~*~ auto-generated by haskell-ci with config : 0a4c6a0fd68c5b852764201c037cae7f29b1cb3f3856f78d1a20fe2e44845097 ~*~
 
 version: "{build}"
 clone_folder: C:\project
@@ -9,6 +9,8 @@ cache:
 environment:
   global:
     STACK_ROOT: "C:\\SR"
+  matrix:
+    - { BUILD: "ghc-8.6", STACKCMD: "stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps", STACKCFG: "{ resolver: lts-13.5, packages: [ '.' ], extra-deps: [], flags: {} }", STACKURL: "https://www.stackage.org/stack/windows-x86_64" }
 
 matrix:
   fast_finish: true
diff --git a/.haskell-ci b/.haskell-ci
index 0b2182f7e99bda30e3c1ce52e26e71243bbfa170..b718ec035f8db2fbe859af281467626b7cb9a3bf 100644
--- a/.haskell-ci
+++ b/.haskell-ci
@@ -1,7 +1,8 @@
 # compiler supported and their equivalent LTS
 compiler: ghc-8.0 lts-9.21
 compiler: ghc-8.2 lts-11.22
-compiler: ghc-8.4 lts-12.7
+compiler: ghc-8.4 lts-12.26
+compiler: ghc-8.6 lts-13.5
 
 # gitdep: name location commit
 
@@ -11,17 +12,17 @@ compiler: ghc-8.4 lts-12.7
 # builds
 # recognized simple options: nohaddock allow-newer allowed-failure
 # kvs options: flag=pkg:flagname extradep=package-version gitdep=name
-build: ghc-8.2
 build: ghc-8.0
-build: ghc-8.0 os=osx
-build: ghc-8.4 extradep=patience-0.1.1
+build: ghc-8.2
+build: ghc-8.4
+build: ghc-8.6 os=osx,linux,windows
 
 # packages
 package: '.'
 
 # extra builds
-hlint: allowed-failure
-weeder: allowed-failure
+hlint: false
+weeder: false
 coverall: false
 
 # travis extra
diff --git a/.travis.yml b/.travis.yml
index a3023cf4ad4854ee469a55422c8a1751b187748e..1196fa1d0a958fb377f56157a2d5dde52d1747b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# ~*~ auto-generated by haskell-ci with config : 38018d70f0eae470b08e5cbec7eca488e57e227627db463c3999acfaa8b2fb30 ~*~
+# ~*~ auto-generated by haskell-ci with config : 4f10ebe6d264e64568e369d32a9b5a82649d7c2eed45f7722f41ec22c42fd0a7 ~*~
 
 # Use new container infrastructure to enable caching
 sudo: false
@@ -12,15 +12,12 @@ cache:
 
 matrix:
   include:
-  - { env: BUILD=stack RESOLVER=ghc-8.2, compiler: ghc-8.2, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   - { env: BUILD=stack RESOLVER=ghc-8.0, compiler: ghc-8.0, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
-  - { env: BUILD=stack RESOLVER=ghc-8.0, compiler: ghc-8.0, language: generic, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx }
+  - { env: BUILD=stack RESOLVER=ghc-8.2, compiler: ghc-8.2, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   - { env: BUILD=stack RESOLVER=ghc-8.4, compiler: ghc-8.4, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
-  - { env: BUILD=hlint, compiler: hlint, language: generic }
-  - { env: BUILD=weeder, compiler: weeder, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
+  - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx }
+  - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   allow_failures:
-  - { env: BUILD=hlint, compiler: hlint, language: generic }
-  - { env: BUILD=weeder, compiler: weeder, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
 
 install:
   - export PATH=$HOME/.local/bin::$HOME/.cabal/bin:$PATH
@@ -47,20 +44,20 @@ script:
     stack)
       # create the build stack.yaml
       case "$RESOLVER" in
-      ghc-8.2)
-        echo "{ resolver: lts-10.7, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
-        stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
-        ;;
       ghc-8.0)
         echo "{ resolver: lts-9.21, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
-      ghc-8.0)
-        echo "{ resolver: lts-9.21, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
+      ghc-8.2)
+        echo "{ resolver: lts-11.22, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
       ghc-8.4)
-        echo "{ resolver: lts-12.1, packages: [ '.' ], extra-deps: [ patience-0.1.1 ], flags: {} }" > stack.yaml
+        echo "{ resolver: lts-12.26, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
+        stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
+        ;;
+      ghc-8.6)
+        echo "{ resolver: lts-13.7, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
       esac
diff --git a/stack.yaml b/stack.yaml
index fd510af7413b420e8e4bcac0983c7110b785639a..34c4074597ac429d90a555f8e02678ddce036988 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,3 @@
-resolver: lts-12.21
-packages:
-- .
-extra-deps: []
+# ~*~ auto-generated by haskell-ci with config : 0a4c6a0fd68c5b852764201c037cae7f29b1cb3f3856f78d1a20fe2e44845097 ~*~
+{ resolver: lts-13.5, packages: [ '.' ], extra-deps: [], flags: {} }
+