diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-04-29 15:27:02 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-04-29 15:27:02 +0200 |
commit | 813f8b5efbc827bf39416120b8a651cc1a2df8c5 (patch) | |
tree | 4834b0c008578fea557c828a10edf3ae089cf5ff /pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | |
parent | c2fe259aa6d2254b25853f4cafdf1567e7329bba (diff) |
haskellPackages: xhtml is not bundled if haddock is disabled
The xhtml library is only built as part of the GHC build process if GHC is disabled. This means that no GHC cross compiler has xhtml bundled, since haddock can't be built if GHC is a cross compiler (see relevant notes in the GHC nix expressions). This means that all packages depending on xhtml would currently fail to build when cross-compiled, as haskellPackages would assume it'd be provided by GHC. This is fixed by this commit. pkgsStatic hits this case, so we test compilation of xhtml for these package sets which will remind us to update the attribute name whenever its version changes.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 5eaa1ae413d47..11c3677913ea4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,7 +42,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Needs Cabal 3.0.x. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); |