master...2261542 · typeable/servant

git.iko.soy/typeable/servant

on 2261542 help sign in

.hlint.yamlnew file+51

since splitsnapshots

unifiedsplit

@@ -0,0 +1,51 @@

1+# Control which extensions/flags/modules/functions can be used

2+#

3+- extensions:

4+ - default: false # all extension are banned by default

5+ - name:

6+ - CPP

7+ - DataKinds

8+ - DeriveDataTypeable

9+ - DeriveFoldable

10+ - DeriveFunctor

11+ - DeriveGeneric

12+ - DeriveTraversable

13+ - FlexibleContexts

14+ - FlexibleInstances

15+ - FunctionalDependencies

16+ - GADTs

17+ - KindSignatures

18+ - MultiParamTypeClasses

19+ - OverloadedStrings

20+ - PolyKinds

21+ - RankNTypes

22+ - ScopedTypeVariables

23+ - TypeFamilies

24+ - TypeOperators

25+ - UndecidableInstances

26+

27+- modules:

28+ - {name: [Data.Set], as: Set}

29+ - {name: Control.Arrow, within: []} # Certain modules are banned entirely

30+

31+- functions:

32+ - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules

33+

34+# Turn on hints that are off by default

35+#

36+# Ban "module X(module X) where", to require a real export list

37+- warn: {name: Use explicit module export list}

38+

39+# Ignore some builtin hints

40+- ignore: {name: Redundant do}

41+- ignore: {name: Parse error}

42+- ignore: {name: Use fmap}

43+- ignore: {name: "Use <$>"}

44+- ignore: {name: Use list comprehension}

45+- ignore: {name: Use lambda-case}

46+- ignore: {name: Eta reduce}

47+

48+# Add custom hints for this project

49+#

50+# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"

51+# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}

.travis.yml+242−123

@@ -4,23 +4,21 @@

5# For more information, see https://github.com/haskell-CI/haskell-ci

7−# version: 0.2.1

7+# version: 0.5.20190908

9language: c

10dist: xenial

11−

12git:

11git:

13− submodules: false # whether to recursively clone submodules

12+ # whether to recursively clone submodules

14−

13+ submodules: false

15branches:

14branches:

16 only:

15 only:

17 - master

16 - master

18−

17+ - release-0.16

19cache:

18cache:

20 directories:

19 directories:

21 - $HOME/.cabal/packages

20 - $HOME/.cabal/packages

22 - $HOME/.cabal/store

21 - $HOME/.cabal/store

23−

24before_cache:

22before_cache:

25 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

23 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

26 # remove files that are regenerated by 'cabal update'

24 # remove files that are regenerated by 'cabal update'

@@ -29,79 +27,152 @@ before_cache:

29 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

30 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

31 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

29 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

32−

33 - rm -rfv $CABALHOME/packages/head.hackage

30 - rm -rfv $CABALHOME/packages/head.hackage

34−

35matrix:

31matrix:

36 include:

32 include:

37− - compiler: "ghc-8.6.4"

33+ - compiler: ghc-8.8.1

38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}

34+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

35+ - compiler: ghc-8.6.5

36+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

39− - compiler: "ghc-8.4.4"

37+ - compiler: ghc-8.4.4

40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}

38+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}

41− - compiler: "ghc-8.2.2"

39+ - compiler: ghc-8.2.2

42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}

40+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}

43− - compiler: "ghc-8.0.2"

41+ - compiler: ghc-8.0.2

44− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}

42+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}

45−

43+ allow_failures:

44+ - compiler: ghc-8.8.1

46before_install:

45before_install:

47− - HC=/opt/ghc/bin/${CC}

46+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

47+ - WITHCOMPILER="-w $HC"

48+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')

48− - HCPKG=${HC/ghc/ghc-pkg}

49+ - HCPKG="$HC-pkg"

49 - unset CC

50 - unset CC

50 - CABAL=/opt/ghc/bin/cabal

51 - CABAL=/opt/ghc/bin/cabal

51 - CABALHOME=$HOME/.cabal

52 - CABALHOME=$HOME/.cabal

52 - export PATH="$CABALHOME/bin:$PATH"

53 - export PATH="$CABALHOME/bin:$PATH"

53− - ROOTDIR=$(pwd)

54+ - TOP=$(pwd)

54− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

55+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

55 - echo $HCNUMVER

56 - echo $HCNUMVER

56−

57+ - CABAL="$CABAL -vnormal+nowrap+markoutput"

58+ - set -o pipefail

59+ - |

60+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk

61+ echo 'BEGIN { state = "output"; }' >> .colorful.awk

62+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk

63+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk

64+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk

65+ echo ' if (state == "cabal") {' >> .colorful.awk

66+ echo ' print blue($0)' >> .colorful.awk

67+ echo ' } else {' >> .colorful.awk

68+ echo ' print $0' >> .colorful.awk

69+ echo ' }' >> .colorful.awk

70+ echo '}' >> .colorful.awk

71+ - cat .colorful.awk

72+ - |

73+ color_cabal_output () {

74+ awk -f $TOP/.colorful.awk

75+ }

76+ - echo text | color_cabal_output

57install:

77install:

58 - ${CABAL} --version

78 - ${CABAL} --version

59 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

79 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

60 - TEST=--enable-tests

80 - TEST=--enable-tests

61 - BENCH=--enable-benchmarks

81 - BENCH=--enable-benchmarks

62− - GHCHEAD=${GHCHEAD-false}

82+ - HEADHACKAGE=false

83+ - if [ $HCNUMVER -ge 80800 ] ; then HEADHACKAGE=true ; fi

84+ - rm -f $CABALHOME/config

85+ - |

86+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

87+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config

88+ echo "write-ghc-environment-files: always" >> $CABALHOME/config

89+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

90+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

91+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config

92+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

93+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

94+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

95+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

96+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

97+ echo "install-dirs user" >> $CABALHOME/config

98+ echo " prefix: $CABALHOME" >> $CABALHOME/config

99+ echo "repository hackage.haskell.org" >> $CABALHOME/config

100+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

101+ - |

102+ if $HEADHACKAGE; then

103+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config

104+ echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config

105+ echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config

106+ echo " secure: True" >> $CABALHOME/config

107+ echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config

108+ echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config

109+ echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config

110+ echo " key-threshold: 3" >> $CABALHOME/config

111+ fi

112+ - GHCJOBS=-j2

113+ - |

114+ echo "program-default-options" >> $CABALHOME/config

115+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

116+ - cat $CABALHOME/config

117+ - rm -fv cabal.project cabal.project.local cabal.project.freeze

63− - travis_retry ${CABAL} update -v

118+ - travis_retry ${CABAL} v2-update -v

64− - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config

119+ # Generate cabal.project

65− - rm -fv cabal.project cabal.project.local

120+ - rm -rf cabal.project cabal.project.local cabal.project.freeze

66− - "sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' $CABALHOME/config"

67− - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'

68− - rm -f cabal.project

69 - touch cabal.project

121 - touch cabal.project

122+ - |

70− - "printf 'packages: \"servant\"\\n' >> cabal.project"

123+ echo "packages: servant" >> cabal.project

71− - "printf 'packages: \"servant-client\"\\n' >> cabal.project"

124+ echo "packages: servant-client" >> cabal.project

72− - "printf 'packages: \"servant-client-core\"\\n' >> cabal.project"

125+ echo "packages: servant-client-core" >> cabal.project

73− - "printf 'packages: \"servant-http-streams\"\\n' >> cabal.project"

126+ echo "packages: servant-http-streams" >> cabal.project

74− - "printf 'packages: \"servant-docs\"\\n' >> cabal.project"

127+ echo "packages: servant-docs" >> cabal.project

75− - "printf 'packages: \"servant-foreign\"\\n' >> cabal.project"

128+ echo "packages: servant-foreign" >> cabal.project

76− - "printf 'packages: \"servant-server\"\\n' >> cabal.project"

129+ echo "packages: servant-server" >> cabal.project

77− - "printf 'packages: \"doc/tutorial\"\\n' >> cabal.project"

130+ echo "packages: doc/tutorial" >> cabal.project

78− - "printf 'packages: \"servant-machines\"\\n' >> cabal.project"

131+ echo "packages: servant-machines" >> cabal.project

79− - "printf 'packages: \"servant-conduit\"\\n' >> cabal.project"

132+ echo "packages: servant-conduit" >> cabal.project

80− - "printf 'packages: \"servant-pipes\"\\n' >> cabal.project"

133+ echo "packages: servant-pipes" >> cabal.project

81− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-auth\"\\n' >> cabal.project ; fi"

134+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi

82− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/curl-mock\"\\n' >> cabal.project ; fi"

135+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi

83− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-streaming\"\\n' >> cabal.project ; fi"

136+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi

84− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-postgres-pool\"\\n' >> cabal.project ; fi"

85− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-sqlite-simple\"\\n' >> cabal.project ; fi"

86− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"

87− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"

137+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi

88− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"

138+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi

89− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi"

139+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi

90− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"

140+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi

91− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"

141+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi

92− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"

142+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi

93− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"

143+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi

144+ - |

94− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

145+ echo "constraints: foundation >=0.0.14" >> cabal.project

95− - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"

146+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

147+ echo "constraints: sqlite-simple < 0" >> cabal.project

96− - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

148+ echo "allow-newer: servant-multipart:http-media" >> cabal.project

149+ echo "allow-newer: servant-multipart:lens" >> cabal.project

97− - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

150+ echo "allow-newer: servant-js:base" >> cabal.project

151+ echo "allow-newer: servant-js:lens" >> cabal.project

98− - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

152+ echo "allow-newer: servant-quickcheck:base" >> cabal.project

99− - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"

153+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

100− - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"

154+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

155+ echo "allow-newer: servant-quickcheck:http-media" >> cabal.project

156+ echo "allow-newer: servant-quickcheck:QuickCheck" >> cabal.project

157+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project

158+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

159+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

160+ echo "allow-newer: servant-quickcheck:time" >> cabal.project

161+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project

162+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

163+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

164+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

165+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

166+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

167+ echo "allow-newer: io-streams:primitive" >> cabal.project

168+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

101− - "echo 'optimization: False' >> cabal.project "

169+ echo "optimization: False" >> cabal.project

102− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"

170+ echo "" >> cabal.project

103− - touch cabal.project.local

171+ echo "source-repository-package" >> cabal.project

172+ echo " type: git" >> cabal.project

173+ echo " location: https://github.com/luqui/control-monad-omega.git" >> cabal.project

174+ echo " tag: 76c71e8917eec275ba423959f00a34583b5c7215" >> cabal.project

175+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

105 - cat cabal.project || true

176 - cat cabal.project || true

106 - cat cabal.project.local || true

177 - cat cabal.project.local || true

107 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi

178 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi

@@ -119,81 +190,129 @@ install:

119 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi

190 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi

120 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi

191 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi

121 - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi

192 - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi

122− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi

123 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi

193 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi

124 - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi

194 - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi

125− - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi

126− - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi

127 - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi

195 - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi

128 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi

196 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi

129 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi

197 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi

130 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi

198 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi

131− - rm -f cabal.project.freeze

199+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output

132− - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-http-streams"/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/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist

200+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

133− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

201+ - rm cabal.project.freeze

134−

135−# Here starts the actual work to be performed for the package under test;

136−# any command which exits with a non-zero exit code causes the build to fail.

137script:

202script:

138− # test that source-distributions can be generated

203+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

204+ # Packaging...

139− - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'

205+ - echo 'Packaging...' && echo -en 'travis_fold:start:sdist\\r'

140− - ${CABAL} new-sdist all

206+ - ${CABAL} v2-sdist all | color_cabal_output

141 - echo -en 'travis_fold:end:sdist\\r'

207 - echo -en 'travis_fold:end:sdist\\r'

208+ # Unpacking...

142− - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'

209+ - echo 'Unpacking...' && echo -en 'travis_fold:start:unpack\\r'

143 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

210 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

144 - cd ${DISTDIR} || false

211 - cd ${DISTDIR} || false

145− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

212+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;

213+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

214+ - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"

215+ - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"

216+ - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"

217+ - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"

218+ - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"

219+ - PKGDIR_servant_foreign="$(find . -maxdepth 1 -type d -regex '.*/servant-foreign-[0-9.]*')"

220+ - PKGDIR_servant_server="$(find . -maxdepth 1 -type d -regex '.*/servant-server-[0-9.]*')"

221+ - PKGDIR_tutorial="$(find . -maxdepth 1 -type d -regex '.*/tutorial-[0-9.]*')"

222+ - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"

223+ - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"

224+ - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"

225+ - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"

226+ - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"

227+ - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"

228+ - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"

229+ - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"

230+ - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"

231+ - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"

232+ - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"

233+ - PKGDIR_cookbook_using_custom_monad="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-custom-monad-[0-9.]*')"

234+ - PKGDIR_cookbook_using_free_client="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-free-client-[0-9.]*')"

146− - rm -f cabal.project

235+ # Generate cabal.project

236+ - rm -rf cabal.project cabal.project.local cabal.project.freeze

147 - touch cabal.project

237 - touch cabal.project

148− - "printf 'packages: \"servant-*/*.cabal\"\\n' >> cabal.project"

238+ - |

149− - "printf 'packages: \"servant-client-*/*.cabal\"\\n' >> cabal.project"

239+ echo "packages: ${PKGDIR_servant}" >> cabal.project

150− - "printf 'packages: \"servant-client-core-*/*.cabal\"\\n' >> cabal.project"

240+ echo "packages: ${PKGDIR_servant_client}" >> cabal.project

151− - "printf 'packages: \"servant-http-streams-*/*.cabal\"\\n' >> cabal.project"

241+ echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project

152− - "printf 'packages: \"servant-docs-*/*.cabal\"\\n' >> cabal.project"

242+ echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project

153− - "printf 'packages: \"servant-foreign-*/*.cabal\"\\n' >> cabal.project"

243+ echo "packages: ${PKGDIR_servant_docs}" >> cabal.project

154− - "printf 'packages: \"servant-server-*/*.cabal\"\\n' >> cabal.project"

244+ echo "packages: ${PKGDIR_servant_foreign}" >> cabal.project

155− - "printf 'packages: \"tutorial-*/*.cabal\"\\n' >> cabal.project"

245+ echo "packages: ${PKGDIR_servant_server}" >> cabal.project

156− - "printf 'packages: \"servant-machines-*/*.cabal\"\\n' >> cabal.project"

246+ echo "packages: ${PKGDIR_tutorial}" >> cabal.project

157− - "printf 'packages: \"servant-conduit-*/*.cabal\"\\n' >> cabal.project"

247+ echo "packages: ${PKGDIR_servant_machines}" >> cabal.project

158− - "printf 'packages: \"servant-pipes-*/*.cabal\"\\n' >> cabal.project"

248+ echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project

159− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"

249+ echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project

160− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-curl-mock-*/*.cabal\"\\n' >> cabal.project ; fi"

161− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-streaming-*/*.cabal\"\\n' >> cabal.project ; fi"

162− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-postgres-pool-*/*.cabal\"\\n' >> cabal.project ; fi"

250+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

163− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-sqlite-simple-*/*.cabal\"\\n' >> cabal.project ; fi"

251+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

164− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"

252+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

165− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"

253+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi

166− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"

254+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi

167− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi"

255+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi

168− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"

256+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi

169− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"

257+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi

170− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"

258+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi

171− - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"

259+ if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi

260+ - |

172− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

261+ echo "constraints: foundation >=0.0.14" >> cabal.project

173− - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"

262+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

263+ echo "constraints: sqlite-simple < 0" >> cabal.project

174− - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

264+ echo "allow-newer: servant-multipart:http-media" >> cabal.project

265+ echo "allow-newer: servant-multipart:lens" >> cabal.project

175− - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

266+ echo "allow-newer: servant-js:base" >> cabal.project

267+ echo "allow-newer: servant-js:lens" >> cabal.project

176− - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

268+ echo "allow-newer: servant-quickcheck:base" >> cabal.project

177− - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"

269+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project

178− - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"

270+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project

271+ echo "allow-newer: servant-quickcheck:http-media" >> cabal.project

272+ echo "allow-newer: servant-quickcheck:QuickCheck" >> cabal.project

273+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project

274+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project

275+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project

276+ echo "allow-newer: servant-quickcheck:time" >> cabal.project

277+ echo "allow-newer: servant-quickcheck:warp" >> cabal.project

278+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

279+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

280+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project

281+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project

282+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

283+ echo "allow-newer: io-streams:primitive" >> cabal.project

284+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

179− - "echo 'optimization: False' >> cabal.project "

285+ echo "optimization: False" >> cabal.project

180− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"

286+ echo "" >> cabal.project

181− - touch cabal.project.local

287+ echo "source-repository-package" >> cabal.project

288+ echo " type: git" >> cabal.project

289+ echo " location: https://github.com/luqui/control-monad-omega.git" >> cabal.project

290+ echo " tag: 76c71e8917eec275ba423959f00a34583b5c7215" >> cabal.project

291+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

183 - cat cabal.project || true

292 - cat cabal.project || true

184 - cat cabal.project.local || true

293 - cat cabal.project.local || true

185 - echo -en 'travis_fold:end:unpack\\r'

294 - echo -en 'travis_fold:end:unpack\\r'

186−

295+ # Building with tests and benchmarks...

187− - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'

296+ - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'

188 # build & run tests, build benchmarks

297 # build & run tests, build benchmarks

189− - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all

298+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

190 - echo -en 'travis_fold:end:build-everything\\r'

299 - echo -en 'travis_fold:end:build-everything\\r'

300+ # Testing...

191− - if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi

301+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

192−

302+ # haddock...

193− - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'

303+ - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'

194− # haddock

195− - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all

304+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output

196−

197 - echo -en 'travis_fold:end:haddock\\r'

