public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-haddock: fix build with our default compiler ghc-8.8.3

Browse Source 
Fixes https://github.com/NixOS/nixpkgs/issues/85728.
This commit is contained in:
Peter Simons 2020-04-24 21:17:30 +02:00
parent da45fd982f
commit a1463efcde
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1067,11 +1067,6 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14 # https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext; hgettext = doJailbreak super.hgettext;
# 2.23.0 supports GHC 8.x and up
haddock = super.haddock_2_22_0;
# haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6”
haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0));
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". # 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 = doJailbreak (dontCheck super.haddock-library);

4
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -41,6 +41,10 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# GHC 8.8.x can build haddock version 2.23.*
haddock = self.haddock_2_23_1;
haddock-api = self.haddock-api_2_23_1;
# These builds need Cabal 3.2.x. # These builds need Cabal 3.2.x.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });

3
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2379,7 +2379,8 @@ extra-packages:
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
- haddock == 2.22.* # required on GHC 8.0.x - haddock == 2.22.* # required on GHC 8.0.x
- haddock-api == 2.22.* # required on GHC 7.8.x - haddock == 2.23.* # required on GHC < 8.10.x
- haddock-api == 2.23.* # required on GHC < 8.10.x
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
- happy <1.19.6 # newer versions break Agda - happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript - happy == 1.19.9 # for purescript