From 860504094707fd43f4c1b7aba3e5fcbec5e19aca Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 28 May 2018 08:41:42 +0300 Subject: [PATCH 1/3] Allow network-2.7 --- .travis.yml | 26 +++++++++++++------------- servant-client/servant-client.cabal | 2 +- servant-server/servant-server.cabal | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0000bff5..cea97968 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,21 +34,21 @@ before_cache: matrix: include: - - compiler: "ghc-7.8.4" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}} - - compiler: "ghc-7.10.3" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}} - - compiler: "ghc-8.0.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}} - - compiler: "ghc-8.2.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} - compiler: "ghc-8.4.1" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.1], sources: [hvr-ghc]}} + - compiler: "ghc-8.2.2" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}} + - compiler: "ghc-8.0.2" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}} + - compiler: "ghc-7.10.3" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}} + - compiler: "ghc-7.8.4" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}} before_install: - HC=${CC} diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 088c4040..0c565d85 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -121,7 +121,7 @@ test-suite spec , generics-sop >= 0.3.1.0 && < 0.4 , hspec >= 2.4.4 && < 2.6 , HUnit >= 1.6 && < 1.7 - , network >= 2.6.3.2 && < 2.7 + , network >= 2.6.3.2 && < 2.8 , QuickCheck >= 2.10.1 && < 2.12 , servant == 0.13.* , servant-server == 0.13.* diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 9b88c1b0..9a2d2ed7 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -90,7 +90,7 @@ library , http-types >= 0.12 && < 0.13 , network-uri >= 2.6.1.0 && < 2.7 , monad-control >= 1.0.0.4 && < 1.1 - , network >= 2.6.3.2 && < 2.7 + , network >= 2.6.3.2 && < 2.8 , safe >= 0.3.15 && < 0.4 , split >= 0.2.3.2 && < 0.3 , string-conversions >= 0.4.0.1 && < 0.5 From 3bb043d62a095fb383040a2761242577f1071e45 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 28 May 2018 11:08:36 +0300 Subject: [PATCH 2/3] Workaround http-client bug in cabal --- .travis.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea97968..901f65aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,19 +36,19 @@ matrix: include: - compiler: "ghc-8.4.1" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,ghc-8.4.1], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}} - compiler: "ghc-8.0.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,ghc-8.0.2], sources: [hvr-ghc]}} - compiler: "ghc-7.10.3" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,ghc-7.10.3], sources: [hvr-ghc]}} - compiler: "ghc-7.8.4" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,ghc-7.8.4], sources: [hvr-ghc]}} before_install: - HC=${CC} @@ -60,6 +60,17 @@ before_install: - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - echo $HCNUMVER + # Let's download "better" cabal + - "curl -L http://oleg.fi/cabal-grayjay-buildable-fix.xz | xz -d > $HOME/.local/bin/cabal" + - | + if [ "$(cd $HOME/.local/bin && sha256sum cabal)" != "e281e9466b8eef30ac0d1371e8ea83c9d2e856bda4714a728ac474138b09b20f cabal" ]; then + rm -f $HOME/.local/bin/cabal; + sha256sum $HOME/.local/bin/cabal; + false; + else + chmod a+x $HOME/.local/bin/cabal; + fi + install: - cabal --version - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" From 4d6203a7961b2b02f3623284e431548f572474d2 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 28 May 2018 15:43:51 +0300 Subject: [PATCH 3/3] Add x-revision fields --- servant-client/servant-client.cabal | 1 + servant-server/servant-server.cabal | 1 + 2 files changed, 2 insertions(+) diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 0c565d85..1682158b 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,5 +1,6 @@ name: servant-client version: 0.13.0.1 +x-revision: 1 synopsis: automatical derivation of querying functions for servant webservices description: This library lets you derive automatically Haskell functions that diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 9a2d2ed7..bc9b2703 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -1,5 +1,6 @@ name: servant-server version: 0.13.0.1 +x-revision: 1 synopsis: A family of combinators for defining webservices APIs and serving them description: A family of combinators for defining webservices APIs and serving them