diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2ea294a8b129..e343cd33cef8 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.15.20250811"; - rev = "c8d76a2994b8620c54adc2069f4728135d6b5059"; - sha256 = "001rf9z5a1v2xpm9qjzz2p966m5bxmqcnykq0xgb3qf40vi9rnh4"; + version = "9.15.20251225"; + rev = "a3afae0c85fa57479378a5df5bbde2e3a8da8a06"; + sha256 = "sha256-inZFFKnCb8C7RTlKP2bnHOLfc1GveGi6Wy0uAaLv1Kk="; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix index 2a09d3f258c0..625165fd46a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix @@ -45,6 +45,8 @@ self: super: { stm = null; system-cxx-std-lib = null; template-haskell = null; + template-haskell-lift = null; + template-haskell-quasiquoter = null; terminfo = null; text = null; time = null; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bb2248b269bd..f715d27360e3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -190,15 +190,8 @@ in ghc914 = compiler.ghc9141; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - if - stdenv.buildPlatform.isPower64 - && stdenv.buildPlatform.isBigEndian - && pkgs.stdenv.hostPlatform.isAbiElfv1 - then - # No bindist, using older source-built GHC - bb.packages.ghc910 - else - bb.packages.ghc984Binary; + # No suitable bindist packaged yet + bb.packages.ghc910; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; inherit buildTargetLlvmPackages llvmPackages;