summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-21 15:17:19 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2021-06-22 13:42:55 +0200
commitcd33c34578485df663fd9ed39ca5c080d8706824 (patch)
treec6b306a3d874d92af9a61d0c86cf8bdbafa93de5
parentf9d11b3f58776c555e3fdfadc67dc60c39e65e3d (diff)
downloadnixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar.gz
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar.bz2
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar.lz
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar.xz
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.tar.zst
nixpkgs-cd33c34578485df663fd9ed39ca5c080d8706824.zip
haskell.compiler.ghc884: patch for sphinx >= 4.0
With sphinx 4, interpreting the conf.py fails due to a decode
error: https://gitlab.haskell.org/ghc/ghc/-/issues/19962
The fix is an one line change which we have to backport from GHC
master.

9.2 and 8.10.6 will have a fix for this, GHC 9.0.1 and ghcHEAD
already have and GHC 8.10.4 has been patched in nixpkgs already.
-rw-r--r--pkgs/development/compilers/ghc/8.8.4.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index 002d83ef6be..544b96f5e4f 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -134,6 +134,9 @@ stdenv.mkDerivation (rec {
     # upstream patch. Don't forget to check backport status of the upstream patch
     # when adding new GHC releases in nixpkgs.
     ./respect-ar-path.patch
+    # Fix documentation configuration which causes a syntax error with sphinx 4.*
+    # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962
+    ./sphinx-4-configuration.patch
   ];
 
   postPatch = "patchShebangs .";