305 - echo -en 'travis_fold:end:haddock\\r'

306+ # Constraint sets

307+ - rm -rf cabal.project.local

308+ # Constraint set http-media-0.8

309+ - echo 'Constraint set http-media-0.8' && echo -en 'travis_fold:start:constraint-sets-http-media-0.8\\r'

310+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-media ==0.8.*' all | color_cabal_output

311+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.8\\r'

312+ # Constraint set http-media-0.7

313+ - echo 'Constraint set http-media-0.7' && echo -en 'travis_fold:start:constraint-sets-http-media-0.7\\r'

314+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-media ==0.7.*' all | color_cabal_output

315+ - echo -en 'travis_fold:end:constraint-sets-http-media-0.7\\r'

316+

198# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]

317# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]

199# EOF

318# EOF

cabal.haskell-ci+13−1

@@ -1,5 +1,5 @@

1folds: all-but-test

2−branches: master

2+branches: master release-0.16

3jobs-selection: any

5-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step

@@ -14,3 +14,15 @@ cabal-check: False

15-- ghc-options: -j2

16jobs: :2

17+

18+constraint-set http-media-0.8

19+ constraints: http-media ==0.8.*

20+

21+constraint-set http-media-0.7

22+ constraints: http-media ==0.7.*

23+

24+constraint-set base-compat-0.10

25+ constraints: base-compat ==0.10.*

26+

27+constraint-set base-compat-0.11

28+ constraints: base-compat ==0.11.*

cabal.project+43−5

@@ -18,13 +18,13 @@ packages:

18 doc/cookbook/curl-mock

19 doc/cookbook/basic-streaming

20 doc/cookbook/db-postgres-pool

21− doc/cookbook/db-sqlite-simple

21+-- doc/cookbook/db-sqlite-simple

22 doc/cookbook/file-upload

23 doc/cookbook/generic

24 -- doc/cookbook/hoist-server-with-context

25− doc/cookbook/https

25+-- doc/cookbook/https

26 -- doc/cookbook/jwt-and-basic-auth/

27− doc/cookbook/pagination

27+-- doc/cookbook/pagination

28 -- doc/cookbook/sentry

29 doc/cookbook/testing

30 doc/cookbook/structuring-apis

@@ -40,6 +40,15 @@ constraints:

40 foundation >=0.0.14,

41 memory <0.14.12 || >0.14.12

43+allow-newer:

44+ servant-multipart:http-media,

45+ servant-multipart:lens

46+

47+allow-newer:

48+ servant-js:base,

49+ servant-js:base-compat,

50+ servant-js:lens

51+

43allow-newer:

52allow-newer:

44-- servant-pagination:servant, servant-pagination:servant-server,

53-- servant-pagination:servant, servant-pagination:servant-server,

45-- servant-multipart:servant, servant-multipart:servant-server,

54-- servant-multipart:servant, servant-multipart:servant-server,

@@ -48,6 +57,35 @@ allow-newer:

49-- servant-quickcheck

58-- servant-quickcheck

50allow-newer:

59allow-newer:

51− servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,

60+ servant-quickcheck:base,

61+ servant-quickcheck:base-compat,

52 servant-quickcheck:hspec,

62 servant-quickcheck:hspec,

53− servant-quickcheck:http-client

63+ servant-quickcheck:http-client,

64+ servant-quickcheck:http-media,

65+ servant-quickcheck:QuickCheck,

66+ servant-quickcheck:servant,

67+ servant-quickcheck:servant-client,

68+ servant-quickcheck:servant-server,

69+ servant-quickcheck:time,

70+ servant-quickcheck:warp

71+

72+allow-newer: aeson-pretty:base-compat

73+

74+

75+-- constraints: semigroups ^>=0.19

76+-- constraints: hashable ^>=1.3

77+-- constraints: network ^>=3.1

78+-- constraints: machines ^>=0.7

79+-- constraints: http-media ^>=0.8

80+

81+allow-newer: vault-0.3.1.2:hashable

82+allow-newer: psqueues-0.2.7.1:hashable

83+allow-newer: sqlite-simple-0.4.16.0:semigroups

84+allow-newer: direct-sqlite-2.3.24:semigroups

85+allow-newer: io-streams-1.5.1.0:network

86+allow-newer: io-streams:primitive

87+allow-newer: openssl-streams-1.2.2.0:network

88+

89+-- MonadFail

90+-- https://github.com/nurpax/sqlite-simple/issues/74

91+constraints: sqlite-simple < 0

doc/cookbook/basic-auth/basic-auth.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-basic-auth

14 main-is: BasicAuth.lhs

doc/cookbook/basic-streaming/basic-streaming.cabal+2−2

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-basic-streaming

14 main-is: Streaming.lhs

@@ -17,7 +17,7 @@ executable cookbook-basic-streaming

17 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts

19 hs-source-dirs: .

20− build-depends: base >= 4.8 && <4.13

20+ build-depends: base >= 4.8 && <5

21 , aeson

22 , bytestring

23 , servant

doc/cookbook/curl-mock/curl-mock.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbock-curl-mock

14 main-is: CurlMock.lhs

doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-db-postgres-pool

14 main-is: PostgresPool.lhs

doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-db-sqlite-simple

14 main-is: DBConnection.lhs

doc/cookbook/file-upload/file-upload.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-file-upload

14 main-is: FileUpload.lhs

doc/cookbook/generic/generic.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-custom-monad

14 main-is: Generic.lhs

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.4

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

16executable cookbook-hoist-server-with-context

17 main-is: HoistServerWithContext.lhs

doc/cookbook/https/https.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-https

14 main-is: Https.lhs

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.4

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

16executable cookbook-jwt-and-basic-auth

17 main-is: JWTAndBasicAuth.lhs

doc/cookbook/pagination/pagination.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-pagination

14 main-is: Pagination.lhs

doc/cookbook/sentry/sentry.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-sentry

14 main-is: Sentry.lhs

doc/cookbook/structuring-apis/structuring-apis.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-structuring-apis

14 main-is: StructuringApis.lhs

doc/cookbook/testing/testing.cabal+1−1

@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

10category: Servant

11build-type: Simple

12cabal-version: >=1.10

13−tested-with: GHC==8.4.4, GHC==8.6.4

13+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

15executable cookbook-testing

16 main-is: Testing.lhs

doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-custom-monad

14 main-is: UsingCustomMonad.lhs

doc/cookbook/using-free-client/using-free-client.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

13executable cookbook-using-free-client

14 main-is: UsingFreeClient.lhs

doc/tutorial/tutorial.cabal+4−3

@@ -16,7 +16,8 @@ tested-with:

16 GHC==8.0.2

17 GHC==8.2.2

18 GHC==8.4.4

19− GHC==8.6.4

19+ GHC==8.6.5

20+ GHC==8.8.1

20extra-source-files:

21extra-source-files:

21 static/index.html

22 static/index.html

22 static/ui.js

23 static/ui.js

@@ -34,7 +35,7 @@ library

34 -- Packages `servant` depends on.

35 -- Packages `servant` depends on.

35 -- We don't need to specify bounds here as this package is never released.

36 -- We don't need to specify bounds here as this package is never released.

36 build-depends:

37 build-depends:

37− base >= 4.7 && <4.13

38+ base >= 4.7 && <5

38 , aeson

39 , aeson

39 , attoparsec

40 , attoparsec

40 , base-compat

41 , base-compat

@@ -69,7 +70,7 @@ library

69 , lucid >= 2.9.11 && < 2.10

70 , lucid >= 2.9.11 && < 2.10

70 , random >= 1.1 && < 1.2

71 , random >= 1.1 && < 1.2

71 , servant-js >= 0.9 && < 0.10

72 , servant-js >= 0.9 && < 0.10

72− , time >= 1.6.0.1 && < 1.9

73+ , time >= 1.6.0.1 && < 1.10

74 -- For legacy tools, we need to specify build-depends too

75 -- For legacy tools, we need to specify build-depends too

75 build-depends: markdown-unlit >= 0.5.0 && <0.6

76 build-depends: markdown-unlit >= 0.5.0 && <0.6

hlint.yamldeleted−65

@@ -1,65 +0,0 @@

1−# HLint configuration file

2−# https://github.com/ndmitchell/hlint

3−##########################

4−

5−# This file contains a template configuration file, which is typically

6−# placed as .hlint.yaml in the root of your project

7−

8−

9−# Specify additional command line arguments

10−#

11−# - arguments: [--color, --cpp-simple, -XQuasiQuotes]

12−

13−

14−# Control which extensions/flags/modules/functions can be used

15−#

16−# - extensions:

17−# - default: false # all extension are banned by default

18−# - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used

19−# - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module

20−#

21−# - flags:

22−# - {name: -w, within: []} # -w is allowed nowhere

23−#

24−# - modules:

25−# - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'

26−# - {name: Control.Arrow, within: []} # Certain modules are banned entirely

27−#

28−# - functions:

29−# - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules

30−

31−

32−# Add custom hints for this project

33−#

34−# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"

35−# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}

36−

37−

