1f1f7f3 · typeable/servant

git.iko.soy/typeable/servant

Merge pull request #1318 from haskell-servant/ghc_810

Ghc 810

commit1f1f7f309ae2f192e37167751962b4398fe3d354 authorfisx <mf@zerobuzz.net> dateFri 3 Jul 2020, 08:12 (6 years ago) parent7f4ae61 eaadc9e

9 files changed+14−12

compare with master

unifiedsplit

.travis.yml+4−1 servant-client-core/servant-client-core.cabal+2−2 servant-client/servant-client.cabal+1−1 servant-conduit/servant-conduit.cabal+1−1 servant-docs/servant-docs.cabal+2−3 servant-foreign/servant-foreign.cabal+1−1 servant-http-streams/servant-http-streams.cabal+1−1 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1

.travis.yml+4−1

@@ -37,6 +37,9 @@ jobs:

3737 - compiler: ghcjs-8.4

3838 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"},{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu bionic main"},{"sourceline":"deb https://deb.nodesource.com/node_10.x bionic main","key_url":"https://deb.nodesource.com/gpgkey/nodesource.gpg.key"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}

3939 os: linux

40+ - compiler: ghc-8.10.1

41+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}

42+ os: linux

4043 - compiler: ghc-8.8.2

4144 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.2","cabal-install-3.0"]}}

4245 os: linux

@@ -107,7 +110,7 @@ install:

107110 - cat $CABALHOME/config

108111 - rm -fv cabal.project cabal.project.local cabal.project.freeze

109112 - travis_retry ${CABAL} v2-update -v

110− - if ! $GHCJS ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.2.*') ; fi

113+ - if ! $GHCJS ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.3.*') ; fi

111114 - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan --constraint='cabal-plan ^>=0.6.0.0' --constraint='cabal-plan +exe') ; fi

112115 - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover) ; fi

113116 # Generate cabal.project

servant-client-core/servant-client-core.cabal+2−2

@@ -55,13 +55,13 @@ library

5555 --

5656 -- note: mtl lower bound is so low because of GHC-7.8

5757 build-depends:

58− base >= 4.9 && < 4.14

58+ base >= 4.9 && < 4.15

5959 , bytestring >= 0.10.8.1 && < 0.11

6060 , containers >= 0.5.7.1 && < 0.7

6161 , deepseq >= 1.4.2.0 && < 1.5

6262 , text >= 1.2.3.0 && < 1.3

6363 , transformers >= 0.5.2.0 && < 0.6

64− , template-haskell >= 2.11.1.0 && < 2.16

64+ , template-haskell >= 2.11.1.0 && < 2.17

6565

6666 if !impl(ghc >= 8.2)

6767 build-depends:

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

@@ -45,7 +45,7 @@ library

4545 -- Bundled with GHC: Lower bound to not force re-installs

4646 -- text and mtl are bundled starting with GHC-8.4

4747 build-depends:

48− base >= 4.9 && < 4.14

48+ base >= 4.9 && < 4.15

4949 , bytestring >= 0.10.8.1 && < 0.11

5050 , containers >= 0.5.7.1 && < 0.7

5151 , deepseq >= 1.4.2.0 && < 1.5

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

@@ -40,7 +40,7 @@ library

4040 , mtl >=2.2.2 && <2.3

4141 , resourcet >=1.2.2 && <1.3

4242 , servant >=0.15 && <0.18

43− , unliftio-core >=0.1.2.0 && <0.2

43+ , unliftio-core >=0.1.2.0 && <0.3

4444 hs-source-dirs: src

4545 default-language: Haskell2010

4646 ghc-options: -Wall

servant-docs/servant-docs.cabal+2−3

@@ -46,7 +46,7 @@ library

4646 --

4747 -- note: mtl lower bound is so low because of GHC-7.8

4848 build-depends:

49− base >= 4.9 && < 4.14

49+ base >= 4.9 && < 4.15

5050 , bytestring >= 0.10.8.1 && < 0.11

5151 , text >= 1.2.3.0 && < 1.3

5252

@@ -64,7 +64,7 @@ library

6464 , hashable >= 1.2.7.0 && < 1.4

6565 , http-media >= 0.7.1.3 && < 0.9

6666 , http-types >= 0.12.2 && < 0.13

67− , lens >= 4.17 && < 4.19

67+ , lens >= 4.17 && < 4.20

6868 , string-conversions >= 0.4.0.1 && < 0.5

6969 , universe-base >= 1.1.1 && < 1.2

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

@@ -111,4 +111,3 @@ test-suite spec

111111 tasty-golden >= 2.3.2 && < 2.4,

112112 tasty-hunit >= 0.10.0.1 && < 0.11,

113113 transformers >= 0.5.2.0 && < 0.6

114−

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

@@ -46,7 +46,7 @@ library

4646 --

4747 -- note: mtl lower bound is so low because of GHC-7.8

4848 build-depends:

49− base >= 4.9 && < 4.14

49+ base >= 4.9 && < 4.15

5050 , text >= 1.2.3.0 && < 1.3

5151

5252 -- Servant dependencies

servant-http-streams/servant-http-streams.cabal+1−1

@@ -43,7 +43,7 @@ library

4343 -- Bundled with GHC: Lower bound to not force re-installs

4444 -- text and mtl are bundled starting with GHC-8.4

4545 build-depends:

46− base >= 4.9 && < 4.14

46+ base >= 4.9 && < 4.15

4747 , bytestring >= 0.10.8.1 && < 0.11

4848 , containers >= 0.5.7.1 && < 0.7

4949 , deepseq >= 1.4.2.0 && < 1.5

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

@@ -64,7 +64,7 @@ library

6464 -- Bundled with GHC: Lower bound to not force re-installs

6565 -- text and mtl are bundled starting with GHC-8.4

6666 build-depends:

67− base >= 4.9 && < 4.14

67+ base >= 4.9 && < 4.15

6868 , bytestring >= 0.10.8.1 && < 0.11

6969 , containers >= 0.5.7.1 && < 0.7

7070 , mtl >= 2.2.2 && < 2.3

servant/servant.cabal+1−1

@@ -80,7 +80,7 @@ library

8080 --

8181 -- note: mtl lower bound is so low because of GHC-7.8

8282 build-depends:

83− base >= 4.9 && < 4.14

83+ base >= 4.9 && < 4.15

8484 , bytestring >= 0.10.8.1 && < 0.11

8585 , mtl >= 2.2.2 && < 2.3

8686 , transformers >= 0.5.2.0 && < 0.6