haskell.compiler.ghc{948,963,967,984,9101,9102,9121,9122}: bump LLVM

Bump the LLVM version used by our GHC packages in preparation for
the LLVM drops. This breaks the LLVM backend; it will be fixed soon
by backporting patches, but that will require a mass rebuild.
This commit is contained in:
Emily
2025-09-14 19:03:24 +01:00
parent 10a29bad23
commit ac290135ea
4 changed files with 23 additions and 29 deletions
@@ -888,6 +888,8 @@ stdenv.mkDerivation (
timeout = 24 * 3600;
platforms = lib.platforms.all;
inherit (bootPkgs.ghc.meta) license;
# To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
broken = useLLVM;
};
dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm;
@@ -669,6 +669,8 @@ stdenv.mkDerivation (
timeout = 24 * 3600;
platforms = lib.platforms.all;
inherit (bootPkgs.ghc.meta) license;
# To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
broken = useLLVM;
};
}
@@ -182,7 +182,7 @@ else
+ postBuild;
preferLocalBuild = true;
passthru = {
inherit (ghc) version meta targetPrefix;
inherit (ghc) version targetPrefix;
hoogle = hoogleWithPackages';
@@ -203,4 +203,9 @@ else
Also note that withLLVM has been renamed to useLLVM for consistency with
the GHC Nix expressions.'';
};
pos = __curPos;
meta = ghc.meta // {
# To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
broken = useLLVM;
};
}
+13 -28
View File
@@ -48,6 +48,9 @@ let
# Use this rather than `rec { ... }` below for sake of overlays.
inherit (pkgs.haskell) compiler packages;
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;
llvmPackages = pkgs.llvmPackages_20;
in
{
lib = haskellLibUncomposable;
@@ -72,7 +75,7 @@ in
{
# Required to bootstrap 9.4.8.
ghc902Binary = callPackage ../development/compilers/ghc/9.0.2-binary.nix {
llvmPackages = pkgs.llvmPackages_20;
inherit llvmPackages;
};
ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };
@@ -91,9 +94,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# Support range >= 10 && < 14
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc94 = compiler.ghc948;
ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix {
@@ -103,9 +104,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {
bootPkgs = bb.packages.ghc924Binary;
@@ -114,9 +113,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc96 = compiler.ghc967;
ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {
@@ -130,9 +127,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc98 = compiler.ghc984;
ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {
@@ -151,9 +146,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2023-01-15: Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
bootPkgs =
@@ -171,9 +164,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2023-01-15: Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.llvmPackages_15;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
bootPkgs =
@@ -205,9 +196,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2024-12-21: Support range >= 13 && < 20
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;
llvmPackages = pkgs.llvmPackages_19;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
bootPkgs =
@@ -218,9 +207,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2024-12-21: Support range >= 13 && < 20
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;
llvmPackages = pkgs.llvmPackages_19;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc912 = compiler.ghc9122;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
@@ -230,9 +217,7 @@ in
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
# 2023-01-15: Support range >= 11 && < 16
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_18;
llvmPackages = pkgs.llvmPackages_18;
inherit buildTargetLlvmPackages llvmPackages;
};
# Starting from GHC 9, integer-{simple,gmp} is replaced by ghc-bignum