diff options
| author | Peter Simons <simons@cryp.to> | 2020-04-24 21:17:30 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-24 22:00:39 +0200 |
| commit | a1463efcdef66b95cf95827d417515abc59c3d3f (patch) | |
| tree | 2e8419ef91c39216d13b94a84193944af7e7ab19 | |
| parent | da45fd982f6ec352e2adbd183c59a58139f5f769 (diff) | |
| download | nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar.gz nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar.bz2 nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar.lz nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar.xz nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.tar.zst nixlib-a1463efcdef66b95cf95827d417515abc59c3d3f.zip | |
haskell-haddock: fix build with our default compiler ghc-8.8.3
Fixes https://github.com/NixOS/nixpkgs/issues/85728.
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e78767facb77..90d9ad9cd491 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1067,11 +1067,6 @@ self: super: { # https://github.com/haskell-hvr/hgettext/issues/14 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". haddock-library = doJailbreak (dontCheck super.haddock-library); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 56fdcede7cbc..bdd5a9007d71 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,6 +41,10 @@ self: super: { unix = 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. 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; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e4472e400c1c..d57c49554c42 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2379,7 +2379,8 @@ extra-packages: - 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 - 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 - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript |