diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-01-15 21:36:26 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-01-15 21:39:44 +0100 |
| commit | 358bae310f019e8ad2c7d49a63445e2e6d642d9f (patch) | |
| tree | 22a9b330185455c686955ff56e55f442d3ecdafd | |
| parent | 0d88794d585b8d269b6de9448226a437eadf7003 (diff) | |
| download | nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar.gz nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar.bz2 nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar.lz nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar.xz nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.tar.zst nixpkgs-358bae310f019e8ad2c7d49a63445e2e6d642d9f.zip | |
haskell.packages.ghcHEAD.xhtml: now available for cross compilers
Stage1 and Stage2 will unconditionally build xhtml with hadrian: https://gitlab.haskell.org/ghc/ghc/-/blob/496607fdb77baf12e2fe263104ba5d0d700eee3b/hadrian/src/Settings/Default.hs#L140 terminfo is still conditional on non-cross (and not windows host which doesn't matter that much, as we don't have native windows support atm).
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index a2546c3dc5f..b96526640bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -53,9 +53,7 @@ self: super: { 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_2_2_1; + xhtml = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; |