38−# Turn on hints that are off by default

39−#

40−# Ban "module X(module X) where", to require a real export list

41−# - warn: {name: Use explicit module export list}

42−#

43−# Replace a $ b $ c with a . b $ c

44−# - group: {name: dollar, enabled: true}

45−#

46−# Generalise map to fmap, ++ to <>

47−# - group: {name: generalise, enabled: true}

48−

49−

50−# Ignore some builtin hints

51−- ignore: {name: Redundant do}

52−- ignore: {name: Parse error}

53−- ignore: {name: Use fmap}

54−- ignore: {name: Use list comprehension}

55−- ignore: {name: Use lambda-case}

56−- ignore: {name: Eta reduce}

57−# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules

58−

59−

60−# Define some custom infix operators

61−# - fixity: infixr 3 ~^#^~

62−

63−

64−# To generate a suitable file for HLint do:

65−# $ hlint --default > .hlint.yaml

servant-client-core/servant-client-core.cabal+8−6

@@ -1,6 +1,7 @@

1cabal-version: >=1.10

2name: servant-client-core

3version: 0.16

4+x-revision: 2

5synopsis: Core functionality and class for client function generation for servant APIs

6synopsis: Core functionality and class for client function generation for servant APIs

6category: Servant, Web

7category: Servant, Web

@@ -20,7 +21,8 @@ tested-with:

20 GHC ==8.0.2

21 GHC ==8.0.2

21 || ==8.2.2

22 || ==8.2.2

22 || ==8.4.4

23 || ==8.4.4

23− || ==8.6.4

24+ || ==8.6.5

25+ || ==8.8.1

25extra-source-files:

27extra-source-files:

26 CHANGELOG.md

28 CHANGELOG.md

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

53 --

55 --

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

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

55 build-depends:

57 build-depends:

56− base >= 4.9 && < 4.13

58+ base >= 4.9 && < 4.14

57 , bytestring >= 0.10.8.1 && < 0.11

59 , bytestring >= 0.10.8.1 && < 0.11

58 , containers >= 0.5.7.1 && < 0.7

60 , containers >= 0.5.7.1 && < 0.7

59 , deepseq >= 1.4.2.0 && < 1.5

61 , deepseq >= 1.4.2.0 && < 1.5

60 , text >= 1.2.3.0 && < 1.3

62 , text >= 1.2.3.0 && < 1.3

61 , transformers >= 0.5.2.0 && < 0.6

63 , transformers >= 0.5.2.0 && < 0.6

62− , template-haskell >= 2.11.1.0 && < 2.15

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

64 if !impl(ghc >= 8.2)

66 if !impl(ghc >= 8.2)

65 build-depends:

67 build-depends:

@@ -73,11 +75,11 @@ library

73 -- Here can be exceptions if we really need features from the newer versions.

75 -- Here can be exceptions if we really need features from the newer versions.

74 build-depends:

76 build-depends:

75 aeson >= 1.4.1.0 && < 1.5

77 aeson >= 1.4.1.0 && < 1.5

76− , base-compat >= 0.10.5 && < 0.11

78+ , base-compat >= 0.10.5 && < 0.12

77 , base64-bytestring >= 1.0.0.1 && < 1.1

79 , base64-bytestring >= 1.0.0.1 && < 1.1

78 , exceptions >= 0.10.0 && < 0.11

80 , exceptions >= 0.10.0 && < 0.11

79 , free >= 5.1 && < 5.2

81 , free >= 5.1 && < 5.2

80− , http-media >= 0.7.1.3 && < 0.8

82+ , http-media >= 0.7.1.3 && < 0.9

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

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

82 , network-uri >= 2.6.1.0 && < 2.7

84 , network-uri >= 2.6.1.0 && < 2.7

83 , safe >= 0.3.17 && < 0.4

85 , safe >= 0.3.17 && < 0.4

@@ -105,7 +107,7 @@ test-suite spec

105 build-depends:

107 build-depends:

106 deepseq >= 1.4.2.0 && < 1.5

108 deepseq >= 1.4.2.0 && < 1.5

107 , hspec >= 2.6.0 && < 2.8

109 , hspec >= 2.6.0 && < 2.8

108− , QuickCheck >= 2.12.6.1 && < 2.13

110+ , QuickCheck >= 2.12.6.1 && < 2.14

109

111

110 build-tool-depends:

112 build-tool-depends:

111 hspec-discover:hspec-discover >= 2.6.0 && <2.8

113 hspec-discover:hspec-discover >= 2.6.0 && <2.8

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

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

45 , exceptions >=0.8 && <0.11

46 , ghcjs-base >=0.2.0.0 && <0.3.0.0

47 , ghcjs-prim >=0.1.0.0 && <0.2.0.0

48− , http-media >=0.6.2 && <0.8

48+ , http-media >=0.6.2 && <0.9

49 , http-types >=0.12 && <0.13

50 , monad-control >=1.0.0.4 && <1.1

51 , mtl >=2.2.2 && <2.3

servant-client/CHANGELOG.md+5

@@ -1,6 +1,11 @@

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.16.0.1

5+--------

7+- Allow `base-compat-0.11`

40.16

90.16

5----

10----

servant-client/servant-client.cabal+9−8

@@ -1,6 +1,6 @@

1cabal-version: >=1.10

2name: servant-client

3−version: 0.16

3+version: 0.16.0.1

5synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

@@ -24,7 +24,8 @@ tested-with:

24 GHC ==8.0.2

25 || ==8.2.2

26 || ==8.4.4

27− || ==8.6.4

27+ || ==8.6.5

28+ || ==8.8.1

29extra-source-files:

30extra-source-files:

30 CHANGELOG.md

31 CHANGELOG.md

@@ -44,14 +45,14 @@ library

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

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

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

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

46 build-depends:

47 build-depends:

47− base >= 4.9 && < 4.13

48+ base >= 4.9 && < 4.14

48 , bytestring >= 0.10.8.1 && < 0.11

49 , bytestring >= 0.10.8.1 && < 0.11

49 , containers >= 0.5.7.1 && < 0.7

50 , containers >= 0.5.7.1 && < 0.7

50 , deepseq >= 1.4.2.0 && < 1.5

51 , deepseq >= 1.4.2.0 && < 1.5

51 , mtl >= 2.2.2 && < 2.3

52 , mtl >= 2.2.2 && < 2.3

52 , stm >= 2.4.5.1 && < 2.6

53 , stm >= 2.4.5.1 && < 2.6

53 , text >= 1.2.3.0 && < 1.3

54 , text >= 1.2.3.0 && < 1.3

54− , time >= 1.6.0.1 && < 1.9

55+ , time >= 1.6.0.1 && < 1.10

55 , transformers >= 0.5.2.0 && < 0.6

56 , transformers >= 0.5.2.0 && < 0.6

57 if !impl(ghc >= 8.2)

58 if !impl(ghc >= 8.2)

@@ -67,9 +68,9 @@ library

67 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

68 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

68 -- Here can be exceptions if we really need features from the newer versions.

69 -- Here can be exceptions if we really need features from the newer versions.

69 build-depends:

70 build-depends:

70− base-compat >= 0.10.5 && < 0.11

71+ base-compat >= 0.10.5 && < 0.12

71 , http-client >= 0.5.13.1 && < 0.7

72 , http-client >= 0.5.13.1 && < 0.7

72− , http-media >= 0.7.1.3 && < 0.8

73+ , http-media >= 0.7.1.3 && < 0.9

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

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

74 , exceptions >= 0.10.0 && < 0.11

75 , exceptions >= 0.10.0 && < 0.11

75 , kan-extensions >= 5.2 && < 5.3

76 , kan-extensions >= 5.2 && < 5.3

@@ -117,8 +118,8 @@ test-suite spec

117 entropy >= 0.4.1.3 && < 0.5

118 entropy >= 0.4.1.3 && < 0.5

118 , hspec >= 2.6.0 && < 2.8

119 , hspec >= 2.6.0 && < 2.8

119 , HUnit >= 1.6.0.0 && < 1.7

120 , HUnit >= 1.6.0.0 && < 1.7

120− , network >= 2.8.0.0 && < 3.1

121+ , network >= 2.8.0.0 && < 3.2

121− , QuickCheck >= 2.12.6.1 && < 2.13

122+ , QuickCheck >= 2.12.6.1 && < 2.14

122 , servant == 0.16.*

123 , servant == 0.16.*

123 , servant-server == 0.16.*

124 , servant-server == 0.16.*

124 , tdigest >= 0.2 && < 0.3

125 , tdigest >= 0.2 && < 0.3

servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3

@@ -16,10 +16,11 @@ import Prelude.Compat

17import Control.Concurrent.MVar

18 (modifyMVar, newMVar)

19−import qualified Data.ByteString as BS

20import Control.Concurrent.STM.TVar

19import Control.Concurrent.STM.TVar

21import Control.Exception

20import Control.Exception

21+ (SomeException (..), catch)

22import Control.Monad

23+ (unless)

23import Control.Monad.Base

24import Control.Monad.Base

