pyrox.dev / nixpkgs
lol
fork atom

ghc*: patch build of docs after sphinx update

The 8.x versions don't seem to need this (and the patch wouldn't apply).

Vladimír Čunát 176ccbcd cb64b504

+33
+1
pkgs/development/compilers/ghc/9.0.2.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.2.4.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.2.5.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.2.6.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.2.7.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.2.8.nix
··· 194 194 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 195 195 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 196 196 }) 197 + ./docs-sphinx-7.patch 197 198 # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 198 199 (fetchpatch { 199 200 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
+1
pkgs/development/compilers/ghc/9.4.2.nix
··· 205 205 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 206 206 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 207 207 }) 208 + ./docs-sphinx-7.patch 208 209 ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 209 210 # Prevent the paths module from emitting symbols that we don't use 210 211 # when building with separate outputs.
+1
pkgs/development/compilers/ghc/9.4.3.nix
··· 205 205 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 206 206 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 207 207 }) 208 + ./docs-sphinx-7.patch 208 209 ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 209 210 # Prevent the paths module from emitting symbols that we don't use 210 211 # when building with separate outputs.
+1
pkgs/development/compilers/ghc/9.4.4.nix
··· 205 205 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 206 206 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 207 207 }) 208 + ./docs-sphinx-7.patch 208 209 ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 209 210 # Prevent the paths module from emitting symbols that we don't use 210 211 # when building with separate outputs.
+1
pkgs/development/compilers/ghc/9.4.5.nix
··· 205 205 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; 206 206 sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; 207 207 }) 208 + ./docs-sphinx-7.patch 208 209 ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 209 210 # Prevent the paths module from emitting symbols that we don't use 210 211 # when building with separate outputs.
+1
pkgs/development/compilers/ghc/9.4.6.nix
··· 197 197 extraPrefix = "libraries/Cabal/"; 198 198 sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; 199 199 }) 200 + ./docs-sphinx-7.patch 200 201 201 202 # Work around a type not being defined when including Rts.h in bytestring's cbits 202 203 # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810.
+1
pkgs/development/compilers/ghc/9.4.7.nix
··· 197 197 extraPrefix = "libraries/Cabal/"; 198 198 sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; 199 199 }) 200 + ./docs-sphinx-7.patch 200 201 ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ 201 202 # Prevent the paths module from emitting symbols that we don't use 202 203 # when building with separate outputs.
+5
pkgs/development/compilers/ghc/common-hadrian.nix
··· 266 266 267 267 enableParallelBuilding = true; 268 268 269 + patches = [ 270 + (if lib.versionAtLeast version "9.8" 271 + then ./docs-sphinx-7-ghc98.patch 272 + else ./docs-sphinx-7.patch ) 273 + ]; 269 274 postPatch = '' 270 275 patchShebangs --build . 271 276 '';
+8
pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch
··· 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" />
+8
pkgs/development/compilers/ghc/docs-sphinx-7.patch
··· 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" />