pyrox.dev / nixpkgs
lol
fork atom

haskell.compiler.ghc*: Use 8.10.7 bindist for bootstrapping.

This fixes musl+integer-simple, see #130441.

Co-Authored-By: sternenseemann <sternenseemann@systemli.org>

authored by

Niklas Hambüchen
sternenseemann and committed by
sterni c57ad7cc 998e40ce

+19 -40
-4
pkgs/development/compilers/ghc/8.10.7.nix
··· 347 347 ] ++ lib.teams.haskell.members; 348 348 timeout = 24 * 3600; 349 349 inherit (ghc.meta) license platforms; 350 - 351 - # integer-simple builds are broken when GHC links against musl. 352 - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. 353 - broken = enableIntegerSimple && hostPlatform.isMusl; 354 350 }; 355 351 356 352 } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
-4
pkgs/development/compilers/ghc/8.8.4.nix
··· 346 346 ] ++ lib.teams.haskell.members; 347 347 timeout = 24 * 3600; 348 348 inherit (ghc.meta) license platforms; 349 - 350 - # integer-simple builds are broken when GHC links against musl. 351 - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. 352 - broken = enableIntegerSimple && hostPlatform.isMusl; 353 349 }; 354 350 355 351 dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
-4
pkgs/development/compilers/ghc/9.0.1.nix
··· 309 309 ] ++ lib.teams.haskell.members; 310 310 timeout = 24 * 3600; 311 311 inherit (ghc.meta) license platforms; 312 - 313 - # integer-simple builds are broken when GHC links against musl. 314 - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. 315 - broken = enableIntegerSimple && hostPlatform.isMusl; 316 312 }; 317 313 318 314 } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
-4
pkgs/development/compilers/ghc/9.2.1.nix
··· 322 322 ] ++ lib.teams.haskell.members; 323 323 timeout = 24 * 3600; 324 324 inherit (ghc.meta) license platforms; 325 - 326 - # integer-simple builds are broken when GHC links against musl. 327 - # See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743. 328 - broken = enableIntegerSimple && hostPlatform.isMusl; 329 325 }; 330 326 331 327 } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+18 -20
pkgs/top-level/haskell-packages.nix
··· 71 71 }; 72 72 73 73 ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { 74 - # the oldest ghc with aarch64-darwin support is 8.10.5 75 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then 76 - packages.ghc8107BinaryMinimal 74 + bootPkgs = 77 75 # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar 76 + # the oldest ghc with aarch64-darwin support is 8.10.5 78 77 # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them 79 - else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then 80 - packages.ghc8102BinaryMinimal 78 + if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then 79 + packages.ghc8107BinaryMinimal 81 80 else 82 81 packages.ghc865Binary; 83 82 inherit (buildPackages.python3Packages) sphinx; ··· 85 84 llvmPackages = pkgs.llvmPackages_7; 86 85 }; 87 86 ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { 88 - # the oldest ghc with aarch64-darwin support is 8.10.5 89 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then 90 - packages.ghc8107BinaryMinimal 87 + bootPkgs = 91 88 # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar 89 + # the oldest ghc with aarch64-darwin support is 8.10.5 92 90 # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them 93 - else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then 94 - packages.ghc8102BinaryMinimal 91 + if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then 92 + packages.ghc8107BinaryMinimal 95 93 else 96 94 packages.ghc865Binary; 97 95 inherit (buildPackages.python3Packages) sphinx; ··· 103 101 llvmPackages = pkgs.llvmPackages_9; 104 102 }; 105 103 ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { 106 - # the oldest ghc with aarch64-darwin support is 8.10.5 107 - bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then 104 + bootPkgs = 105 + # aarch64 ghc8107Binary exceeds max output size on hydra 106 + # the oldest ghc with aarch64-darwin support is 8.10.5 107 + if stdenv.isAarch64 || stdenv.isAarch32 then 108 108 packages.ghc8107BinaryMinimal 109 - # aarch64 ghc8102Binary exceeds max output size on hydra 110 - else if stdenv.isAarch64 || stdenv.isAarch32 then 111 - packages.ghc8102BinaryMinimal 112 109 else 113 - packages.ghc8102Binary; 110 + packages.ghc8107Binary; 114 111 inherit (buildPackages.python3Packages) sphinx; 115 112 buildLlvmPackages = buildPackages.llvmPackages_10; 116 113 llvmPackages = pkgs.llvmPackages_10; 117 114 }; 118 115 ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { 119 - # aarch64 ghc8102Binary exceeds max output size on hydra 120 - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then 121 - packages.ghc8102BinaryMinimal 116 + bootPkgs = 117 + # aarch64 ghc8107Binary exceeds max output size on hydra 118 + if stdenv.isAarch64 || stdenv.isAarch32 then 119 + packages.ghc8107BinaryMinimal 122 120 else 123 - packages.ghc8102Binary; 121 + packages.ghc8107Binary; 124 122 inherit (buildPackages.python3Packages) sphinx; 125 123 # Need to use apple's patched xattr until 126 124 # https://github.com/xattr/xattr/issues/44 and
+1 -4
pkgs/top-level/release-haskell.nix
··· 249 249 # TODO: remove ghc865Binary altogether and use ghc8102Binary 250 250 ghc865Binary = {}; 251 251 252 - # remove integer-simple because it appears to be broken with 253 - # musl and non-static-linking. 254 - integer-simple = {}; 255 - 256 252 ghcjs = {}; 257 253 ghcjs810 = {}; 258 254 }; ··· 380 376 }; 381 377 constituents = accumulateDerivations [ 382 378 jobs.pkgsMusl.haskell.compiler.ghc8102Binary 379 + jobs.pkgsMusl.haskell.compiler.ghc8107Binary 383 380 jobs.pkgsMusl.haskell.compiler.ghc884 384 381 jobs.pkgsMusl.haskell.compiler.ghc8107 385 382 jobs.pkgsMusl.haskell.compiler.ghc901