24 (MonadBase (..))

25 (MonadBase (..))

25import Control.Monad.Catch

26import Control.Monad.Catch

@@ -27,15 +28,18 @@ import Control.Monad.Catch

27import Control.Monad.Error.Class

28import Control.Monad.Error.Class

28 (MonadError (..))

29 (MonadError (..))

29import Control.Monad.IO.Class

30import Control.Monad.IO.Class

30− (liftIO)

31+ (MonadIO (..))

31import Control.Monad.Reader

32import Control.Monad.Reader

33+ (MonadReader, ReaderT, ask, runReaderT)

32import Control.Monad.STM

34import Control.Monad.STM

33 (STM, atomically)

35 (STM, atomically)

34import Control.Monad.Trans.Control

36import Control.Monad.Trans.Control

35 (MonadBaseControl (..))

37 (MonadBaseControl (..))

36import Control.Monad.Trans.Except

38import Control.Monad.Trans.Except

39+ (ExceptT, runExceptT)

37import Data.Bifunctor

40import Data.Bifunctor

38 (bimap)

41 (bimap)

42+import qualified Data.ByteString as BS

39import Data.ByteString.Builder

43import Data.ByteString.Builder

40 (toLazyByteString)

44 (toLazyByteString)

41import qualified Data.ByteString.Lazy as BSL

45import qualified Data.ByteString.Lazy as BSL

@@ -64,8 +68,8 @@ import Network.HTTP.Types

64 (hContentType, renderQuery, statusCode)

68 (hContentType, renderQuery, statusCode)

65import Servant.Client.Core

69import Servant.Client.Core

67−import qualified Servant.Types.SourceT as S

68import qualified Network.HTTP.Client as Client

71import qualified Network.HTTP.Client as Client

72+import qualified Servant.Types.SourceT as S

70-- | The environment in which a request is run.

74-- | The environment in which a request is run.

71data ClientEnv

75data ClientEnv

servant-conduit/servant-conduit.cabal+4−3

@@ -1,7 +1,7 @@

1cabal-version: >=1.10

2name: servant-conduit

3version: 0.15

4−x-revision: 1

4+x-revision: 2

6synopsis: Servant Stream support for conduit.

7category: Servant, Web, Enumerator

@@ -21,7 +21,8 @@ tested-with:

21 GHC ==8.0.2

22 || ==8.2.2

23 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

25+ || ==8.8.1

26extra-source-files:

27extra-source-files:

27 CHANGELOG.md

28 CHANGELOG.md

@@ -62,6 +63,6 @@ test-suite example

62 , servant-server >=0.15 && <0.17

63 , servant-server >=0.15 && <0.17

63 , servant-client >=0.15 && <0.17

64 , servant-client >=0.15 && <0.17

64 , wai >=3.2.1.2 && <3.3

65 , wai >=3.2.1.2 && <3.3

65− , warp >=3.2.25 && <3.3

66+ , warp >=3.2.25 && <3.4

66 , http-client

67 , http-client

67 default-language: Haskell2010

68 default-language: Haskell2010

servant-docs/CHANGELOG.md+5

@@ -1,6 +1,11 @@

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-docs/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.11.4

5+------

7+- Drop dependency on `control-monad-omega` in favor of `Data.Universe.Helpers` from `universe-base`.

40.11.3

90.11.3

5------

10------

servant-docs/servant-docs.cabal+9−9

@@ -1,7 +1,6 @@

1cabal-version: >=1.10

2name: servant-docs

3−version: 0.11.3

3+version: 0.11.4

4−x-revision: 1

6synopsis: generate API docs for your servant webservice

5synopsis: generate API docs for your servant webservice

7category: Servant, Web

6category: Servant, Web

@@ -24,7 +23,8 @@ tested-with:

24 GHC ==8.0.2

23 GHC ==8.0.2

25 || ==8.2.2

24 || ==8.2.2

26 || ==8.4.4

25 || ==8.4.4

27− || ==8.6.4

26+ || ==8.6.5

27+ || ==8.8.1

29extra-source-files:

30 CHANGELOG.md

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

46 --

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

48 build-depends:

49− base >= 4.9 && < 4.13

49+ base >= 4.9 && < 4.14

50 , bytestring >= 0.10.8.1 && < 0.11

51 , text >= 1.2.3.0 && < 1.3

@@ -59,14 +59,14 @@ library

59 build-depends:

60 aeson >= 1.4.1.0 && < 1.5

61 , aeson-pretty >= 0.8.5 && < 0.9

62− , base-compat >= 0.10.5 && < 0.11

62+ , base-compat >= 0.10.5 && < 0.12

63 , case-insensitive >= 1.2.0.11 && < 1.3

64− , control-monad-omega >= 0.3.1 && < 0.4

65− , hashable >= 1.2.7.0 && < 1.3

64+ , hashable >= 1.2.7.0 && < 1.4

66− , http-media >= 0.7.1.3 && < 0.8

65+ , http-media >= 0.7.1.3 && < 0.9

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

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

68− , lens >= 4.17 && < 4.18

67+ , lens >= 4.17 && < 4.19

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

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

69+ , universe-base >= 1.1.1 && < 1.2

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

72 hs-source-dirs: src

servant-docs/src/Servant/Docs/Internal.hs+9−8

@@ -27,7 +27,6 @@ import Control.Arrow

27import Control.Lens

28 (makeLenses, mapped, over, traversed, view, (%~), (&), (.~),

29 (<>~), (^.), (|>))

30−import qualified Control.Monad.Omega as Omega

31import qualified Data.ByteString.Char8 as BSC

30import qualified Data.ByteString.Char8 as BSC

32import Data.ByteString.Lazy.Char8

31import Data.ByteString.Lazy.Char8

33 (ByteString)

32 (ByteString)

@@ -65,6 +64,8 @@ import Servant.API

65import Servant.API.ContentTypes

64import Servant.API.ContentTypes

66import Servant.API.TypeLevel

65import Servant.API.TypeLevel

67+import qualified Data.Universe.Helpers as U

68+

68import qualified Data.HashMap.Strict as HM

69import qualified Data.HashMap.Strict as HM

69import qualified Data.Text as T

70import qualified Data.Text as T

70import qualified Network.HTTP.Media as M

71import qualified Network.HTTP.Media as M

@@ -479,22 +480,22 @@ samples = map ("",)

479

480

480-- | Default sample Generic-based inputs/outputs.

481-- | Default sample Generic-based inputs/outputs.

481defaultSamples :: forall a. (Generic a, GToSample (Rep a)) => Proxy a -> [(Text, a)]

482defaultSamples :: forall a. (Generic a, GToSample (Rep a)) => Proxy a -> [(Text, a)]

482−defaultSamples _ = Omega.runOmega $ second to <$> gtoSamples (Proxy :: Proxy (Rep a))

483+defaultSamples _ = second to <$> gtoSamples (Proxy :: Proxy (Rep a))

483

484

484-- | @'ToSample'@ for Generics.

485-- | @'ToSample'@ for Generics.

485--

486--

486−-- The use of @'Omega'@ allows for more productive sample generation.

487+-- Note: we use combinators from "Universe.Data.Helpers" for more productive sample generation.

487class GToSample t where

488class GToSample t where

488− gtoSamples :: proxy t -> Omega.Omega (Text, t x)

489+ gtoSamples :: proxy t -> [(Text, t x)]

489

490

490instance GToSample U1 where

491instance GToSample U1 where

491− gtoSamples _ = Omega.each (singleSample U1)

492+ gtoSamples _ = singleSample U1

492

493

493instance GToSample V1 where

494instance GToSample V1 where

494 gtoSamples _ = empty

495 gtoSamples _ = empty

495

496

496instance (GToSample p, GToSample q) => GToSample (p :*: q) where

497instance (GToSample p, GToSample q) => GToSample (p :*: q) where

497− gtoSamples _ = render <$> ps <*> qs

498+ gtoSamples _ = U.cartesianProduct render ps qs

498 where

499 where

499 ps = gtoSamples (Proxy :: Proxy p)

500 ps = gtoSamples (Proxy :: Proxy p)

500 qs = gtoSamples (Proxy :: Proxy q)

501 qs = gtoSamples (Proxy :: Proxy q)

@@ -503,13 +504,13 @@ instance (GToSample p, GToSample q) => GToSample (p :*: q) where

503 | otherwise = (ta <> ", " <> tb, a :*: b)

504 | otherwise = (ta <> ", " <> tb, a :*: b)

504

505

505instance (GToSample p, GToSample q) => GToSample (p :+: q) where

506instance (GToSample p, GToSample q) => GToSample (p :+: q) where

506− gtoSamples _ = lefts <|> rights

507+ gtoSamples _ = lefts U.+++ rights

507 where

508 where

508 lefts = second L1 <$> gtoSamples (Proxy :: Proxy p)

509 lefts = second L1 <$> gtoSamples (Proxy :: Proxy p)

509 rights = second R1 <$> gtoSamples (Proxy :: Proxy q)

510 rights = second R1 <$> gtoSamples (Proxy :: Proxy q)

