5 files changed, 21 insertions, 13 deletions

diff --git a/bittorrent/bittorrent.cabal b/bittorrent/bittorrent.cabal
index e2e6e804..8ec314e7 100644
--- a/bittorrent/bittorrent.cabal
+++ b/bittorrent/bittorrent.cabal
@@ -6,7 +6,7 @@ author:                Sam Truzjan
 maintainer:            Sam Truzjan <pxqr.sta@gmail.com>
 copyright:             (c) 2013, Sam Truzjan
 category:              Network
-build-type:            Simple
+build-type:            Custom
 cabal-version:         >= 1.10
 tested-with:           GHC == 7.6.3
 homepage:              https://github.com/cobit/bittorrent
diff --git a/dht-client.cabal b/dht-client.cabal
index 58024840..2b9026ad 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -6,9 +6,9 @@ author:                Joe Crayne
 maintainer:            Joe Crayne
 copyright:             (c) 2017 Joe Crayne, (c) 2013, Sam Truzjan
 category:              Network
-build-type:            Simple
+build-type:            Custom
 cabal-version:         >= 1.10
-tested-with:           GHC == 8.0.2
+tested-with:           GHC == 8.0.2, GHC == 7.10.3
 homepage:              https://github.com/cobit/bittorrent
 bug-reports:           https://github.com/cobit/bittorrent/issues
 synopsis:              BitTorrent DHT protocol implementation.
@@ -44,9 +44,9 @@ flag builder
   description: Use older bytestring package and bytestring-builder.
   default: False
 
-flag aeson
-  description: Use aeson for pretty-printing bencoded data.
-  default: True
+-- flag aeson
+--   description: Use aeson for pretty-printing bencoded data.
+--   default: True
 
 flag thread-debug
   description: Add instrumentation to threads.
@@ -132,6 +132,9 @@ library
                     , transformers-base
                     , mtl
 
+  if impl(ghc < 8)
+      Build-depends:  transformers
+
   if flag(network-uri)
       Build-depends:  network      >= 2.6
                     , network-uri  >= 2.6
@@ -154,9 +157,9 @@ library
 
   C-sources:           cbits/cryptonite_xsalsa.c, cbits/cryptonite_salsa.c
 
-  if flag(aeson)
-    build-depends: aeson, aeson-pretty, unordered-containers, vector
-    cpp-options:   -DBENCODE_AESON
+  -- if flag(aeson)
+  build-depends: aeson, aeson-pretty, unordered-containers, vector
+  cpp-options:   -DBENCODE_AESON
   if flag(thread-debug)
     exposed-modules: Control.Concurrent.Lifted.Instrument
                      Control.Concurrent.Async.Lifted.Instrument
diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index effa8520..0df06054 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE KindSignatures #-}
@@ -59,7 +60,11 @@ import qualified Data.ByteString.Base16 as Base16
 import qualified Data.ByteString.Char8  as C8
 import Data.Data
 import Data.Functor.Contravariant
+#if MIN_VERSION_base(4,9,1)
 import Data.Kind
+#else
+import GHC.Exts (Constraint)
+#endif
 import Data.Ord
 import Data.Serialize as S
 import Data.Word
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index d9d7cfbc..959d689c 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ApplicativeDo              #-}
+{- LANGUAGE ApplicativeDo              -}
 {-# LANGUAGE BangPatterns               #-}
 {-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DataKinds                  #-}
@@ -13,7 +13,7 @@
 {-# LANGUAGE PatternSynonyms            #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TupleSections              #-}
-{-# LANGUAGE TypeApplications           #-}
+{- LANGUAGE TypeApplications           -}
 module Network.Tox.NodeId
     ( NodeInfo(..)
     , NodeId
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index a521c39e..2b4df5af 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -12,7 +12,7 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE TypeFamilyDependencies     #-}
+{- LANGUAGE TypeFamilyDependencies     -}
 {-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE UndecidableInstances       #-}
 module Network.Tox.Onion.Transport
@@ -209,7 +209,7 @@ instance LessThanThree N0
 instance LessThanThree N1
 instance LessThanThree N2
 
-type family ThreeMinus n = r | r -> n where
+type family ThreeMinus n where
     ThreeMinus N3 = N0
     ThreeMinus N2 = N1
     ThreeMinus N1 = N2