Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkgsStatic.haskell.packages.ghc98: disable failing haddockPhase #275609

Merged
merged 2 commits into from
Jan 1, 2024
Merged

pkgsStatic.haskell.packages.ghc98: disable failing haddockPhase #275609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b4558e
release-haskell.nix: bump pkgsStatic testing from ghc928 to ghc948
sternenseemann Dec 20, 2023
ce5cbc4
haskell.packages.{ghc96,ghc98}: disable haddock for cross
sternenseemann Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/compilers/ghc/common-hadrian.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,10 @@ stdenv.mkDerivation ({

# Expose hadrian used for bootstrapping, for debugging purposes
inherit hadrian;

# TODO(@sternenseemann): there's no stage0:exe:haddock target by default,
# so haddock isn't available for GHC cross-compilers. Can we fix that?
hasHaddock = stdenv.hostPlatform == stdenv.targetPlatform;
};

meta = {
Expand Down
18 changes: 14 additions & 4 deletions pkgs/top-level/release-haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ let

# Test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC.
# Use integer-simple to avoid GMP linking problems (LGPL)
# Use native-bignum to avoid GMP linking problems (LGPL)
pkgsStatic =
removePlatforms
[
Expand All @@ -437,8 +437,8 @@ let
;
};

haskell.packages.native-bignum.ghc928 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc928)
haskell.packages.native-bignum.ghc948 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc948)
hello
lens
random
Expand All @@ -448,6 +448,15 @@ let
xhtml # isn't bundled for cross
;
};

haskell.packages.native-bignum.ghc981 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc981)
hello
random
QuickCheck
terminfo # isn't bundled for cross
;
};
};

pkgsCross.ghcjs =
Expand Down Expand Up @@ -671,8 +680,9 @@ let
];
};
constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian
jobs.pkgsStatic.haskellPackages
jobs.pkgsStatic.haskell.packages.native-bignum.ghc928
jobs.pkgsStatic.haskell.packages.native-bignum.ghc981
];
};
}
Expand Down