summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-15 02:02:46 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-15 02:02:46 -0700
commit25e60feb725f1ce58590a097ffe088bbf14717e2 (patch)
tree1cccfe708e755ca59aaa18135d8c1bc516688298 /pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
parent333f145d7604f07e3b2164b459b46e075fea81f4 (diff)
parent369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff)
downloadnixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst
nixpkgs-25e60feb725f1ce58590a097ffe088bbf14717e2.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 92417e5e681..de0fdacb3f9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -265,4 +265,7 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
+  # Inexplicable haddock failure
+  # https://github.com/gregwebs/aeson-applicative/issues/2
+  aeson-applicative = dontHaddock super.aeson-applicative;
 }