494f5a5 · typeable/katip

git.iko.soy/typeable/katip

Fix quoting issue with env

commit494f5a5b5469c94a28b00ad8ff44b59454290b8b authorMichael Xavier <michael@michaelxavier.net> dateMon 4 Apr 2016, 09:57 (11 years ago) parent45323a1

3 files changed+8−6

compare with master

unifiedsplit

.travis.yml+4−4 katip/examples/example.hs+2−1 katip/examples/example_lens.hs+2−1

.travis.yml+4−4

@@ -14,10 +14,10 @@ addons:

1414# change flags or use --stack-yaml to point to a different file.

1515env:

1616- ARGS="" BUILDFLAGS=""

17−- ARGS="--resolver lts-2.22" BUILDFLAGS="--flag time-locale-compat:-old-locale"

18−- ARGS="--resolver lts-3" BUILDFLAGS=""

19−- ARGS="--resolver lts" BUILDFLAGS=""

20−- ARGS="--resolver nightly" BUILDFLAGS=""

17+- ARGS="--resolver=lts-2.22" BUILDFLAGS="--flag=time-locale-compat:-old-locale"

18+- ARGS="--resolver=lts-3" BUILDFLAGS=""

19+- ARGS="--resolver=lts" BUILDFLAGS=""

20+- ARGS="--resolver=nightly" BUILDFLAGS=""

2121

2222before_install:

2323# Download and unpack the stack executable

katip/examples/example.hs+2−1

@@ -9,6 +9,7 @@ module Main

1010

1111-------------------------------------------------------------------------------

12+import qualified Control.Applicative as A

1213import Control.Monad.Reader

1314import Data.Aeson

1415import Data.Monoid as M

@@ -77,7 +78,7 @@ data MyState = MyState {

7778-------------------------------------------------------------------------------

7879newtype MyStack m a = MyStack {

7980 unStack :: ReaderT MyState m a

80− } deriving (MonadReader MyState, Functor, Applicative, Monad, MonadIO)

81+ } deriving (MonadReader MyState, Functor, A.Applicative, Monad, MonadIO)

8182

8283

8384instance (MonadIO m) => Katip (MyStack m) where

katip/examples/example_lens.hs+2−1

@@ -9,6 +9,7 @@ module Main

1010

1111-------------------------------------------------------------------------------

12+import Control.Applicative as A

1213import Control.Lens hiding ((.=))

1314import Control.Monad.Reader

1415import Data.Aeson

@@ -85,7 +86,7 @@ confrabulateWidgets = return ()

8586-------------------------------------------------------------------------------

8687newtype MyStack m a = MyStack {

8788 unStack :: ReaderT MyState m a

88− } deriving (MonadReader MyState, Functor, Applicative, Monad, MonadIO)

89+ } deriving (MonadReader MyState, Functor, A.Applicative, Monad, MonadIO)

8990

9091

9192instance (MonadIO m) => Katip (MyStack m) where