Skip to content

Commit 56b38ec

Browse files
committed
Patch code in case we decide to run sphinx doc generation
1 parent 5d94a90 commit 56b38ec

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

overlays/bootstrap.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ in {
266266
# Fix the bad fixups: https://gitlab.haskell.org/ghc/ghc/-/commit/2adc050857a9c1b992040fbfd55fbe65b2851b19
267267
++ final.lib.optional (versionAtLeast "9.6" && versionLessThan "9.6.4" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/2adc050857a9c1b992040fbfd55fbe65b2851b19.patch
268268
++ final.lib.optional (versionAtLeast "8.10.7" && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64 && final.stdenv.targetPlatform.isMusl && final.stdenv.targetPlatform != final.stdenv.hostPlatform) ./patches/ghc/ghc-8.10-aarch64-musl-gettimeofday.patch
269+
270+
++ until "9.8" ./patches/ghc/docs-sphinx-7.patch
271+
++ fromUntil "9.8" "9.9" ./patches/ghc/docs-sphinx-7-ghc98.patch
269272
;
270273
in ({
271274
ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Fix build of docs after sphinx update.
2+
https://github.com/sphinx-doc/sphinx/pull/11381
3+
https://gitlab.haskell.org/ghc/ghc/-/issues/24129
4+
--- a/docs/users_guide/rtd-theme/layout.html
5+
+++ b/docs/users_guide/rtd-theme/layout.html
6+
@@ -28 +28 @@
7+
- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
8+
+ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Fix build of docs after sphinx update.
2+
https://github.com/sphinx-doc/sphinx/pull/11381
3+
https://gitlab.haskell.org/ghc/ghc/-/issues/24129
4+
--- a/docs/users_guide/rtd-theme/layout.html
5+
+++ b/docs/users_guide/rtd-theme/layout.html
6+
@@ -67 +67 @@
7+
- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
8+
+ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />

0 commit comments

Comments
 (0)