From a84325cb2a530582579760c24f78e5e4104a95d9 Mon Sep 17 00:00:00 2001
From: Abhinav Sarkar <abhinav@abhinavsarkar.net>
Date: Fri, 18 Dec 2015 02:37:17 +0530
Subject: [PATCH] Makes the build work with stack lts-2.

---
 app/Ringo/InputParser.hs        |  9 +++++++--
 ringo.cabal                     | 16 ++++++++--------
 src/Ringo/Extractor/Internal.hs |  5 +++++
 src/Ringo/Generator.hs          |  5 +++++
 src/Ringo/Validator.hs          |  5 +++++
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/Ringo/InputParser.hs b/app/Ringo/InputParser.hs
index d119af4..64408bc 100644
--- a/app/Ringo/InputParser.hs
+++ b/app/Ringo/InputParser.hs
@@ -3,8 +3,13 @@ module Ringo.InputParser (parseInput) where
 import qualified Data.Text as Text
 import qualified Data.Vector as V
 
-import Data.Maybe        (fromMaybe)
-import Data.Vector       ((!), (!?))
+#if MIN_VERSION_base(4,8,0)
+#else
+import Control.Applicative ((<$>), (<*>), pure)
+#endif
+
+import Data.Maybe          (fromMaybe)
+import Data.Vector         ((!), (!?))
 import Data.Yaml hiding (Null)
 
 import Ringo.Types
diff --git a/ringo.cabal b/ringo.cabal
index be8289f..7cfcd87 100644
--- a/ringo.cabal
+++ b/ringo.cabal
@@ -11,24 +11,24 @@ copyright:           2015 Quintype Inc, Nilenso Software LLP
 category:            SQL
 build-type:          Simple
 -- extra-source-files:
-cabal-version:       >=1.20
+cabal-version:       >=1.18
 
 library
   hs-source-dirs:      src
   exposed-modules:     Ringo,
-                       Ringo.Extractor,
+                       Ringo.Types
+  other-modules:       Ringo.Extractor,
                        Ringo.Generator,
                        Ringo.Validator,
-                       Ringo.Types
-  other-modules:       Ringo.Extractor.Internal,
+                       Ringo.Extractor.Internal,
                        Ringo.Utils
   build-depends:       base       >=4.7 && <5,
                        text       >=1.2 && <1.3,
                        containers >=0.5 && <0.6,
-                       mtl        >=2.2 && <2.3
+                       mtl        >=2.1 && <2.3
   ghc-options:         -Wall -fno-warn-unused-do-bind -funbox-strict-fields -fno-warn-orphans -O2
   default-extensions:  OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
-                       TupleSections
+                       TupleSections, CPP
   default-language:    Haskell2010
 
 executable ringo
@@ -42,11 +42,11 @@ executable ringo
                        yaml                 >=0.8  && <0.9,
                        vector               >=0.10 && <0.11,
                        directory            >=1.2  && <1.3,
-                       filepath             >=1.4  && <1.5,
+                       filepath             >=1.3  && <1.5,
                        ringo
   ghc-options:         -Wall -fno-warn-unused-do-bind -funbox-strict-fields -fno-warn-orphans -O2
   default-extensions:  OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
-                       TupleSections
+                       TupleSections, CPP
   default-language:    Haskell2010
 
 test-suite ringo-test
diff --git a/src/Ringo/Extractor/Internal.hs b/src/Ringo/Extractor/Internal.hs
index 4449d73..013aa08 100644
--- a/src/Ringo/Extractor/Internal.hs
+++ b/src/Ringo/Extractor/Internal.hs
@@ -3,6 +3,11 @@ module Ringo.Extractor.Internal where
 import qualified Data.Map  as Map
 import qualified Data.Text as Text
 
+#if MIN_VERSION_base(4,8,0)
+#else
+import Control.Applicative  ((<$>))
+#endif
+
 import Control.Monad.Reader (Reader, asks)
 import Data.Function        (on)
 import Data.Maybe           (mapMaybe, fromMaybe, fromJust)
diff --git a/src/Ringo/Generator.hs b/src/Ringo/Generator.hs
index c4f3df1..344bf25 100644
--- a/src/Ringo/Generator.hs
+++ b/src/Ringo/Generator.hs
@@ -7,6 +7,11 @@ module Ringo.Generator
 
 import qualified Data.Text as Text
 
+#if MIN_VERSION_base(4,8,0)
+#else
+import Control.Applicative  ((<$>))
+#endif
+
 import Control.Monad.Reader (Reader, asks)
 import Data.List            (intersperse, nub, find)
 import Data.Maybe           (fromJust, mapMaybe)
diff --git a/src/Ringo/Validator.hs b/src/Ringo/Validator.hs
index bc6bf2e..61a93e0 100644
--- a/src/Ringo/Validator.hs
+++ b/src/Ringo/Validator.hs
@@ -4,6 +4,11 @@ module Ringo.Validator
        , withFactValidation
        ) where
 
+#if MIN_VERSION_base(4,8,0)
+#else
+import Control.Applicative ((<$>))
+#endif
+
 import Control.Monad.Reader (Reader, asks)
 
 import Ringo.Types