Makes the build work with stack lts-2.
parent
ea9e100f8f
commit
a84325cb2a
|
@ -3,8 +3,13 @@ module Ringo.InputParser (parseInput) where
|
||||||
import qualified Data.Text as Text
|
import qualified Data.Text as Text
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
|
|
||||||
import Data.Maybe (fromMaybe)
|
#if MIN_VERSION_base(4,8,0)
|
||||||
import Data.Vector ((!), (!?))
|
#else
|
||||||
|
import Control.Applicative ((<$>), (<*>), pure)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
import Data.Maybe (fromMaybe)
|
||||||
|
import Data.Vector ((!), (!?))
|
||||||
import Data.Yaml hiding (Null)
|
import Data.Yaml hiding (Null)
|
||||||
|
|
||||||
import Ringo.Types
|
import Ringo.Types
|
||||||
|
|
16
ringo.cabal
16
ringo.cabal
|
@ -11,24 +11,24 @@ copyright: 2015 Quintype Inc, Nilenso Software LLP
|
||||||
category: SQL
|
category: SQL
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
-- extra-source-files:
|
-- extra-source-files:
|
||||||
cabal-version: >=1.20
|
cabal-version: >=1.18
|
||||||
|
|
||||||
library
|
library
|
||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
exposed-modules: Ringo,
|
exposed-modules: Ringo,
|
||||||
Ringo.Extractor,
|
Ringo.Types
|
||||||
|
other-modules: Ringo.Extractor,
|
||||||
Ringo.Generator,
|
Ringo.Generator,
|
||||||
Ringo.Validator,
|
Ringo.Validator,
|
||||||
Ringo.Types
|
Ringo.Extractor.Internal,
|
||||||
other-modules: Ringo.Extractor.Internal,
|
|
||||||
Ringo.Utils
|
Ringo.Utils
|
||||||
build-depends: base >=4.7 && <5,
|
build-depends: base >=4.7 && <5,
|
||||||
text >=1.2 && <1.3,
|
text >=1.2 && <1.3,
|
||||||
containers >=0.5 && <0.6,
|
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
|
ghc-options: -Wall -fno-warn-unused-do-bind -funbox-strict-fields -fno-warn-orphans -O2
|
||||||
default-extensions: OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
|
default-extensions: OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
|
||||||
TupleSections
|
TupleSections, CPP
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
executable ringo
|
executable ringo
|
||||||
|
@ -42,11 +42,11 @@ executable ringo
|
||||||
yaml >=0.8 && <0.9,
|
yaml >=0.8 && <0.9,
|
||||||
vector >=0.10 && <0.11,
|
vector >=0.10 && <0.11,
|
||||||
directory >=1.2 && <1.3,
|
directory >=1.2 && <1.3,
|
||||||
filepath >=1.4 && <1.5,
|
filepath >=1.3 && <1.5,
|
||||||
ringo
|
ringo
|
||||||
ghc-options: -Wall -fno-warn-unused-do-bind -funbox-strict-fields -fno-warn-orphans -O2
|
ghc-options: -Wall -fno-warn-unused-do-bind -funbox-strict-fields -fno-warn-orphans -O2
|
||||||
default-extensions: OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
|
default-extensions: OverloadedStrings, RecordWildCards, ScopedTypeVariables, BangPatterns,
|
||||||
TupleSections
|
TupleSections, CPP
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
test-suite ringo-test
|
test-suite ringo-test
|
||||||
|
|
|
@ -3,6 +3,11 @@ module Ringo.Extractor.Internal where
|
||||||
import qualified Data.Map as Map
|
import qualified Data.Map as Map
|
||||||
import qualified Data.Text as Text
|
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 Control.Monad.Reader (Reader, asks)
|
||||||
import Data.Function (on)
|
import Data.Function (on)
|
||||||
import Data.Maybe (mapMaybe, fromMaybe, fromJust)
|
import Data.Maybe (mapMaybe, fromMaybe, fromJust)
|
||||||
|
|
|
@ -7,6 +7,11 @@ module Ringo.Generator
|
||||||
|
|
||||||
import qualified Data.Text as Text
|
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 Control.Monad.Reader (Reader, asks)
|
||||||
import Data.List (intersperse, nub, find)
|
import Data.List (intersperse, nub, find)
|
||||||
import Data.Maybe (fromJust, mapMaybe)
|
import Data.Maybe (fromJust, mapMaybe)
|
||||||
|
|
|
@ -4,6 +4,11 @@ module Ringo.Validator
|
||||||
, withFactValidation
|
, withFactValidation
|
||||||
) where
|
) where
|
||||||
|
|
||||||
|
#if MIN_VERSION_base(4,8,0)
|
||||||
|
#else
|
||||||
|
import Control.Applicative ((<$>))
|
||||||
|
#endif
|
||||||
|
|
||||||
import Control.Monad.Reader (Reader, asks)
|
import Control.Monad.Reader (Reader, asks)
|
||||||
|
|
||||||
import Ringo.Types
|
import Ringo.Types
|
||||||
|
|
Loading…
Reference in New Issue