From 6e7f1107bffaf4fbf3837b8de49c7b4d024a3fcf Mon Sep 17 00:00:00 2001
From: Erik Aker <eraker@gmail.com>
Date: Sat, 1 Dec 2018 06:29:35 -0800
Subject: [PATCH] Resolve warnings and build errors and build against recent
 stack lts

---
 .gitignore                 |  2 ++
 servant-py.cabal           |  6 +++---
 src/Servant/PY/Internal.hs | 32 +-------------------------------
 src/Servant/PY/Requests.hs |  2 +-
 stack.yaml                 |  2 +-
 5 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 059678a..462d21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 build/
 examples/*py
 __pycache__
+dist-newstyle
+*ghc.environment*
diff --git a/servant-py.cabal b/servant-py.cabal
index 8343100..a8cd658 100644
--- a/servant-py.cabal
+++ b/servant-py.cabal
@@ -5,12 +5,12 @@ description:
   Automatically derive python functions to query servant webservices.
   .
   Supports deriving functions using Python's requests library.
-homepage:            https://github.com/pellagic-puffbomb/servant-py#readme
+homepage:            https://github.com/erewok/servant-py#readme
 license:             BSD3
 license-file:        LICENSE
 author:              Erik Aker
 maintainer:          eraker@gmail.com
-copyright:           2017 Erik Aker
+copyright:           2019 Erik Aker
 category:            Web
 build-type:          Simple
 extra-source-files:  README.md
@@ -89,4 +89,4 @@ test-suite servant-py-test
 
 source-repository head
   type:     git
-  location: https://github.com/pellagic-puffbomb/servant-py
+  location: https://github.com/erewok/servant-py
diff --git a/src/Servant/PY/Internal.hs b/src/Servant/PY/Internal.hs
index f83ab50..eb6eecb 100644
--- a/src/Servant/PY/Internal.hs
+++ b/src/Servant/PY/Internal.hs
@@ -37,36 +37,6 @@ module Servant.PY.Internal
   , functionArguments
   , formatBuilder
   , remainingReqCall
-  -- re-exports
-  , (:<|>)(..)
-  , (:>)
-  , defReq
-  , reqHeaders
-  , HasForeign(..)
-  , HasForeignType(..)
-  , GenerateList(..)
-  , NoTypes
-  , ArgType(..)
-  , HeaderArg(..)
-  , QueryArg(..)
-  , Req(..)
-  , Segment(..)
-  , SegmentType(..)
-  , Url(..)
-  , Path
-  , Arg(..)
-  , FunctionName(..)
-  , PathSegment(..)
-  , concatCase
-  , snakeCase
-  , camelCase
-  , ReqBody
-  , JSON
-  , FormUrlEncoded
-  , Post
-  , Get
-  , Raw
-  , Header
   ) where
 
 import           Control.Lens                  hiding (List)
@@ -74,7 +44,7 @@ import qualified Data.CharSet                  as Set
 import qualified Data.CharSet.Unicode.Category as Set
 import           Data.Data
 import           Data.Maybe                    (isJust)
-import           Data.Monoid()
+import           Data.Monoid                   ( (<>) )
 import           Data.Text                     (Text)
 import qualified Data.Text                     as T
 import           Data.Text.Encoding            (decodeUtf8)
diff --git a/src/Servant/PY/Requests.hs b/src/Servant/PY/Requests.hs
index 0a26bb4..1b48f9f 100644
--- a/src/Servant/PY/Requests.hs
+++ b/src/Servant/PY/Requests.hs
@@ -1,6 +1,6 @@
 module Servant.PY.Requests where
 
-import           Data.Monoid()
+import           Data.Monoid         ( (<>) )
 import           Data.Proxy
 import           Data.Text           (Text)
 import qualified Data.Text           as T
diff --git a/stack.yaml b/stack.yaml
index 0cc4ef1..bb24ca5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -2,7 +2,7 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-7.19
+resolver: lts-12.20
 
 # Local packages, usually specified by relative directory name
 packages: