From 2b2e1c60ebb8a6fc6073d48d17c60232b87f9ff9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 28 Mar 2026 22:59:14 +0100 Subject: [PATCH] haskell.compiler.ghcHEAD: stop applying upstreamed sphinx 9 patch --- pkgs/development/compilers/ghc/common-hadrian.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index d9635b7cfcd2..d5f8092cf374 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -321,7 +321,9 @@ ] # 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.20260129") [ + ./ghc-9.6-or-later-docs-sphinx-9.patch + ] # Fixes rts/Types.h missing from the install when targeting javascript # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line