From ed378ff98ab24d3f4292e0343f42a5b7e53c643c Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Fri, 19 May 2017 23:46:52 +0530 Subject: [PATCH] Adds support for stack lts 8. --- .travis.yml | 1 + ringo/ringo.cabal | 4 ++-- ringo/src/Ringo/ArgParser.hs | 1 + stack.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73b79ce..259874e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ env: - ARGS="--resolver lts-5" - ARGS="--resolver lts-6" - ARGS="--resolver lts-7" +- ARGS="--resolver lts-8" - ARGS="--resolver lts" - ARGS="--resolver nightly" diff --git a/ringo/ringo.cabal b/ringo/ringo.cabal index 3278491..3f2be99 100644 --- a/ringo/ringo.cabal +++ b/ringo/ringo.cabal @@ -24,10 +24,10 @@ executable ringo bytestring >=0.10 && <0.11, containers >=0.5 && <0.6, base-compat >=0.6 && <1.0, - optparse-applicative >=0.11 && <0.13, + optparse-applicative >=0.11 && <0.14, yaml >=0.8.11 && <0.9, vector >=0.10 && <0.12, - directory >=1.2 && <1.3, + directory >=1.2 && <1.4, filepath >=1.3 && <1.5, aeson >=0.8 && <1.1, Cabal >=1.18 && <1.25, diff --git a/ringo/src/Ringo/ArgParser.hs b/ringo/src/Ringo/ArgParser.hs index 56b10dd..509a25d 100644 --- a/ringo/src/Ringo/ArgParser.hs +++ b/ringo/src/Ringo/ArgParser.hs @@ -11,6 +11,7 @@ import qualified Distribution.CurrentPackageDescription as P import qualified Distribution.Text as DText import Data.List (intercalate) +import Data.Monoid ((<>)) import Options.Applicative import System.Environment (getProgName) diff --git a/stack.yaml b/stack.yaml index ca9ef8e..f4a6387 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,7 @@ # For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md # 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.0 +resolver: lts-8.14 # Local packages, usually specified by relative directory name packages: