diff options
| author | Peter Simons <simons@cryp.to> | 2020-04-24 21:21:39 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-24 22:00:40 +0200 |
| commit | e567a3b6222c478d30a4666be6f8f8cefccb3ae2 (patch) | |
| tree | f6023fb6294b1eed63094734b058caf6843aee18 /pkgs/development/haskell-modules | |
| parent | a1463efcdef66b95cf95827d417515abc59c3d3f (diff) | |
| download | nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar.gz nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar.bz2 nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar.lz nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar.xz nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.tar.zst nixlib-e567a3b6222c478d30a4666be6f8f8cefccb3ae2.zip | |
haskell-haddock: fix build with for the latest compiler ghc-8.10.1
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 |
2 files changed, 4 insertions, 0 deletions
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; |