From b4428e49bddd6f5d5d1f93de89fa73ff492b15cd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 27 May 2025 15:23:18 +0200 Subject: [PATCH] haskell.compiler.ghc94: bootstrap from 9.0.2 bindist (cherry picked from commit da08e91e7761fdc453d8c9132bbead7634e40027) --- pkgs/top-level/haskell-packages.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4d0d1a6a98ff..3e9aec8c5b4a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -160,17 +160,12 @@ in bootPkgs = # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then bb.packages.ghc902 else - bb.packages.ghc8107Binary; + bb.packages.ghc902Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -184,17 +179,12 @@ in bootPkgs = # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then bb.packages.ghc902 else - bb.packages.ghc8107Binary; + bb.packages.ghc902Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and