Merge pull request #1457 from akhesaCaro/nixshell_ghc9

Update to GHC 9 (sub tasks)
haskell-servant · Oct 2, 2021 · 5115c41 · 5115c41
2 parents 0b706aa + 9be55b3
commit 5115c41
Show file tree

Hide file tree

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

diff --git a/doc/cookbook/uverb/uverb.cabal b/doc/cookbook/uverb/uverb.cabal
@@ -28,6 +28,8 @@ executable cookbook-uverb
                      , swagger2
                      , wai
                      , warp
+  if impl(ghc >= 9)
+      buildable: False
   default-language: Haskell2010
   ghc-options:         -Wall -pgmL markdown-unlit
   build-tool-depends:  markdown-unlit:markdown-unlit
diff --git a/nix/README.md b/nix/README.md
@@ -26,6 +26,7 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD
 -   `ghc865Binary`
 -   `ghc884`
 -   `ghc8104` - default
+-   `ghc901`
 
 ### Cabal users
 

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