diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-12-20 10:50:28 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-12-20 10:50:28 +0100 |
commit | 21acd3b7875379b642ae075b8c122f3c0bbe24cf (patch) | |
tree | 75827af6388761903172765c1efed9c496df95fa /pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | |
parent | aef2be6c6ca05905246ab505e1e4f635459917d6 (diff) |
haskell.packages.*.{terminfo,xhtml}: allow builds on Hydra for cross
We have some jobs that hit this case in release-haskell.nix, but they are not actually created, since we forgot to relax hydraPlatforms…
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index de1412f4c0eed..477fc72395b0b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -40,14 +40,14 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = 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_3_0_0; + xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_3_0_0; # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work Cabal-syntax = self.Cabal-syntax_3_6_0_0; |