From 2278f9ebe2cc2595f20fb756b7a499699c4fe9c1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 26 Feb 2023 16:39:42 +0100 Subject: haskell.compiler: fix GHCs' user guide build with sphinx >= 6.0 This requires backporting upstream's fix to all GHCs we are currently shipping, since only GHC 9.4.5 and 9.6.1 will receive a backport. GHC HEAD will be taken care of in #217168. https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9625 https://gitlab.haskell.org/ghc/ghc/-/issues/22690 --- pkgs/development/compilers/ghc/9.2.5.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/development/compilers/ghc/9.2.5.nix') diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index e7c75fcaccf94..80b2e099e3ae6 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # Fix docs build with sphinx >= 6.0 + # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 + (fetchpatch { + name = "ghc-docs-sphinx-6.0.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; + sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; + }) # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; -- cgit 1.4.1