From 2cf0feb6897eecd8ca2a3a64f2c6e1dcd165a8b6 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Fri, 29 Jul 2022 14:27:54 +0300 Subject: [PATCH] Add missing `pipes` and `tasty-hunit` for the nix-shell So that now the tests can be ran successfully by: ``` cabal configure --enable-tests && cabal build && cabal test ``` --- .gitignore | 2 +- release.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e349535..f1a5079 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ examples/echo/echo-cpp/echo-server benchmarks.html result *~ -cabal.project.local +cabal.project.local* dist-newstyle/ tests/py-tmp tests/tmp diff --git a/release.nix b/release.nix index 571bdfd..b9c5d92 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # If you would like to test and build changes quickly using `cabal`, run: # # $ nix-shell -# [nix-shell]$ cabal configure --enable-tests && cabal test +# [nix-shell]$ cabal configure --enable-tests && cabal build && cabal test # # This will open up a Nix shell where all of your Haskell tools will work like # normal, except that all dependencies (including C libraries) are managed by @@ -121,6 +121,8 @@ let pkgs.grpc-haskell-no-tests # Include some additional packages in this custom ghc for # running tests in the nix-shell environment. + pkgs.pipes + pkgs.tasty-hunit pkgs.tasty-quickcheck pkgs.turtle ]); @@ -136,6 +138,7 @@ let buildDepends = (old.buildDepends or [ ]) ++ [ pkgsSelf.makeWrapper + # Give our nix-shell its own cabal so we don't pick up one # from the user's environment by accident. hsSelf.cabal-install