3e29b51 · typeable/servant

git.iko.soy/typeable/servant

Merge pull request #1409 from haskell-servant/maksbotan/ghc-9

Update for GHC 9.0.1

commit3e29b5194e276256fefbe9359d8f3a7b370be5cf authorMaxim Koltsov <kolmax94@gmail.com> dateThu 24 Jun 2021, 00:12 (5 years ago) parentcc67b9e f527f09

13 files changed+41−34

compare with master

unifiedsplit

.github/workflows/master.yml+10−3 cabal.project+8−8 doc/tutorial/tutorial.cabal+2−2 servant-client-core/servant-client-core.cabal+3−3 servant-client/servant-client.cabal+2−2 servant-docs/servant-docs.cabal+2−2 servant-foreign/servant-foreign.cabal+2−2 servant-http-streams/servant-http-streams.cabal+2−2 servant-pipes/example/Main.hs+1−1 servant-server/servant-server.cabal+3−3 servant/servant.cabal+4−4 servant/src/Servant/API/UVerb/Union.hs+1−1 servant/test/Servant/API/StreamSpec.hs+1−1

.github/workflows/master.yml+10−3

@@ -13,14 +13,15 @@ jobs:

1313 strategy:

1414 matrix:

1515 os: [ubuntu-latest]

16− cabal: ["3.2"]

16+ cabal: ["3.4"]

1717 ghc:

1818 - "8.0.2"

1919 - "8.2.2"

2020 - "8.4.4"

2121 - "8.6.5"

2222 - "8.8.4"

23− - "8.10.2"

23+ - "8.10.4"

24+ - "9.0.1"

2425

2526 steps:

2627 - uses: actions/checkout@v2

@@ -49,7 +50,10 @@ jobs:

4950

5051 - name: Configure

5152 run: |

52− cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.17'

53+ # Using separate store-dir because default one already has 'ghc-paths' package installed

54+ # with hardcoded path to ghcup's GHC path (which it was built with). This leads to failure in

55+ # doctest, as it tries to invoke that GHC, and it doesn't exist here.

56+ cabal --store-dir /tmp/cabal-store install --ignore-project -j2 doctest --constraint='doctest ^>=0.18'

5357

5458 - name: Build

5559 run: |

@@ -60,6 +64,9 @@ jobs:

6064 cabal test all

6165

6266 - name: Run doctests

67+ # doctests are broken on GHC 9 due to compiler bug:

68+ # https://gitlab.haskell.org/ghc/ghc/-/issues/19460

69+ continue-on-error: ${{ matrix.ghc == '9.0.1' }}

6370 run: |

6471 # Necessary for doctest to be found in $PATH

6572 export PATH="$HOME/.cabal/bin:$PATH"

cabal.project+8−8

@@ -3,8 +3,7 @@ packages:

33 servant-client/

44 servant-client-core/

55 servant-http-streams/

6−-- Tests failing with Cabal (TODO: investigate)

7−-- servant-docs/

6+ servant-docs/

87 servant-foreign/

98 servant-server/

109 doc/tutorial/

@@ -26,7 +25,8 @@ packages:

2625 doc/cookbook/custom-errors

2726 doc/cookbook/basic-streaming

2827 doc/cookbook/db-postgres-pool

29− doc/cookbook/db-sqlite-simple

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

29+ -- ^ BROKEN blaze-textual

3030 doc/cookbook/file-upload

3131 doc/cookbook/generic

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

@@ -36,7 +36,8 @@ packages:

3636 -- doc/cookbook/sentry

3737 -- Commented out because servant-quickcheck currently doesn't build.

3838 -- doc/cookbook/testing

39− doc/cookbook/uverb

39+ --doc/cookbook/uverb

40+ -- ^ BROKEN servant-swagger -> optics-th

4041 doc/cookbook/structuring-apis

4142 doc/cookbook/using-custom-monad

4243 doc/cookbook/using-free-client

@@ -64,8 +65,7 @@ write-ghc-environment-files: always

6465allow-newer: servant-pagination-2.2.2:servant

6566allow-newer: servant-pagination-2.2.2:servant-server

6667

67−-- https://github.com/haskell-servant/servant-multipart/pull/41

68−allow-newer: servant-multipart:servant

69−allow-newer: servant-multipart:servant-server

70−allow-newer: servant-multipart:servant-client-core

7168allow-newer: servant-js:servant

69+

70+-- ghc 9

71+allow-newer: tdigest:base

doc/tutorial/tutorial.cabal+2−2

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

6868 , cookie >= 0.4.3 && < 0.5

6969 , js-jquery >= 3.3.1 && < 3.4

7070 , lucid >= 2.9.11 && < 2.10

71− , random >= 1.1 && < 1.2

71+ , random >= 1.1 && < 1.3

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

73− , time >= 1.6.0.1 && < 1.10

73+ , time >= 1.6.0.1 && < 1.13

7474

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

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

servant-client-core/servant-client-core.cabal+3−3

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

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

1717copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

1818build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

19+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2020 , GHCJS == 8.4

2121

2222extra-source-files:

@@ -50,13 +50,13 @@ library

5050 --

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

5252 build-depends:

53− base >= 4.9 && < 4.15

53+ base >= 4.9 && < 4.16

5454 , bytestring >= 0.10.8.1 && < 0.12

5555 , containers >= 0.5.7.1 && < 0.7

5656 , deepseq >= 1.4.2.0 && < 1.5

5757 , text >= 1.2.3.0 && < 1.3

5858 , transformers >= 0.5.2.0 && < 0.6

59− , template-haskell >= 2.11.1.0 && < 2.17

59+ , template-haskell >= 2.11.1.0 && < 2.18

6060

6161 if !impl(ghc >= 8.2)

6262 build-depends:

servant-client/servant-client.cabal+2−2

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

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

2121copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

2222build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2424

2525extra-source-files:

2626 CHANGELOG.md

@@ -40,7 +40,7 @@ library

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

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

4242 build-depends:

43− base >= 4.9 && < 4.15

43+ base >= 4.9 && < 4.16

4444 , bytestring >= 0.10.8.1 && < 0.12

4545 , containers >= 0.5.7.1 && < 0.7

4646 , deepseq >= 1.4.2.0 && < 1.5

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

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

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

2020copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

2121build-type: Simple

22−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

22+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2323

2424extra-source-files:

2525 CHANGELOG.md

@@ -41,7 +41,7 @@ library

4141 --

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

4343 build-depends:

44− base >= 4.9 && < 4.15

44+ base >= 4.9 && < 4.16

4545 , bytestring >= 0.10.8.1 && < 0.12

4646 , text >= 1.2.3.0 && < 1.3

4747

servant-foreign/servant-foreign.cabal+2−2

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

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

2222copyright: 2015-2019 Servant Contributors

2323build-type: Simple

24−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

24+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2525

2626extra-source-files:

2727 CHANGELOG.md

@@ -41,7 +41,7 @@ library

4141 --

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

4343 build-depends:

44− base >= 4.9 && < 4.15

44+ base >= 4.9 && < 4.16

4545 , text >= 1.2.3.0 && < 1.3

4646

4747 -- Servant dependencies

servant-http-streams/servant-http-streams.cabal+2−2

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

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

2121copyright: 2019 Servant Contributors

2222build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2424

2525extra-source-files:

2626 CHANGELOG.md

@@ -38,7 +38,7 @@ library

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

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

4040 build-depends:

41− base >= 4.9 && < 4.15

41+ base >= 4.9 && < 4.16

4242 , bytestring >= 0.10.8.1 && < 0.12

4343 , containers >= 0.5.7.1 && < 0.7

4444 , deepseq >= 1.4.2.0 && < 1.5

servant-pipes/example/Main.hs+1−1

@@ -64,7 +64,7 @@ server = fast :<|> slow :<|> readme :<|> proxy

6464

6565 readme = liftIO $ do

6666 putStrLn "/readme"

67− return $ P.withFile "README.md" ReadMode PBS.fromHandle

67+ return $ P.withFile "README.md" ReadMode $ \h -> PBS.fromHandle h

6868

6969 proxy c = liftIO $ do

7070 putStrLn "/proxy"

servant-server/servant-server.cabal+3−3

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

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

2424copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

2525build-type: Simple

26−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

26+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2727

2828extra-source-files:

2929 CHANGELOG.md

@@ -60,7 +60,7 @@ library

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

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

6262 build-depends:

63− base >= 4.9 && < 4.15

63+ base >= 4.9 && < 4.16

6464 , bytestring >= 0.10.8.1 && < 0.12

6565 , containers >= 0.5.7.1 && < 0.7

6666 , mtl >= 2.2.2 && < 2.3

@@ -72,7 +72,7 @@ library

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

7373 build-depends:

7474 servant >= 0.18.2 && < 0.18.3

75− , http-api-data >= 0.4.1 && < 0.4.3

75+ , http-api-data >= 0.4.1 && < 0.4.4

7676

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

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

servant/servant.cabal+4−4

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

11cabal-version: >=1.10

22name: servant

3−version: 0.18.2

3+version: 0.18.2.1

55synopsis: A family of combinators for defining webservices APIs

66category: Servant, Web

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

2020copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

2121build-type: Simple

2222

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

2424 , GHCJS == 8.4

2525

2626extra-source-files:

@@ -78,7 +78,7 @@ library

7878 --

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

8080 build-depends:

81− base >= 4.9 && < 4.15

81+ base >= 4.9 && < 4.16

8282 , bytestring >= 0.10.8.1 && < 0.12

8383 , mtl >= 2.2.2 && < 2.3

8484 , sop-core >= 0.4.0.0 && < 0.6

@@ -89,7 +89,7 @@ library

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

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

9191 build-depends:

92− http-api-data >= 0.4.1 && < 0.4.3

92+ http-api-data >= 0.4.1 && < 0.4.4

9393 , singleton-bool >= 0.1.4 && < 0.1.7

9494

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

servant/src/Servant/API/UVerb/Union.hs+1−1

@@ -144,4 +144,4 @@ _testNubbed :: ( ( Nubbed '[Bool, Int, Int] ~ 'False

144144 , Nubbed '[Int, Bool] ~ 'True

145145 )

146146 => a) -> a

147−_testNubbed = id

147+_testNubbed a = a

servant/test/Servant/API/StreamSpec.hs+1−1

@@ -90,7 +90,7 @@ runRenderFrames :: (SourceT Identity a -> SourceT Identity LBS.ByteString) -> [a

9090runRenderFrames f = fmap mconcat . runExcept . runSourceT . f . source

9191

9292runUnrenderFrames :: (SourceT Identity b -> SourceT Identity a) -> [b] -> [Either String a]

93−runUnrenderFrames f = go . Effect . flip unSourceT return . f . source where

93+runUnrenderFrames f = go . Effect . (\x -> unSourceT x return) . f . source where

9494 go :: StepT Identity a -> [Either String a]

9595 go Stop = []

9696 go (Error err) = [Left err]