From 9d8be360e87d006e0f06c71b8b257b257c558048 Mon Sep 17 00:00:00 2001
From: Greg Hale <imalsogreg@gmail.com>
Date: Mon, 17 Feb 2020 20:26:38 -0500
Subject: [PATCH] Bump dependencies, nix shell cleanup

---
 nix/reflex-platform.nix     | 4 ++--
 servant-reflex.cabal        | 8 ++++----
 shell.nix                   | 3 ++-
 testserver/testserver.cabal | 8 ++++----
 travis.nix                  | 2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/nix/reflex-platform.nix b/nix/reflex-platform.nix
index d026d5d..0c3e8da 100644
--- a/nix/reflex-platform.nix
+++ b/nix/reflex-platform.nix
@@ -1,7 +1,7 @@
 let
-  rev = "a15d3a2411e7ca7d4ee4853b57c72fe83faee272";
+  rev = "733b07ca683f4929ef3fedfc10ee01ab792c44c6";
 in import (builtins.fetchTarball
   {
     url = "https://github.com/reflex-frp/reflex-platform/archive/${rev}.tar.gz";
-    sha256 = "1dsvw0lah7761vndip1hqal4fjpjv84ravinnfhy83jgfav5ivna";
+    sha256 = "0w7jgwh9b8wdljjbb1rwc7aw9kfywfg26w0pahzd5lkshzrfix72";
   }) {}
diff --git a/servant-reflex.cabal b/servant-reflex.cabal
index f0af099..59f1cb1 100644
--- a/servant-reflex.cabal
+++ b/servant-reflex.cabal
@@ -27,19 +27,19 @@ library
     base                >= 4.8  && < 5,
     bytestring          >= 0.10 && < 0.11,
     case-insensitive    >= 1.2.0.4 && < 1.3,
-    containers          >= 0.5.6   && < 0.6,
+    containers          >= 0.5.6   && < 0.7,
     data-default        >= 0.5  && < 0.8,
     exceptions          >= 0.8  && < 0.11,
     ghcjs-dom           >= 0.2  && < 0.10,
-    http-api-data       >= 0.3.6 && < 0.4,
-    http-media          >= 0.6  && < 0.8,
+    http-api-data       >= 0.3.6 && < 0.5,
+    http-media          >= 0.6  && < 0.10,
     jsaddle             >= 0.8  && < 0.10,
     mtl                 >= 2.2.1 && < 2.3,
     network-uri         >= 2.6  && < 2.7,
     reflex              >= 0.5  && < 0.7,
     reflex-dom-core     >= 0.4  && < 0.6,
     safe                >= 0.3.9 && < 0.4,
-    servant             >= 0.8  && < 0.15,
+    servant             >= 0.8  && < 0.17,
     servant-auth        >= 0.2.1 && < 0.4,
     string-conversions  >= 0.4  && < 0.5,
     text                >= 1.2  && < 1.3,
diff --git a/shell.nix b/shell.nix
index 10f497e..b4a36eb 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1 +1,2 @@
-(import ./travis.nix {nativeCompiler = "ghc";}).ghcPkgs.servant-reflex.env
+{ nativeCompiler ? "ghc8_6" }:
+(import ./travis.nix { inherit nativeCompiler; }).ghcPkgs.servant-reflex.env
diff --git a/testserver/testserver.cabal b/testserver/testserver.cabal
index a4f158d..c75888e 100644
--- a/testserver/testserver.cabal
+++ b/testserver/testserver.cabal
@@ -19,13 +19,13 @@ executable back
   main-is:             Main.hs
   -- other-modules:
   -- other-extensions:
-  build-depends:       aeson >= 0.9 && < 1.4
-                     , base >=4.8 && <4.12
+  build-depends:       aeson >= 0.9 && < 1.5
+                     , base >=4.8 && < 5
                      , mtl
                      , snap >= 1.0 && < 1.2
                      , snap-server  >= 1.0 && < 1.2
-                     , snap-core  >= 1.0 && < 1.1
-                     , servant >= 0.8 && < 0.15
+                     , snap-core  >= 1.0 && < 1.2
+                     , servant >= 0.8 && < 0.17
                      , servant-snap >= 0.8 && < 0.9
                      , text  >= 1.0 && < 1.3
   -- hs-source-dirs:
diff --git a/travis.nix b/travis.nix
index 29b2b25..f2722aa 100644
--- a/travis.nix
+++ b/travis.nix
@@ -21,7 +21,6 @@ let
       http-media      = dontCheck super.http-media;
       servant         = dontCheck super.servant;
       lens-aeson      = dontCheck super.lens-aeson;
-      SHA             = dontCheck super.SHA;
       servant-reflex = lib.appendConfigureFlag
                          (self.callPackage ./default.nix {}) "-fExample";
     };
@@ -32,6 +31,7 @@ let
       servant-snap    = dontCheck ((import ./nix/servant-snap.nix {}) self super);
       testdriver      = self.callCabal2nix "testdriver" ./testdriver {};
       testserver      = import nix/testserver.nix ghcjsPkgs.servant-reflex self super;
+      servant-reflex  = self.callPackage ./default.nix {};
     };
   };