diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 382b1f2d6413..31d03aad160c 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -888,6 +888,8 @@ stdenv.mkDerivation ( timeout = 24 * 3600; platforms = lib.platforms.all; inherit (bootPkgs.ghc.meta) license; + # To be fixed by . + broken = useLLVM; }; dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm; diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 9facbfc1f22d..b46da57cba04 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -669,6 +669,8 @@ stdenv.mkDerivation ( timeout = 24 * 3600; platforms = lib.platforms.all; inherit (bootPkgs.ghc.meta) license; + # To be fixed by . + broken = useLLVM; }; } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 20b9a0803d3e..aba7c109a6b3 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -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 . + broken = useLLVM; + }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aeb5cef6c9b5..6da3d9639348 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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