Unverified Commit ac9122dd authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

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

This reverts commit ccc08ba4.
parent 0fcde6e3

pkgs/development/compilers/ghc/9.6.3-binary.nix

+0 −3
Original line number Diff line number Diff line
@@ -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

+0 −21
Original line number Diff line number Diff line
@@ -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;