From 8ec92c50a5e3b2f3bcd01b581e5451d60b5ef6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 19 Sep 2021 13:08:51 +0000 Subject: [PATCH] ghc: Use 8.10.7 bindist for bootstrapping. Fixes musl+integer-simple See #130441. --- pkgs/development/compilers/ghc/8.10.7.nix | 4 ---- pkgs/development/compilers/ghc/8.8.4.nix | 4 ---- pkgs/development/compilers/ghc/9.0.1.nix | 4 ---- pkgs/development/compilers/ghc/9.2.1.nix | 5 +---- pkgs/top-level/haskell-packages.nix | 12 ++++++------ 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 2215a3d471e950..614caf74c69b01 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -347,10 +347,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 1b47adc39b2aa7..f60a307e976744 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -346,10 +346,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; }; dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 3db53cac2d459d..42edfeed9e8baa 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -309,10 +309,6 @@ stdenv.mkDerivation (rec { ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; - - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. - broken = enableIntegerSimple && hostPlatform.isMusl; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 10707e83e9ff03..061d4601b0a51d 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -313,12 +313,9 @@ stdenv.mkDerivation (rec { timeout = 24 * 3600; inherit (ghc.meta) license platforms; - # integer-simple builds are broken when GHC links against musl. - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. # Linker failure on macOS: # https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 - broken = (enableIntegerSimple && hostPlatform.isMusl) - || stdenv.hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 159e846fc3af5d..29f30071e58377 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -77,7 +77,7 @@ in { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then - packages.ghc8102BinaryMinimal + packages.ghc8107BinaryMinimal else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -91,7 +91,7 @@ in { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then - packages.ghc8102BinaryMinimal + packages.ghc8107BinaryMinimal else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -108,9 +108,9 @@ in { packages.ghc8107BinaryMinimal # aarch64 ghc8102Binary exceeds max output size on hydra else if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal + packages.ghc8107BinaryMinimal else - packages.ghc8102Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; @@ -118,9 +118,9 @@ in { ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { # aarch64 ghc8102Binary exceeds max output size on hydra bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal + packages.ghc8107BinaryMinimal else - packages.ghc8102Binary; + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and