510

511

511instance ToSample a => GToSample (K1 i a) where

512instance ToSample a => GToSample (K1 i a) where

512− gtoSamples _ = second K1 <$> Omega.each (toSamples (Proxy :: Proxy a))

513+ gtoSamples _ = second K1 <$> toSamples (Proxy :: Proxy a)

513

514

514instance (GToSample f) => GToSample (M1 i a f) where

515instance (GToSample f) => GToSample (M1 i a f) where

515 gtoSamples _ = second M1 <$> gtoSamples (Proxy :: Proxy f)

516 gtoSamples _ = second M1 <$> gtoSamples (Proxy :: Proxy f)

servant-foreign/servant-foreign.cabal+6−5

@@ -1,7 +1,7 @@

1cabal-version: >=1.10

2name: servant-foreign

3version: 0.15

4−x-revision: 1

4+x-revision: 2

6synopsis: Helpers for generating clients for servant APIs in any programming language

7category: Servant, Web

@@ -26,7 +26,8 @@ tested-with:

26 GHC ==8.0.2

27 || ==8.2.2

28 || ==8.4.4

29− || ==8.6.4

29+ || ==8.6.5

30+ || ==8.8.1

31extra-source-files:

32extra-source-files:

32 CHANGELOG.md

33 CHANGELOG.md

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

46 --

47 --

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

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

48 build-depends:

49 build-depends:

49− base >= 4.9 && < 4.13

50+ base >= 4.9 && < 4.14

50 , text >= 1.2.3.0 && < 1.3

51 , text >= 1.2.3.0 && < 1.3

52 -- Servant dependencies

53 -- Servant dependencies

@@ -56,8 +57,8 @@ library

56 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

57 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

57 -- Here can be exceptions if we really need features from the newer versions.

58 -- Here can be exceptions if we really need features from the newer versions.

58 build-depends:

59 build-depends:

59− base-compat >= 0.10.5 && < 0.11

60+ base-compat >= 0.10.5 && < 0.12

60− , lens >= 4.17 && < 4.18

61+ , lens >= 4.17 && < 4.19

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

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

63 hs-source-dirs: src

64 hs-source-dirs: src

servant-http-streams/CHANGELOG.md+5

@@ -1,6 +1,11 @@

1 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.16.0.1

5+--------

7+- Allow `base-compat-0.11`

40.16

90.16

5----

10----

servant-http-streams/servant-http-streams.cabal+9−7

@@ -1,6 +1,7 @@

1cabal-version: >=1.10

2name: servant-http-streams

3version: 0.16

4+x-revision: 2

5synopsis: Automatic derivation of querying functions for servant

6synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

7category: Servant, Web

@@ -24,7 +25,8 @@ tested-with:

24 GHC ==8.0.2

25 GHC ==8.0.2

25 || ==8.2.2

26 || ==8.2.2

26 || ==8.4.4

27 || ==8.4.4

27− || ==8.6.4

28+ || ==8.6.5

29+ || ==8.8.1

29extra-source-files:

31extra-source-files:

30 CHANGELOG.md

32 CHANGELOG.md

@@ -42,13 +44,13 @@ library

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

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

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

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

44 build-depends:

46 build-depends:

45− base >= 4.9 && < 4.13

47+ base >= 4.9 && < 4.14

46 , bytestring >= 0.10.8.1 && < 0.11

48 , bytestring >= 0.10.8.1 && < 0.11

47 , containers >= 0.5.7.1 && < 0.7

49 , containers >= 0.5.7.1 && < 0.7

48 , deepseq >= 1.4.2.0 && < 1.5

50 , deepseq >= 1.4.2.0 && < 1.5

49 , mtl >= 2.2.2 && < 2.3

51 , mtl >= 2.2.2 && < 2.3

50 , text >= 1.2.3.0 && < 1.3

52 , text >= 1.2.3.0 && < 1.3

51− , time >= 1.6.0.1 && < 1.9

53+ , time >= 1.6.0.1 && < 1.10

52 , transformers >= 0.5.2.0 && < 0.6

54 , transformers >= 0.5.2.0 && < 0.6

54 if !impl(ghc >= 8.2)

56 if !impl(ghc >= 8.2)

@@ -64,10 +66,10 @@ library

64 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

66 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

65 -- Here can be exceptions if we really need features from the newer versions.

67 -- Here can be exceptions if we really need features from the newer versions.

66 build-depends:

68 build-depends:

67− base-compat >= 0.10.5 && < 0.11

69+ base-compat >= 0.10.5 && < 0.12

68 , case-insensitive

70 , case-insensitive

69 , http-streams >= 0.8.6.1 && < 0.9

71 , http-streams >= 0.8.6.1 && < 0.9

70− , http-media >= 0.7.1.3 && < 0.8

72+ , http-media >= 0.7.1.3 && < 0.9

71 , io-streams >= 1.5.0.1 && < 1.6

73 , io-streams >= 1.5.0.1 && < 1.6

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

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

73 , http-common >= 0.8.2.0 && < 0.9

75 , http-common >= 0.8.2.0 && < 0.9

@@ -118,8 +120,8 @@ test-suite spec

118 entropy >= 0.4.1.3 && < 0.5

120 entropy >= 0.4.1.3 && < 0.5

119 , hspec >= 2.6.0 && < 2.8

121 , hspec >= 2.6.0 && < 2.8

120 , HUnit >= 1.6.0.0 && < 1.7

122 , HUnit >= 1.6.0.0 && < 1.7

121− , network >= 2.8.0.0 && < 3.1

123+ , network >= 2.8.0.0 && < 3.2

122− , QuickCheck >= 2.12.6.1 && < 2.13

124+ , QuickCheck >= 2.12.6.1 && < 2.14

123 , servant == 0.16.*

125 , servant == 0.16.*

124 , servant-server == 0.16.*

126 , servant-server == 0.16.*

125 , tdigest >= 0.2 && < 0.3

127 , tdigest >= 0.2 && < 0.3

servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1

@@ -18,6 +18,8 @@ import Control.DeepSeq

18 (NFData, force)

19import Control.Exception

20 (IOException, SomeException (..), catch, evaluate, throwIO)

21+import Control.Monad

22+ (unless)

21import Control.Monad.Base

23import Control.Monad.Base

22 (MonadBase (..))

24 (MonadBase (..))

23import Control.Monad.Codensity

25import Control.Monad.Codensity

@@ -25,9 +27,13 @@ import Control.Monad.Codensity

25import Control.Monad.Error.Class

27import Control.Monad.Error.Class

26 (MonadError (..))

28 (MonadError (..))

27import Control.Monad.IO.Class

29import Control.Monad.IO.Class

28− (liftIO)

30+ (MonadIO (..))

29import Control.Monad.Reader

31import Control.Monad.Reader

32+ (MonadReader, ReaderT, ask, runReaderT)

33+import Control.Monad.Trans.Class

34+ (lift)

30import Control.Monad.Trans.Except

35import Control.Monad.Trans.Except

36+ (ExceptT, runExceptT)

31import Data.Bifunctor

37import Data.Bifunctor

32 (bimap, first)

38 (bimap, first)

33import Data.ByteString.Builder

39import Data.ByteString.Builder

servant-machines/servant-machines.cabal+5−4

@@ -1,7 +1,7 @@

1cabal-version: >=1.10

2name: servant-machines

3version: 0.15

4−x-revision: 1

4+x-revision: 3

6synopsis: Servant Stream support for machines

7category: Servant, Web, Enumerator

@@ -21,7 +21,8 @@ tested-with:

21 GHC ==8.0.2

22 || ==8.2.2

23 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

25+ || ==8.8.1

26extra-source-files:

27extra-source-files:

27 CHANGELOG.md

28 CHANGELOG.md

@@ -35,7 +36,7 @@ library

35 build-depends:

36 build-depends:

36 base >=4.9 && <5

37 base >=4.9 && <5

37 , bytestring >=0.10.8.1 && <0.11

38 , bytestring >=0.10.8.1 && <0.11

38− , machines >=0.6.4 && <0.7

39+ , machines >=0.6.4 && <0.8

39 , mtl >=2.2.2 && <2.3

40 , mtl >=2.2.2 && <2.3

40 , servant >=0.15 && <0.17

41 , servant >=0.15 && <0.17

41 hs-source-dirs: src

42 hs-source-dirs: src

@@ -59,6 +60,6 @@ test-suite example

59 , servant-server >=0.15 && <0.17

60 , servant-server >=0.15 && <0.17

60 , servant-client >=0.15 && <0.17

61 , servant-client >=0.15 && <0.17

61 , wai >=3.2.1.2 && <3.3

62 , wai >=3.2.1.2 && <3.3

62− , warp >=3.2.25 && <3.3

63+ , warp >=3.2.25 && <3.4

63 , http-client

64 , http-client

64 default-language: Haskell2010

65 default-language: Haskell2010

servant-pipes/CHANGELOG.md+7

@@ -1,3 +1,10 @@

1+0.15.1

2+------

