git.iko.soy/typeable/servant
on master help sign in
Merge pull request #930 from phadej/http-media-0.7.0

Allow (older) http-media-0.7.0

commite3be4f789b425cc26bf7d79e6528f59d3995a394 authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 22 Mar 2018, 12:44 (9 years ago) parent0881c18f9c6ed4
7 files changed+7−10
compare with master
unifiedsplit
.travis.yml+2−2 cabal.project−3 servant-client-core/servant-client-core.cabal+1−1 servant-client/servant-client.cabal+1−1 servant-docs/servant-docs.cabal+1−1 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1
.travis.yml+2−2
@@ -75,7 +75,7 @@ install:
7575 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7676 - "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"
7777 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
78− - "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"
78+ - "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"
7979 - cat cabal.project
8080 - if [ -f "servant/configure.ac" ]; then
8181 (cd "servant" && autoreconf -i);
@@ -137,7 +137,7 @@ script:
137137 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
138138 - "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"
139139 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
140− - "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"
140+ - "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"
141141 - cat cabal.project
142142 - echo -en 'travis_fold:end:unpack\\r'
143143
cabal.project−3
@@ -32,6 +32,3 @@ constraints:
3232 -- see https://github.com/haskell-infra/hackage-trustees/issues/119
3333 foundation >=0.0.14,
3434 memory <0.14.12 || >0.14.12
35−
36−allow-newer:
37− http-media:base
servant-client-core/servant-client-core.cabal+1−1
@@ -68,7 +68,7 @@ library
6868 , exceptions >= 0.8.3 && < 0.11
6969 , generics-sop >= 0.3.1.0 && < 0.4
7070 , http-api-data >= 0.3.7.1 && < 0.4
71− , http-media >= 0.7.1.1 && < 0.8
71+ , http-media >= 0.7.0 && < 0.8
7272 , http-types >= 0.12 && < 0.13
7373 , network-uri >= 2.6.1.0 && < 2.7
7474 , safe >= 0.3.15 && < 0.4
servant-client/servant-client.cabal+1−1
@@ -65,7 +65,7 @@ library
6565 , attoparsec >= 0.13.2.0 && < 0.14
6666 , http-client >= 0.5.7.1 && < 0.6
6767 , http-client-tls >= 0.3.5.1 && < 0.4
68− , http-media >= 0.7.1.1 && < 0.8
68+ , http-media >= 0.7.0 && < 0.8
6969 , http-types >= 0.12 && < 0.13
7070 , exceptions >= 0.8.3 && < 0.11
7171 , monad-control >= 1.0.0.4 && < 1.1
servant-docs/servant-docs.cabal+1−1
@@ -63,7 +63,7 @@ library
6363 , case-insensitive >= 1.2.0.10 && < 1.3
6464 , control-monad-omega >= 0.3.1 && < 0.4
6565 , hashable >= 1.2.6.1 && < 1.3
66− , http-media >= 0.7.1.1 && < 0.8
66+ , http-media >= 0.7.0 && < 0.8
6767 , http-types >= 0.12 && < 0.13
6868 , lens >= 4.15.4 && < 4.17
6969 , string-conversions >= 0.4.0.1 && < 0.5
servant-server/servant-server.cabal+1−1
@@ -82,7 +82,7 @@ library
8282 , base64-bytestring >= 1.0.0.1 && < 1.1
8383 , exceptions >= 0.8.3 && < 0.11
8484 , http-api-data >= 0.3.7.1 && < 0.4
85− , http-media >= 0.7.1.1 && < 0.8
85+ , http-media >= 0.7.0 && < 0.8
8686 , http-types >= 0.12 && < 0.13
8787 , network-uri >= 2.6.1.0 && < 2.7
8888 , monad-control >= 1.0.0.4 && < 1.1
servant/servant.cabal+1−1
@@ -87,7 +87,7 @@ library
8787 , attoparsec >= 0.13.2.0 && < 0.14
8888 , case-insensitive >= 1.2.0.10 && < 1.3
8989 , http-api-data >= 0.3.7.1 && < 0.4
90− , http-media >= 0.7.1.1 && < 0.8
90+ , http-media >= 0.7.0 && < 0.8
9191 , http-types >= 0.12 && < 0.13
9292 , natural-transformation >= 0.4 && < 0.5
9393 , mmorph >= 1.1.0 && < 1.2