cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #275609 from sternenseemann/ghc981-static

Browse source 
pkgsStatic.haskell.packages.ghc98: disable failing haddockPhase
This commit is contained in:
maralorn 2024-01-01 14:20:56 +01:00 committed by GitHub
commit f3963e1476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/ghc/common-hadrian.nix
View file

@ -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 = {

18
pkgs/top-level/release-haskell.nix
View file

@ -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
[
@ -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
@ -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 =
@ -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
];
};
}