From ac9122dd71fe63ada6f60c46736703f2e2bc7eee Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 27 Jul 2024 17:28:46 -0400 Subject: [PATCH] Revert "haskell.compiler.{ghc98*,ghcHEAD}: bootstrap using source built 9.6" This reverts commit ccc08ba453b87d69a5d1be7cd86ea0fa908e55e9. --- .../compilers/ghc/9.6.3-binary.nix | 3 --- pkgs/top-level/haskell-packages.nix | 21 ------------------- 2 files changed, 24 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 7e043262f015..d67e9f47ac48 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -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; }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 24a8e979b020..a457559bc8ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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;