summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-02-02 14:47:43 +0100
committerGitHub <noreply@github.com>2017-02-02 14:47:43 +0100
commit072ebacb019fcfdda8afecc88e15c733ce382d5a (patch)
treef8140db983eb211b4dcf594e0357dbaab8634566 /pkgs
parent16f8f0d31329b0f6335bfb34348c1b778765403e (diff)
parent344227bfb9dc77e18d1789336313959df8e3e9af (diff)
downloadnixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar.gz
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar.bz2
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar.lz
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar.xz
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.tar.zst
nixlib-072ebacb019fcfdda8afecc88e15c733ce382d5a.zip
Merge pull request #22369 from LumiGuide/haddock-api-ghc802-fix
haddock-api: fix build on GHC-8.0.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 37d3373103a4..4d74f4538594 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -622,6 +622,14 @@ self: super: {
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 
+  # https://github.com/haskell/haddock/issues/571
+  haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch {
+    url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch";
+    sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m";
+    stripLen = 2;
+    addPrefixes = true;
+  });
+
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;