e49d491 · typeable/servant

git.iko.soy/typeable/servant

Allow aeson-1.2

commite49d4911641802bc5d1d448f4bfca32a37483a2a authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 17 Apr 2017, 21:35 (9 years ago) parent86ad89b

5 files changed+6−7

compare with master

unifiedsplit

.travis.yml+1−1 servant-client/servant-client.cabal+1−1 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1 stack-ghc-8.0.1.yaml → stack-ghc-8.0.2.yaml+2−3

.travis.yml+1−1

@@ -5,7 +5,7 @@ language: c

55env:

66 - STACK_YAML=stack-ghc-7.8.4.yaml

77 - STACK_YAML=stack.yaml

8− - STACK_YAML=stack-ghc-8.0.1.yaml

8+ - STACK_YAML=stack-ghc-8.0.2.yaml

1010addons:

1111 apt:

servant-client/servant-client.cabal+1−1

@@ -38,7 +38,7 @@ library

3838 build-depends:

3939 base >= 4.7 && < 4.10

4040 , base-compat >= 0.9.1 && < 0.10

41− , aeson >= 0.7 && < 1.2

41+ , aeson >= 0.7 && < 1.3

4242 , attoparsec >= 0.12 && < 0.14

4343 , base64-bytestring >= 1.0.0.1 && < 1.1

4444 , bytestring >= 0.10 && < 0.11

servant-server/servant-server.cabal+1−1

@@ -51,7 +51,7 @@ library

5151 build-depends:

5252 base >= 4.7 && < 4.10

5353 , base-compat >= 0.9 && < 0.10

54− , aeson >= 0.7 && < 1.2

54+ , aeson >= 0.7 && < 1.3

5555 , attoparsec >= 0.12 && < 0.14

5656 , base64-bytestring >= 1.0 && < 1.1

5757 , bytestring >= 0.10 && < 0.11

servant/servant.cabal+1−1

@@ -56,7 +56,7 @@ library

5656 build-depends:

5757 base >= 4.7 && < 4.10

5858 , base-compat >= 0.9 && < 0.10

59− , aeson >= 0.7 && < 1.2

59+ , aeson >= 0.7 && < 1.3

6060 , attoparsec >= 0.12 && < 0.14

6161 , bytestring >= 0.10 && < 0.11

6262 , case-insensitive >= 1.2 && < 1.3

stack-ghc-8.0.1.yaml → stack-ghc-8.0.2.yamlrenamed+2−3

@@ -1,4 +1,4 @@

1−resolver: nightly-2016-12-31

1+resolver: nightly-2017-04-01

22packages:

33- servant/

44- servant-client/

@@ -7,5 +7,4 @@ packages:

77- servant-server/

88- doc/tutorial

99extra-deps:

10−- aeson-1.1.0.0

11−- servant-js-0.9.1

10+- aeson-1.2.0.0