Merge pull request #1457 from akhesaCaro/nixshell_ghc9

Update to GHC 9 (sub tasks)
This commit is contained in:
Caroline GAUDREAU 2021-10-02 19:29:28 +02:00 committed by GitHub
commit 5115c41617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

View file

@ -25,8 +25,7 @@ packages:
doc/cookbook/custom-errors doc/cookbook/custom-errors
doc/cookbook/basic-streaming doc/cookbook/basic-streaming
doc/cookbook/db-postgres-pool doc/cookbook/db-postgres-pool
--doc/cookbook/db-sqlite-simple doc/cookbook/db-sqlite-simple
-- ^ BROKEN blaze-textual
doc/cookbook/file-upload doc/cookbook/file-upload
doc/cookbook/generic doc/cookbook/generic
doc/cookbook/hoist-server-with-context doc/cookbook/hoist-server-with-context
@ -36,8 +35,7 @@ packages:
-- doc/cookbook/sentry -- doc/cookbook/sentry
-- Commented out because servant-quickcheck currently doesn't build. -- Commented out because servant-quickcheck currently doesn't build.
-- doc/cookbook/testing -- doc/cookbook/testing
--doc/cookbook/uverb doc/cookbook/uverb
-- ^ BROKEN servant-swagger -> optics-th
doc/cookbook/structuring-apis doc/cookbook/structuring-apis
doc/cookbook/using-custom-monad doc/cookbook/using-custom-monad
doc/cookbook/using-free-client doc/cookbook/using-free-client

View file

@ -28,6 +28,8 @@ executable cookbook-uverb
, swagger2 , swagger2
, wai , wai
, warp , warp
if impl(ghc >= 9)
buildable: False
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit ghc-options: -Wall -pgmL markdown-unlit
build-tool-depends: markdown-unlit:markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit

View file

@ -26,6 +26,7 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD
- `ghc865Binary` - `ghc865Binary`
- `ghc884` - `ghc884`
- `ghc8104` - default - `ghc8104` - default
- `ghc901`
### Cabal users ### Cabal users

View file

@ -1,4 +1,5 @@
let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz"; let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz";
sha256 = "sha256:1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
}; in }; in
{ compiler ? "ghc8104" { compiler ? "ghc8104"