From 2ea6664124a7701035964f1477208aa9658256cd Mon Sep 17 00:00:00 2001 From: akhesaCaro Date: Tue, 7 Sep 2021 14:21:13 +0200 Subject: [PATCH 1/3] GHC9 mention in Nix README. --- nix/README.md | 1 + nix/shell.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nix/README.md b/nix/README.md index 7514a6ad..f865a383 100644 --- 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 index ebe07722..715004f6 100644 --- 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" From 61d097db44c083b15df5907fd91612ef4987b0dc Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 18:07:03 +0200 Subject: [PATCH 2/3] uncomment uverb coobook and include it from building against GHC >= 9 --- cabal.project | 3 +-- doc/cookbook/uverb/uverb.cabal | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 8b35bf64..da6772b6 100644 --- a/cabal.project +++ b/cabal.project @@ -36,8 +36,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 index a835a8dc..15f921bb 100644 --- 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 From 9be55b3ba3c25e5223ed41c5d0d64ce970d4493f Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 18:13:24 +0200 Subject: [PATCH 3/3] uncomment db-sqlite-simple cookbook to add it to the building plan --- cabal.project | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index da6772b6..3e57f34d 100644 --- 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