From d86edd5161c28f59291c23594de5e9002a1a03b6 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:22 -0400
Subject: [PATCH] Dont haddock ghcjs in either version

---
 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix | 6 ------
 pkgs/development/compilers/ghcjs-ng/common-overrides.nix  | 2 +-
 pkgs/top-level/haskell-packages.nix                       | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
deleted file mode 100644
index 72066ee1701..00000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ haskellLib }:
-
-let inherit (haskellLib) dontHaddock;
-in self: super: {
-  ghcjs = dontHaddock super.ghcjs;
-}
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 172a48a5a65..a88e2c48d03 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -3,6 +3,6 @@
 let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
 in self: super: {
   ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
-  ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install";
+  ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
   haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c00bce430c3..2e6bd5ebb85 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -93,7 +93,6 @@ in rec {
       inherit (bootPkgs) alex happy;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
-      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
       bootPkgs = packages.ghc842;