about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-10-27 15:10:39 -0700
committerJohn Wiegley <johnw@newartisans.com>2016-10-27 15:10:39 -0700
commitc60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee (patch)
tree68f34ad3a0c1e158c90526a769b6b36c023eb2d0
parent4a70445fff10aeefddc9567eae14ffc44b983454 (diff)
downloadnixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar.gz
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar.bz2
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar.lz
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar.xz
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.tar.zst
nixlib-c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee.zip
haskellPackages.hakyll: Fix the Darwin build (broken tests)
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3b8a93f2108f..3864a190fc88 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -167,6 +167,13 @@ self: super: {
     then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
     else super.halive;
 
+  # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
+  hakyll = if pkgs.stdenv.isDarwin
+    then dontCheck (overrideCabal super.hakyll (drv: {
+      testToolDepends = [];
+    }))
+    else super.hakyll;
+
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
   hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;