gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "haskell.compiler.{ghc98*,ghcHEAD}: bootstrap using source built 9.6"

Browse Source 
This reverts commit ccc08ba453.
This commit is contained in:
Randy Eckenrode
2024-07-28 09:09:01 -04:00
parent 0fcde6e343
commit ac9122dd71
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/9.6.3-binary.nix
-3
View File
@@ -409,8 +409,5 @@ stdenv.mkDerivation rec {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
maintainers = lib.teams.haskell.members;
# packages involving hsc2hs (clock) produce libraries our
# ld can't link against
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/top-level/haskell-packages.nix
-21
View File
@@ -342,13 +342,6 @@ in {
packages.ghc963
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc963
else if stdenv.hostPlatform.isDarwin then
# it seems like the GHC 9.6.* bindists are built with a different
# toolchain than we are using (which I'm guessing from the fact
# that 9.6.4 bindists pass linker flags our ld doesn't support).
# With both 9.6.3 and 9.6.4 binary it is impossible to link against
# the clock package (probably a hsc2hs problem).
packages.ghc963
else
packages.ghc963Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -367,13 +360,6 @@ in {
packages.ghc963
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc963
else if stdenv.hostPlatform.isDarwin then
# it seems like the GHC 9.6.* bindists are built with a different
# toolchain than we are using (which I'm guessing from the fact
# that 9.6.4 bindists pass linker flags our ld doesn't support).
# With both 9.6.3 and 9.6.4 binary it is impossible to link against
# the clock package (probably a hsc2hs problem).
packages.ghc963
else
packages.ghc963Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -419,13 +405,6 @@ in {
packages.ghc963
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc963
else if stdenv.hostPlatform.isDarwin then
# it seems like the GHC 9.6.* bindists are built with a different
# toolchain than we are using (which I'm guessing from the fact
# that 9.6.4 bindists pass linker flags our ld doesn't support).
# With both 9.6.3 and 9.6.4 binary it is impossible to link against
# the clock package (probably a hsc2hs problem).
packages.ghc963
else
packages.ghc963Binary;
inherit (buildPackages.python3Packages) sphinx;