ghc-8.2.1: Disable package ABI shadowing check

In an attempt to work around haskell/cabal#4728
NixOS · Oct 18, 2017 · 843f5ec · 843f5ec
1 parent 6a020b7
commit 843f5ec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -32,7 +32,8 @@ in stdenv.mkDerivation (rec {
 
  postPatch = "patchShebangs .";
 
- patches = [ ./ghc-gold-linker.patch ];
+ patches = [ ./ghc-gold-linker.patch
+ ./shadowed-deps.patch ];
 
  preConfigure = commonPreConfigure;
 

diff --git a/pkgs/development/compilers/ghc/shadowed-deps.patch b/pkgs/development/compilers/ghc/shadowed-deps.patch
@@ -0,0 +1,13 @@
+diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
+index 949cc0f231..408794e078 100644
+--- a/compiler/main/Packages.hs
++++ b/compiler/main/Packages.hs
+@@ -1339,7 +1339,7 @@ validateDatabase dflags pkg_map1 =
+ unusable = directly_ignored `Map.union` unusable_ignored
+ `Map.union` unusable_broken
+ `Map.union` unusable_cyclic
+- `Map.union` unusable_shadowed
++ -- `Map.union` unusable_shadowed
+
+ -- -----------------------------------------------------------------------------
+ -- When all the command-line options are in, we can process our package