From 6bdf9a7f6db9f247bd3594324b72fa556df39d6c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 2 Jan 2018 23:10:25 -0500
Subject: [PATCH 1/3] ghcWithPackages: Don't bother with ignoreCollisions cause
 we don't use buildEnv

SymlinkJoin doesn't know or care about this.
---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 6b3d6dfd2b0..7d192dc5d7d 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,5 +1,5 @@
 { lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
-, ignoreCollisions ? false, withLLVM ? false
+, withLLVM ? false
 , postBuild ? ""
 , haskellPackages
 , ghcLibdir ? null # only used by ghcjs, when resolving plugins
@@ -58,7 +58,6 @@ symlinkJoin {
   name = ghc.name + "-with-packages";
   paths = paths ++ [ghc];
   extraOutputsToInstall = [ "out" "doc" ];
-  inherit ignoreCollisions;
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 

From dea9fceb0b05aae8729a32a947d38cfa49caac89 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 2 Jan 2018 22:14:50 -0500
Subject: [PATCH 2/3] ghcWithPackages: Get rid of unused passthrough

If you want the whole packages set...don't use ghcWithPackages.
---
 pkgs/development/haskell-modules/make-package-set.nix      | 1 -
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 968773ded98..6d11048cb6d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -102,7 +102,6 @@ let
 
   withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix {
     inherit (self) llvmPackages;
-    haskellPackages = self;
     inherit packages;
   };
 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 7d192dc5d7d..09b6683e26a 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,7 +1,6 @@
 { lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
 , withLLVM ? false
 , postBuild ? ""
-, haskellPackages
 , ghcLibdir ? null # only used by ghcjs, when resolving plugins
 }:
 
@@ -131,6 +130,5 @@ symlinkJoin {
   passthru = {
     preferLocalBuild = true;
     inherit (ghc) version meta;
-    inherit haskellPackages;
   };
 }

From ec2f121bed216c089a066a1fe076d74256b55a49 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 2 Jan 2018 23:19:22 -0500
Subject: [PATCH 3/3] ghcWithPackages: Fix comment URL

---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 09b6683e26a..3e8fad712bf 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -44,7 +44,7 @@ let
   paths         = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
   hasLibraries  = lib.any (x: x.isHaskellLibrary) paths;
   # CLang is needed on Darwin for -fllvm to work:
-  # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html
+  # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
   llvm          = lib.makeBinPath
                   ([ llvmPackages.llvm ]
                    ++ lib.optional targetPlatform.isDarwin llvmPackages.clang);