git.iko.soy/servant
on master help sign in
Merge pull request #1457 from akhesaCaro/nixshell_ghc9

Update to GHC 9 (sub tasks)

commit5115c416172521a83d4a2593171f6ee1af169bb7 authorCaroline GAUDREAU <caroline.gaudreau@gmail.com> dateSat 2 Oct 2021, 19:29 (5 years ago) parent0b706aa9be55b3
4 files changed+6−4
compare with master
unifiedsplit
cabal.project+2−4 doc/cookbook/uverb/uverb.cabal+2 nix/README.md+1 nix/shell.nix+1
cabal.project+2−4
@@ -25,8 +25,7 @@ packages:
2525 doc/cookbook/custom-errors
2626 doc/cookbook/basic-streaming
2727 doc/cookbook/db-postgres-pool
28− --doc/cookbook/db-sqlite-simple
29− -- ^ BROKEN blaze-textual
28+ doc/cookbook/db-sqlite-simple
3029 doc/cookbook/file-upload
3130 doc/cookbook/generic
3231 doc/cookbook/hoist-server-with-context
@@ -36,8 +35,7 @@ packages:
3635 -- doc/cookbook/sentry
3736 -- Commented out because servant-quickcheck currently doesn't build.
3837 -- doc/cookbook/testing
39− --doc/cookbook/uverb
40− -- ^ BROKEN servant-swagger -> optics-th
38+ doc/cookbook/uverb
4139 doc/cookbook/structuring-apis
4240 doc/cookbook/using-custom-monad
4341 doc/cookbook/using-free-client
doc/cookbook/uverb/uverb.cabal+2
@@ -28,6 +28,8 @@ executable cookbook-uverb
2828 , swagger2
2929 , wai
3030 , warp
31+ if impl(ghc >= 9)
32+ buildable: False
3133 default-language: Haskell2010
3234 ghc-options: -Wall -pgmL markdown-unlit
3335 build-tool-depends: markdown-unlit:markdown-unlit
nix/README.md+1
@@ -26,6 +26,7 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD
2626- `ghc865Binary`
2727- `ghc884`
2828- `ghc8104` - default
29+- `ghc901`
2930
3031### Cabal users
3132
nix/shell.nix+1
@@ -1,4 +1,5 @@
11let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz";
2+ sha256 = "sha256:1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
23}; in
34
45{ compiler ? "ghc8104"