4+- `FromSourceIO Proxy` (`ListT`) instance `fail`s in `IO`, not in `m`.

5+ This works around `MonadFail` proposal, and makes `servant-pipes`

6+ behave like `servant-conduit` and `servant-machines`.

10.15

80.15

2----

9----

servant-pipes/servant-pipes.cabal+4−4

@@ -1,7 +1,6 @@

1cabal-version: >=1.10

2name: servant-pipes

3−version: 0.15

3+version: 0.15.1

4−x-revision: 1

6synopsis: Servant Stream support for pipes

5synopsis: Servant Stream support for pipes

7category: Servant, Web, Pipes

6category: Servant, Web, Pipes

@@ -21,7 +20,8 @@ tested-with:

21 GHC ==8.0.2

20 GHC ==8.0.2

22 || ==8.2.2

21 || ==8.2.2

23 || ==8.4.4

22 || ==8.4.4

24− || ==8.6.4

23+ || ==8.6.5

24+ || ==8.8.1

26extra-source-files:

27 CHANGELOG.md

@@ -63,6 +63,6 @@ test-suite example

63 , servant-server >=0.15 && <0.17

64 , servant-client >=0.15 && <0.17

65 , wai >=3.2.1.2 && <3.3

66− , warp >=3.2.25 && <3.3

66+ , warp >=3.2.25 && <3.4

67 , http-client

68 default-language: Haskell2010

servant-pipes/src/Servant/Pipes.hs+1−1

@@ -65,7 +65,7 @@ instance (MonadIO m, a' ~ X, a ~ (), b' ~ (), r ~ ())

65 fromSourceIO src = M $ liftIO $ S.unSourceT src (return . go) where

66 go :: S.StepT IO b -> Proxy X () () b m ()

67 go S.Stop = Pure ()

68− go (S.Error err) = M (fail err)

68+ go (S.Error err) = M (liftIO (fail err))

69 go (S.Skip s) = go s -- drives

70 go (S.Effect ms) = M (liftIO (fmap go ms))

71 go (S.Yield x s) = Respond x (const (go s))

servant-server/CHANGELOG.md+14

@@ -1,6 +1,20 @@

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.16.2

5+------

7+* `singleton-bool-0.1.5` (`SBool` is re-exported)

8+ - Add `discreteBool :: Dec (a :~: b)` (GHC-7.8+)

9+ - Add `Show`, `Eq`, `Ord` `SBool b` instances.

10+* dependencies update

11+

12+0.16.1

13+------

14+

15+* Use `http-api-data-0.4.1` (a part of its API is re-exported)

