git.iko.soy/typeable/servant
on master help sign in
Allow network-3.0
commitb685efecbe8f1fb2aa202f5cc1980155edcb2214 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 22 Jan 2019, 15:24 (8 years ago) parentc25085e
8 files changed+29−28
compare with master
unifiedsplit
.travis.yml+7−10 cabal.project+10−6 doc/cookbook/file-upload/FileUpload.lhs+1−1 servant-client-core/servant-client-core.cabal+2−2 servant-client/servant-client.cabal+1−1 servant-client/test/Servant/ClientSpec.hs+2−2 servant-foreign/servant-foreign.cabal+2−2 servant-server/servant-server.cabal+4−4
.travis.yml+7−10
@@ -69,12 +69,12 @@ install:
6969 - rm -fv cabal.project cabal.project.local
7070 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7171 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/sentry\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
72+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
7373 - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
7474 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
75− - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project"
75+ - "echo 'allow-newer: servant-js:base, servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project"
7676 - touch cabal.project.local
77− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
77+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7878 - cat cabal.project || true
7979 - cat cabal.project.local || true
8080 - if [ -f "servant/configure.ac" ]; then
@@ -137,9 +137,6 @@ install:
137137 - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
138138 (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
139139 fi
140− - if [ -f "doc/cookbook/sentry/configure.ac" ]; then
141− (cd "doc/cookbook/sentry" && autoreconf -i);
142− fi
143140 - if [ -f "doc/cookbook/testing/configure.ac" ]; then
144141 (cd "doc/cookbook/testing" && autoreconf -i);
145142 fi
@@ -153,7 +150,7 @@ install:
153150 (cd "doc/cookbook/using-free-client" && autoreconf -i);
154151 fi
155152 - rm -f cabal.project.freeze
156− - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/hoist-server-with-context"/dist "doc/cookbook/https"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/sentry"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
153+ - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/hoist-server-with-context"/dist "doc/cookbook/https"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
157154 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
158155
159156# Here starts the actual work to be performed for the package under test;
@@ -167,12 +164,12 @@ script:
167164 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
168165 - cd ${DISTDIR} || false
169166 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
170− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-sentry-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
167+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
171168 - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
172169 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
173− - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project"
170+ - "echo 'allow-newer: servant-js:base, servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project"
174171 - touch cabal.project.local
175− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
172+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
176173 - cat cabal.project || true
177174 - cat cabal.project.local || true
178175 - echo -en 'travis_fold:end:unpack\\r'
cabal.project+10−6
@@ -23,12 +23,14 @@ packages: servant/
2323 doc/cookbook/https
2424 doc/cookbook/jwt-and-basic-auth/
2525 -- doc/cookbook/pagination
26− doc/cookbook/sentry
26+ -- doc/cookbook/sentry
2727 doc/cookbook/testing
2828 doc/cookbook/structuring-apis
2929 doc/cookbook/using-custom-monad
3030 doc/cookbook/using-free-client
3131
32+tests: true
33+
3234allow-newer:
3335 servant-js:base
3436
@@ -38,11 +40,13 @@ constraints:
3840 memory <0.14.12 || >0.14.12
3941
4042allow-newer:
41− servant-pagination:servant, servant-pagination:servant-server,
42− servant-multipart:servant, servant-multipart:servant-server,
43+-- servant-pagination:servant, servant-pagination:servant-server,
44+-- servant-multipart:servant, servant-multipart:servant-server,
45+-- servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,
46+-- servant-js:servant, servant-js:servant-foreign,
47+
48+-- servant-quickcheck
49+allow-newer:
4350 servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
44− servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,
45− servant-js:servant, servant-js:servant-foreign,
4651 servant-quickcheck:hspec,
47−
4852 servant-quickcheck:http-client
doc/cookbook/file-upload/FileUpload.lhs+1−1
@@ -17,7 +17,7 @@ import Control.Exception
1717import Control.Monad
1818import Control.Monad.IO.Class
1919import Data.Text.Encoding (encodeUtf8)
20−import Network (withSocketsDo)
20+import Network.Socket (withSocketsDo)
2121import Network.HTTP.Client hiding (Proxy)
2222import Network.HTTP.Client.MultipartFormData
2323import Network.Wai.Handler.Warp
servant-client-core/servant-client-core.cabal+2−2
@@ -98,8 +98,8 @@ test-suite spec
9898 -- Additonal dependencies
9999 build-depends:
100100 deepseq >= 1.4.2.0 && < 1.5
101− , hspec >= 2.6.0 && < 2.7
101+ , hspec >= 2.6.0 && < 2.8
102102 , QuickCheck >= 2.12.6.1 && < 2.13
103103
104104 build-tool-depends:
105− hspec-discover:hspec-discover >= 2.6.0 && <2.7
105+ hspec-discover:hspec-discover >= 2.6.0 && <2.8
servant-client/servant-client.cabal+1−1
@@ -114,7 +114,7 @@ test-suite spec
114114 , generics-sop >= 0.4.0.1 && < 0.5
115115 , hspec >= 2.6.0 && < 2.7
116116 , HUnit >= 1.6.0.0 && < 1.7
117− , network >= 2.8.0.0 && < 2.9
117+ , network >= 2.8.0.0 && < 3.1
118118 , QuickCheck >= 2.12.6.1 && < 2.13
119119 , servant == 0.15.*
120120 , servant-server == 0.15.*
servant-client/test/Servant/ClientSpec.hs+2−2
@@ -523,8 +523,8 @@ endWaiApp (thread, _) = killThread thread
523523openTestSocket :: IO (Port, Socket)
524524openTestSocket = do
525525 s <- socket AF_INET Stream defaultProtocol
526− localhost <- inet_addr "127.0.0.1"
527− bind s (SockAddrInet aNY_PORT localhost)
526+ let localhost = tupleToHostAddress (127, 0, 0, 1)
527+ bind s (SockAddrInet defaultPort localhost)
528528 listen s 1
529529 port <- socketPort s
530530 return (fromIntegral port, s)
servant-foreign/servant-foreign.cabal+2−2
@@ -78,8 +78,8 @@ test-suite spec
7878
7979 -- Additonal dependencies
8080 build-depends:
81− hspec >= 2.6.0 && <2.7
81+ hspec >= 2.6.0 && <2.8
8282
8383 build-tool-depends:
84− hspec-discover:hspec-discover >=2.6.0 && <2.7
84+ hspec-discover:hspec-discover >=2.6.0 && <2.8
8585 default-language: Haskell2010
servant-server/servant-server.cabal+4−4
@@ -87,9 +87,9 @@ library
8787 , exceptions >= 0.10.0 && < 0.11
8888 , http-media >= 0.7.1.3 && < 0.8
8989 , http-types >= 0.12.2 && < 0.13
90− , network-uri >= 2.6.1.0 && < 2.7
90+ , network-uri >= 2.6.1.0 && < 2.8
9191 , monad-control >= 1.0.2.3 && < 1.1
92− , network >= 2.8 && < 2.9
92+ , network >= 2.8 && < 3.1
9393 , string-conversions >= 0.4.0.1 && < 0.5
9494 , resourcet >= 1.2.2 && < 1.3
9595 , tagged >= 0.8.6 && < 0.9
@@ -160,7 +160,7 @@ test-suite spec
160160 build-depends:
161161 aeson >= 1.4.1.0 && < 1.5
162162 , directory >= 1.3.0.0 && < 1.4
163− , hspec >= 2.6.0 && < 2.7
163+ , hspec >= 2.6.0 && < 2.8
164164 , hspec-wai >= 0.9.0 && < 0.10
165165 , QuickCheck >= 2.12.6.1 && < 2.13
166166 , should-not-typecheck >= 2.1.0 && < 2.2
@@ -168,7 +168,7 @@ test-suite spec
168168 , wai-extra >= 3.0.24.3 && < 3.1
169169
170170 build-tool-depends:
171− hspec-discover:hspec-discover >= 2.6.0 && <2.7
171+ hspec-discover:hspec-discover >= 2.6.0 && <2.8
172172
173173test-suite doctests
174174 build-depends: