47130c2 · typeable/katip

git.iko.soy/typeable/katip

Get building on stack nightly

commit47130c222ecf35c5f8b6481a46634714e880ff85 authorMichael Xavier <michael@michaelxavier.net> dateWed 1 Jun 2016, 11:58 (10 years ago) parent61de75e

8 files changed+37−9

compare with master

unifiedsplit

.travis.yml+2−2 katip-elasticsearch/katip-elasticsearch.cabal+1−1 katip/katip.cabal+3−3 katip/src/Katip/Core.hs+5 katip/src/Katip/Monadic.hs+3−1 stack-7.8.yaml → stack-lts-2.yaml+1−1 stack-nightly.yaml+21 stack.yaml+1−1

.travis.yml+2−2

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

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

1515env:

1616- ARGS=""

17−- ARGS="--stack-yaml=stack-7.8.yaml"

17+- ARGS="--stack-yaml=stack-lts-2.yaml"

1818- ARGS="--resolver=lts-3"

1919- ARGS="--resolver=lts"

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

20+- ARGS="--stack-yaml=stack-nightly.yaml"

2121

2222before_install:

2323# Download and unpack the stack executable

katip-elasticsearch/katip-elasticsearch.cabal+1−1

@@ -44,7 +44,7 @@ library

4444 , unordered-containers >= 0.1.0.0 && < 0.3

4545 , transformers >= 0.2 && < 0.6

4646 , http-types >= 0.8 && < 0.10

47− , time >= 1 && < 1.6

47+ , time >= 1 && < 1.7

4848 hs-source-dirs: src

4949 default-language: Haskell2010

5050 hs-source-dirs: src

katip/katip.cabal+3−3

@@ -60,9 +60,9 @@ library

6060 , hostname >=1.0 && <1.1

6161 , old-locale >= 1.0 && < 1.1

6262 , string-conv >= 0.1 && < 0.2

63− , template-haskell >= 2.8 && < 2.11

63+ , template-haskell >= 2.8 && < 2.12

6464 , text >= 0.11 && <1.3

65− , time >= 1 && < 1.6

65+ , time >= 1 && < 1.7

6666 , time-locale-compat >= 0.1.0.1 && < 0.2

6767 , transformers >= 0.3 && < 0.6

6868 , transformers-compat

@@ -70,7 +70,7 @@ library

7070 , unordered-containers >= 0.2 && < 0.3

7171 , monad-control >= 1.0 && < 1.1

7272 , mtl >= 2.0 && < 2.3

73− , transformers-base >= 0.3 && < 0.5

73+ , transformers-base >= 0.3 && < 0.6

7474 , resourcet >= 1.1 && < 1.2

7575 , microlens >= 0.2.0.0 && < 0.5

7676 , microlens-th >= 0.1.0.0 && < 0.5

katip/src/Katip/Core.hs+5

@@ -13,6 +13,9 @@

1313{-# LANGUAGE TemplateHaskell #-}

1414{-# LANGUAGE TypeFamilies #-}

1515{-# LANGUAGE UndecidableInstances #-}

16+#if MIN_VERSION_base(4, 9, 0)

17+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}

18+#endif

1619-- | This module is not meant to be imported directly and may contain

1720-- internal mechanisms that will change without notice.

1821module Katip.Core where

@@ -49,7 +52,9 @@ import qualified Data.Text.Lazy.Builder as B

4952import Data.Time

5053import GHC.Generics hiding (to)

5154#if MIN_VERSION_base(4, 8, 0)

55+#if !MIN_VERSION_base(4, 9, 0)

5256import GHC.SrcLoc

57+#endif

5358import GHC.Stack

5459#endif

5560import Language.Haskell.TH

katip/src/Katip/Monadic.hs+3−1

@@ -7,7 +7,9 @@

77{-# LANGUAGE TemplateHaskell #-}

88{-# LANGUAGE TypeFamilies #-}

99{-# LANGUAGE UndecidableInstances #-}

10−

10+#if MIN_VERSION_base(4, 9, 0)

11+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}

12+#endif

1113-- | Provides support for treating payloads and namespaces as

1214-- composable contexts. The common pattern would be to provide a

1315-- 'KatipContext' instance for your base monad.

stack-7.8.yaml → stack-lts-2.yamlrenamed+1−1

@@ -9,7 +9,7 @@ extra-deps:

99 - criterion-1.1.0.0

1010 - attoparsec-0.13.0.1

1111 - rng-utils-0.2.1

12− - retry-0.7.1

12+ - retry-0.7.4

1313 - tasty-0.11.0.2

1414 - tagged-0.8.3

1515 - fail-4.9.0.0

stack-nightly.yamlnew file+21

@@ -0,0 +1,21 @@

1+resolver: nightly-2016-06-01

2+packages:

3+ - katip

4+ - katip-elasticsearch

5+extra-deps:

6+ - bloodhound-0.11.0.0

7+ - string-conv-0.1

8+ - aeson-0.11.1.0

9+ - criterion-1.1.0.0

10+ - attoparsec-0.13.0.1

11+ - rng-utils-0.2.1

12+ - retry-0.7.4

13+ - tasty-0.11.0.2

14+ - tagged-0.8.3

15+ - fail-4.9.0.0

16+ - regex-tdfa-rc-1.1.8.3

17+flags:

18+ katip:

19+ lib-Werror: true

20+ katip-elasticsearch:

21+ lib-Werror: true

stack.yaml+1−1

@@ -9,7 +9,7 @@ extra-deps:

99 - criterion-1.1.0.0

1010 - attoparsec-0.13.0.1

1111 - rng-utils-0.2.1

12− - retry-0.7.1

12+ - retry-0.7.4

1313 - tasty-0.11.0.2

1414 - tagged-0.8.3

1515 - fail-4.9.0.0