16+ [#1181](https://github.com/haskell-servant/servant/pull/1181)

17+

40.16

180.16

5----

19----

servant-server/servant-server.cabal+12−10

@@ -1,6 +1,7 @@

1cabal-version: >=1.10

2name: servant-server

3−version: 0.16

3+version: 0.16.2

4+x-revision: 1

5synopsis: A family of combinators for defining webservices APIs and serving them

6synopsis: A family of combinators for defining webservices APIs and serving them

6category: Servant, Web

7category: Servant, Web

@@ -27,7 +28,8 @@ tested-with:

27 GHC ==8.0.2

28 GHC ==8.0.2

28 || ==8.2.2

29 || ==8.2.2

29 || ==8.4.4

30 || ==8.4.4

30− || ==8.6.4

31+ || ==8.6.5

32+ || ==8.8.1

32extra-source-files:

34extra-source-files:

33 CHANGELOG.md

35 CHANGELOG.md

@@ -68,7 +70,7 @@ library

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

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

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

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

70 build-depends:

72 build-depends:

71− base >= 4.9 && < 4.13

73+ base >= 4.9 && < 4.14

72 , bytestring >= 0.10.8.1 && < 0.11

74 , bytestring >= 0.10.8.1 && < 0.11

73 , containers >= 0.5.7.1 && < 0.7

75 , containers >= 0.5.7.1 && < 0.7

74 , mtl >= 2.2.2 && < 2.3

76 , mtl >= 2.2.2 && < 2.3

@@ -79,20 +81,20 @@ library

79 -- Servant dependencies

81 -- Servant dependencies

80 -- strict dependency as we re-export 'servant' things.

82 -- strict dependency as we re-export 'servant' things.

81 build-depends:

83 build-depends:

82− servant >= 0.16 && < 0.17.1

84+ servant >= 0.16.2 && < 0.16.3

83− , http-api-data >= 0.4 && < 0.4.1

85+ , http-api-data >= 0.4.1 && < 0.4.2

85 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

87 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

86 -- Here can be exceptions if we really need features from the newer versions.

88 -- Here can be exceptions if we really need features from the newer versions.

87 build-depends:

89 build-depends:

88− base-compat >= 0.10.5 && < 0.11

90+ base-compat >= 0.10.5 && < 0.12

89 , base64-bytestring >= 1.0.0.1 && < 1.1

91 , base64-bytestring >= 1.0.0.1 && < 1.1

90 , exceptions >= 0.10.0 && < 0.11

92 , exceptions >= 0.10.0 && < 0.11

91− , http-media >= 0.7.1.3 && < 0.8

93+ , http-media >= 0.7.1.3 && < 0.9

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

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

93 , network-uri >= 2.6.1.0 && < 2.8

95 , network-uri >= 2.6.1.0 && < 2.8

94 , monad-control >= 1.0.2.3 && < 1.1

96 , monad-control >= 1.0.2.3 && < 1.1

95− , network >= 2.8 && < 3.1

97+ , network >= 2.8 && < 3.2

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

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

97 , resourcet >= 1.2.2 && < 1.3

99 , resourcet >= 1.2.2 && < 1.3

98 , tagged >= 0.8.6 && < 0.9

100 , tagged >= 0.8.6 && < 0.9

@@ -120,7 +122,7 @@ executable greet

120

122

121 build-depends:

123 build-depends:

122 aeson >= 1.4.1.0 && < 1.5

124 aeson >= 1.4.1.0 && < 1.5

123− , warp >= 3.2.25 && < 3.3

125+ , warp >= 3.2.25 && < 3.4

124

126

125test-suite spec

127test-suite spec

126 type: exitcode-stdio-1.0

128 type: exitcode-stdio-1.0

@@ -165,7 +167,7 @@ test-suite spec

165 , directory >= 1.3.0.0 && < 1.4

167 , directory >= 1.3.0.0 && < 1.4

166 , hspec >= 2.6.0 && < 2.8

168 , hspec >= 2.6.0 && < 2.8

167 , hspec-wai >= 0.9.0 && < 0.10

169 , hspec-wai >= 0.9.0 && < 0.10

168− , QuickCheck >= 2.12.6.1 && < 2.13

170+ , QuickCheck >= 2.12.6.1 && < 2.14

169 , should-not-typecheck >= 2.1.0 && < 2.2

171 , should-not-typecheck >= 2.1.0 && < 2.2

170 , temporary >= 1.3 && < 1.4

172 , temporary >= 1.3 && < 1.4

171 , wai-extra >= 3.0.24.3 && < 3.1

173 , wai-extra >= 3.0.24.3 && < 3.1

servant/CHANGELOG.md+23

@@ -1,5 +1,28 @@

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

3+0.16.2

4+------

6+* `singleton-bool-0.1.5` (`SBool` is re-exported)

7+ - Add `discreteBool :: Dec (a :~: b)` (GHC-7.8+)

8+ - Add `Show`, `Eq`, `Ord` `SBool b` instances.

9+* dependencies update

10+

11+0.16.1

12+------

13+

14+* Add `Semigroup` and `Monoid` `SourceT` instances

15+ [#1158](https://github.com/haskell-servant/servant/pull/1158)

16+ [#1159](https://github.com/haskell-servant/servant/pull/1159)

17+* Use `http-api-data-0.4.1`

18+ [#1181](https://github.com/haskell-servant/servant/pull/1181)

19+* Allow newer dependencies

20+

21+0.16.0.1

22+--------

23+

24+- Make tests work with `http-media-0.8`

25+

30.16

260.16

4----

27----

servant/servant.cabal+12−9

@@ -1,6 +1,7 @@

1cabal-version: >=1.10

2name: servant

3−version: 0.16

3+version: 0.16.2

4+x-revision: 1

5synopsis: A family of combinators for defining webservices APIs

6synopsis: A family of combinators for defining webservices APIs

6category: Servant, Web

7category: Servant, Web

@@ -24,7 +25,8 @@ tested-with:

24 GHC ==8.0.2

25 GHC ==8.0.2

25 || ==8.2.2

26 || ==8.2.2

26 || ==8.4.4

27 || ==8.4.4

27− || ==8.6.4

28+ || ==8.6.5

29+ || ==8.8.1

29extra-source-files:

31extra-source-files:

30 CHANGELOG.md

32 CHANGELOG.md

@@ -88,7 +90,7 @@ library

88 --

90 --

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

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

90 build-depends:

92 build-depends:

91− base >= 4.9 && < 4.13

93+ base >= 4.9 && < 4.14

92 , bytestring >= 0.10.8.1 && < 0.11

94 , bytestring >= 0.10.8.1 && < 0.11

93 , mtl >= 2.2.2 && < 2.3

95 , mtl >= 2.2.2 && < 2.3

94 , transformers >= 0.5.2.0 && < 0.6

96 , transformers >= 0.5.2.0 && < 0.6

@@ -98,23 +100,23 @@ library

98 -- We depend (heavily) on the API of these packages:

100 -- We depend (heavily) on the API of these packages:

99 -- i.e. re-export, or allow using without direct dependency

101 -- i.e. re-export, or allow using without direct dependency

100 build-depends:

102 build-depends:

101− http-api-data >= 0.4 && < 0.4.1

103+ http-api-data >= 0.4.1 && < 0.4.2

102− , singleton-bool >= 0.1.4 && < 0.1.5

104+ , singleton-bool >= 0.1.5 && < 0.1.6

103

105

104 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

106 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

105 -- Here can be exceptions if we really need features from the newer versions.

107 -- Here can be exceptions if we really need features from the newer versions.

106 build-depends:

108 build-depends:

107− base-compat >= 0.10.5 && < 0.11

109+ base-compat >= 0.10.5 && < 0.12

108 , aeson >= 1.4.1.0 && < 1.5

110 , aeson >= 1.4.1.0 && < 1.5

109 , attoparsec >= 0.13.2.2 && < 0.14

111 , attoparsec >= 0.13.2.2 && < 0.14

110 , bifunctors >= 5.5.3 && < 5.6

112 , bifunctors >= 5.5.3 && < 5.6

111 , case-insensitive >= 1.2.0.11 && < 1.3

113 , case-insensitive >= 1.2.0.11 && < 1.3

112 , deepseq >= 1.4.2.0 && < 1.5

114 , deepseq >= 1.4.2.0 && < 1.5

113− , http-media >= 0.7.1.3 && < 0.8

115+ , http-media >= 0.7.1.3 && < 0.9

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

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

115 , mmorph >= 1.1.2 && < 1.2

117 , mmorph >= 1.1.2 && < 1.2

116 , network-uri >= 2.6.1.0 && < 2.7

118 , network-uri >= 2.6.1.0 && < 2.7

117− , QuickCheck >= 2.12.6.1 && <2.13

119+ , QuickCheck >= 2.12.6.1 && < 2.14

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

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

119 , tagged >= 0.8.6 && < 0.9

121 , tagged >= 0.8.6 && < 0.9

120 , vault >= 0.3.1.2 && < 0.4

122 , vault >= 0.3.1.2 && < 0.4

@@ -161,6 +163,7 @@ test-suite spec

161 , base-compat

163 , base-compat

162 , aeson

164 , aeson

163 , bytestring

165 , bytestring

166+ , http-media

164 , mtl

167 , mtl

165 , servant

168 , servant

166 , string-conversions

169 , string-conversions

@@ -170,7 +173,7 @@ test-suite spec

170 -- Additonal dependencies

173 -- Additonal dependencies

171 build-depends:

174 build-depends:

172 hspec >= 2.6.0 && < 2.8

175 hspec >= 2.6.0 && < 2.8

173− , QuickCheck >= 2.12.6.1 && < 2.13

176+ , QuickCheck >= 2.12.6.1 && < 2.14

174 , quickcheck-instances >= 0.3.19 && < 0.4

177 , quickcheck-instances >= 0.3.19 && < 0.4

175

178

176 build-tool-depends:

179 build-tool-depends:

servant/src/Servant/API/Experimental/Auth.hs−1

@@ -1,6 +1,5 @@

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DeriveDataTypeable #-}

3−{-# LANGUAGE KindSignatures #-}

4{-# LANGUAGE PolyKinds #-}

3{-# LANGUAGE PolyKinds #-}

5module Servant.API.Experimental.Auth where

4module Servant.API.Experimental.Auth where

servant/src/Servant/Types/SourceT.hs+32

@@ -89,6 +89,21 @@ instance MFunctor SourceT where

89 hoist f (SourceT m) = SourceT $ \k -> k $

90 Effect $ f $ fmap (hoist f) $ m return

92+-- | >>> source "xy" <> source "z" :: SourceT Identity Char

93+-- fromStepT (Effect (Identity (Yield 'x' (Yield 'y' (Yield 'z' Stop)))))

94+--

95+instance Functor m => Semigroup (SourceT m a) where

96+ SourceT withL <> SourceT withR = SourceT $ \ret ->

97+ withL $ \l ->

98+ withR $ \r ->

99+ ret $ l <> r

100+

101+-- | >>> mempty :: SourceT Maybe Int

102+-- fromStepT (Effect (Just Stop))

103+instance Functor m => Monoid (SourceT m a) where

104+ mempty = fromStepT mempty

105+ mappend = (<>)

106+

92-- | Doesn't generate 'Error' constructors. 'SourceT' doesn't shrink.

107-- | Doesn't generate 'Error' constructors. 'SourceT' doesn't shrink.

93instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (SourceT m a) where

108instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (SourceT m a) where

94 arbitrary = fromStepT <$> QC.arbitrary

109 arbitrary = fromStepT <$> QC.arbitrary

@@ -150,6 +165,23 @@ instance MFunctor StepT where

150 go (Yield x s) = Yield x (go s)

165 go (Yield x s) = Yield x (go s)

151 go (Effect ms) = Effect (f (fmap go ms))

166 go (Effect ms) = Effect (f (fmap go ms))

152

167

168+instance Functor m => Semigroup (StepT m a) where

169+ Stop <> r = r

170+ Error err <> _ = Error err

171+ Skip s <> r = Skip (s <> r)

172+ Yield x s <> r = Yield x (s <> r)

173+ Effect ms <> r = Effect ((<> r) <$> ms)

174+

175+-- | >>> mempty :: StepT [] Int

176+-- Stop

177+--

178+-- >>> mempty :: StepT Identity Int

179+-- Stop

180+--

181+instance Functor m => Monoid (StepT m a) where

182+ mempty = Stop

183+ mappend = (<>)

184+

153-- | Doesn't generate 'Error' constructors.

185-- | Doesn't generate 'Error' constructors.

154instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (StepT m a) where

186instance (QC.Arbitrary a, Monad m) => QC.Arbitrary (StepT m a) where

155 arbitrary = QC.sized arb where

187 arbitrary = QC.sized arb where

servant/test/Servant/API/ContentTypesSpec.hs+18−5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE DeriveGeneric #-}

3{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE MultiParamTypeClasses #-}

@@ -20,7 +21,7 @@ import Data.Either

20import Data.Function

21import Data.Function

21 (on)

22 (on)

22import Data.List

23import Data.List

23− (maximumBy)

24+ (sortBy)

24import qualified Data.List.NonEmpty as NE

25import qualified Data.List.NonEmpty as NE

25import Data.Maybe

26import Data.Maybe

26 (fromJust, isJust, isNothing)

27 (fromJust, isJust, isNothing)

@@ -134,17 +135,29 @@ spec = describe "Servant.API.ContentTypes" $ do

134 == Just ("application/json;charset=utf-8", encode x)

135 == Just ("application/json;charset=utf-8", encode x)

135

136

136 it "respects the Accept spec ordering" $ do

137 it "respects the Accept spec ordering" $ do

137− let highest a b c = maximumBy (compare `on` snd)

138+ let highest a b c = last $ sortBy (compare `on` snd)

139+-- when qualities are same, http-media-0.8 picks first; 0.7 last.

140+#if MIN_VERSION_http_media(0,8,0)

141+ [ ("text/plain;charset=utf-8", c)

142+ , ("application/json;charset=utf-8", b)

143+ , ("application/octet-stream", a)

144+ ]

145+#else

138 [ ("application/octet-stream", a)

146 [ ("application/octet-stream", a)

139 , ("application/json;charset=utf-8", b)

147 , ("application/json;charset=utf-8", b)

140 , ("text/plain;charset=utf-8", c)

148 , ("text/plain;charset=utf-8", c)

141 ]

149 ]

150+#endif

142 let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $

151 let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $

143− addToAccept (Proxy :: Proxy JSON) b $

152+ addToAccept (Proxy :: Proxy JSON) b $

144− addToAccept (Proxy :: Proxy PlainText ) c ""

153+ addToAccept (Proxy :: Proxy PlainText ) c $

154+ ""

145 let val a b c i = handleAcceptH (Proxy :: Proxy '[OctetStream, JSON, PlainText])

155 let val a b c i = handleAcceptH (Proxy :: Proxy '[OctetStream, JSON, PlainText])

146 (acceptH a b c) (i :: Int)

156 (acceptH a b c) (i :: Int)

157+ property $ \a b c i ->

158+ let acc = acceptH a b c

159+ in counterexample (show acc) $

147− property $ \a b c i -> fst (fromJust $ val a b c i) == fst (highest a b c)

160+ fst (fromJust $ val a b c i) === fst (highest a b c)

148

161

149 describe "handleCTypeH" $ do

162 describe "handleCTypeH" $ do

150

163