From 6f2b53400d293d0e3ac91d5aa6dcff8f0a5f2d34 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Wed, 27 Aug 2014 11:18:22 -0400 Subject: [PATCH] Add a temporary workaround for https://github.com/NixOS/nixpkgs/issues/3540 --- pkgs/top-level/haskell-defaults.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e79f6d9e25e..fa71db6ae58 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -25,14 +25,24 @@ codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x mtl = self.mtl_2_1_2; + } // (if !pkgs.stdenv.isDarwin then {} else { # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/2689 - cabal = if !pkgs.stdenv.isDarwin then super.cabal else super.cabal.override { - extension = self : super : { + cabal = super.cabal.override { + extension = self: super: { noHaddock = true; hyperlinkSource = false; }; }; - }; + + # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/3540 + systemFileio = super.systemFileio.override { + cabal = super.cabal.override { + extension = self: super: { + doCheck = false; + }; + }; + }; + }); ghc763Prefs = self : super : ghc783Prefs self super // { aeson = self.aeson_0_7_0_4;