From f9c6ed4433fb5081844da68e7850b26c3445c8da Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 22 Mar 2018 12:23:07 +0200 Subject: [PATCH] Allow (older) http-media-0.7.0 --- .travis.yml | 4 ++-- cabal.project | 3 --- servant-client-core/servant-client-core.cabal | 2 +- servant-client/servant-client.cabal | 2 +- servant-docs/servant-docs.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 125cc995..0000bff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ install: - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project" - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project" + - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project" - cat cabal.project - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); @@ -137,7 +137,7 @@ script: - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project" - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project" + - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project" - cat cabal.project - echo -en 'travis_fold:end:unpack\\r' diff --git a/cabal.project b/cabal.project index 0dc90801..c2805c4c 100644 --- a/cabal.project +++ b/cabal.project @@ -32,6 +32,3 @@ constraints: -- see https://github.com/haskell-infra/hackage-trustees/issues/119 foundation >=0.0.14, memory <0.14.12 || >0.14.12 - -allow-newer: - http-media:base diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 864d1786..e304254f 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -68,7 +68,7 @@ library , exceptions >= 0.8.3 && < 0.11 , generics-sop >= 0.3.1.0 && < 0.4 , http-api-data >= 0.3.7.1 && < 0.4 - , http-media >= 0.7.1.1 && < 0.8 + , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , network-uri >= 2.6.1.0 && < 2.7 , safe >= 0.3.15 && < 0.4 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2922ce87..50d4426a 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -65,7 +65,7 @@ library , attoparsec >= 0.13.2.0 && < 0.14 , http-client >= 0.5.7.1 && < 0.6 , http-client-tls >= 0.3.5.1 && < 0.4 - , http-media >= 0.7.1.1 && < 0.8 + , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , exceptions >= 0.8.3 && < 0.11 , monad-control >= 1.0.0.4 && < 1.1 diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 1aa33eb6..3ea2ae21 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -63,7 +63,7 @@ library , case-insensitive >= 1.2.0.10 && < 1.3 , control-monad-omega >= 0.3.1 && < 0.4 , hashable >= 1.2.6.1 && < 1.3 - , http-media >= 0.7.1.1 && < 0.8 + , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , lens >= 4.15.4 && < 4.17 , string-conversions >= 0.4.0.1 && < 0.5 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 4954b7e0..7eac648b 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -82,7 +82,7 @@ library , base64-bytestring >= 1.0.0.1 && < 1.1 , exceptions >= 0.8.3 && < 0.11 , http-api-data >= 0.3.7.1 && < 0.4 - , http-media >= 0.7.1.1 && < 0.8 + , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , network-uri >= 2.6.1.0 && < 2.7 , monad-control >= 1.0.0.4 && < 1.1 diff --git a/servant/servant.cabal b/servant/servant.cabal index 5600e61e..5cf1bab4 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -87,7 +87,7 @@ library , attoparsec >= 0.13.2.0 && < 0.14 , case-insensitive >= 1.2.0.10 && < 1.3 , http-api-data >= 0.3.7.1 && < 0.4 - , http-media >= 0.7.1.1 && < 0.8 + , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , natural-transformation >= 0.4 && < 0.5 , mmorph >= 1.1.0 && < 1.2