git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix building sphinx documentation with latest nixpkgs-unstable (#1154) (#1160)
d8f6361Kirill Kuznetsov
overlays/bootstrap.nix+1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -168,6 +168,7 @@ in {
168 ++ fromUntil "8.10.5" "8.10.6" ./patches/ghc/ghc-8.10.5-add-rts-exports.patch
168 ++ fromUntil "8.10.5" "8.10.6" ./patches/ghc/ghc-8.10.5-add-rts-exports.patch
169 ++ final.lib.optionals final.hostPlatform.isDarwin
169 ++ final.lib.optionals final.hostPlatform.isDarwin
170 (fromUntil "8.10.5" "8.10.6" ./patches/ghc/ghc-8.10.5-darwin-allocateExec.patch)
170 (fromUntil "8.10.5" "8.10.6" ./patches/ghc/ghc-8.10.5-darwin-allocateExec.patch)
171+ ++ until "8.10.6" ./patches/ghc/Sphinx_Unicode_Error.patch
171 ;
172 ;
172 in ({
173 in ({
173 ghc844 = final.callPackage ../compiler/ghc {
174 ghc844 = final.callPackage ../compiler/ghc {
overlays/patches/ghc/Sphinx_Unicode_Error.patchnew file+20
@@ -0,0 +1,20 @@
1+diff --git a/docs/users_guide/conf.py b/docs/users_guide/conf.py
2+index 0732c5ccd4..47db25b84a 100644
3+--- a/docs/users_guide/conf.py
4++++ b/docs/users_guide/conf.py
5+@@ -77,13 +77,13 @@ htmlhelp_basename = 'GHCUsersGuide'
6+ latex_elements = {
7+ 'inputenc': '',
8+ 'utf8extra': '',
9+- 'preamble': '''
10++ 'preamble': r'''
11+ \usepackage{fontspec}
12+ \usepackage{makeidx}
13+ \setsansfont{DejaVu Sans}
14+ \setromanfont{DejaVu Serif}
15+ \setmonofont{DejaVu Sans Mono}
16+-\setlength{\\tymin}{45pt}
17++\setlength{\tymin}{45pt}
18+ ''',
19+ }
20+