From e567a3b6222c478d30a4666be6f8f8cefccb3ae2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 21:21:39 +0200 Subject: haskell-haddock: fix build with for the latest compiler ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 2 files changed, 4 insertions(+) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90d9ad9cd491..d6edaa864709 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1069,6 +1069,7 @@ self: super: { # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". haddock-library = doJailbreak (dontCheck super.haddock-library); + haddock-library_1_9_0 = doJailbreak (dontCheck super.haddock-library_1_9_0); # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 4b5a73603356..96ab593cf848 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,6 +42,9 @@ self: super: { unix = null; xhtml = null; + # Deviate from Stackage LTS-15.x to fix the build. + haddock-library = self.haddock-library_1_9_0; + # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; -- cgit 1.4.1