From 289e33f852d3fe02018009814850ecc3f158b533 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 27 Dec 2014 23:10:07 -0500
Subject: [PATCH] ghcjs: don't use extension for haddock override

---
 pkgs/top-level/haskell-defaults.nix | 11 ++---------
 pkgs/top-level/haskell-packages.nix |  3 +++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 191ad7ab763..e1edd50ade9 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -245,15 +245,8 @@
              };
 
   packages_ghcjs =
-    let parent = packages_ghc784.override {
-          extension = self: super: {
-            haddock = super.haddock.override {
-              Cabal = null;
-            };
-          };
-        };
-    in packages {
-      ghc = parent.ghcjs // { inherit parent; };
+    packages {
+      ghc = let parent = packages_ghc784; in parent.ghcjs // { inherit parent; };
       cabalPackage = import ../build-support/cabal/ghcjs.nix;
       ghcWrapperPackage = import ../development/compilers/ghcjs/wrapper.nix;
       prefFun = self : super : super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b1ea0b08bc3..41deb882152 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -940,6 +940,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   ghcjs = callPackage ../development/tools/haskell/ghcjs {
     Cabal = self.Cabal_1_22_0_0;
     cabalInstall = self.cabalInstall_1_22_0_0;
+    haddock = self.haddock.override {
+      Cabal = null;
+    };
   };
 
   ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {};