summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-nix.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-06-25 17:00:32 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2018-07-02 15:52:47 -0400
commitfea9a71ff466c52f6dc6946c93b726d5e6b127a5 (patch)
treede7d060f1f938874645ab322caa00287618bc42c /pkgs/development/haskell-modules/configuration-nix.nix
parent160894db3528ef0cce9407c1d30d4156605c3452 (diff)
downloadnixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar.gz
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar.bz2
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar.lz
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar.xz
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.tar.zst
nixlib-fea9a71ff466c52f6dc6946c93b726d5e6b127a5.zip
haskell: add more test tool depend for hspec-discover
Needed for new ‘strictDeps = true;’ handling.

Including-

- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 54366046222d..769033e7df9e 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
-  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
+  mysql = dontCheck (addBuildTool (super.mysql.override { mysql = pkgs.mysql.connector-c; }) pkgs.mysql);
 
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
@@ -516,4 +516,15 @@ self: super: builtins.intersectAttrs super {
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
+
+  # cabal2nix generates a dependency on base-compat, which is the wrong version
+  base-compat-batteries = super.base-compat-batteries.override {
+    base-compat = super.base-compat_0_10_1;
+  };
+
+  # Custom setup needs pg_config
+  HDBC-postgresql = addBuildTool super.HDBC-postgresql pkgs.postgresql;
+
+  # Custom setup needs sdl-config
+  SDL = addBuildTool super.SDL pkgs.SDL;
 }