From ce35c1b37ce268aa67b9d20c7c03e4d41f417473 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 1 Feb 2026 04:58:03 +0000 Subject: [PATCH] haskell.compiler.ghcHEAD: 9.15.20251225 -> 9.15.20260218 --- pkgs/development/compilers/ghc/common-hadrian.nix | 6 ++++-- pkgs/development/compilers/ghc/head.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 33f95c9c37eb..88d0f9882ba4 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -320,8 +320,10 @@ ./ghc-define-undefined-elf-st-visibility.patch ] - # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810 - ++ [ ./ghc-9.6-or-later-docs-sphinx-9.patch ] + ++ lib.optionals (lib.versionOlder version "9.15.20260127") [ + # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810 + ./ghc-9.6-or-later-docs-sphinx-9.patch + ] ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; }); diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e343cd33cef8..238c271ec91e 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.20251225"; - rev = "a3afae0c85fa57479378a5df5bbde2e3a8da8a06"; - sha256 = "sha256-inZFFKnCb8C7RTlKP2bnHOLfc1GveGi6Wy0uAaLv1Kk="; + version = "9.15.20260218"; + rev = "68bd08055594b8cbf6148a72d108786deb6c12a1"; + sha256 = "sha256-SOTlIjtxC4QLG5phTOEYPp1mS59jhL05bGAzopdLAJg="; }