cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ghc8107-ghc923: patch haddock to generate correct source links

Browse source 
Previously links to external modules were jacked because haddock was
doing them wrong. I fixed this upstream in early May 2022 but it's not
out yet.
This commit is contained in:
Jade Lovelace 2022-06-16 15:27:37 -07:00
parent 2a95e0e86c
commit 2cf08210fd
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/compilers/ghc/8.10.7.nix
View file

@ -191,6 +191,14 @@ stdenv.mkDerivation (rec {
# when adding new GHC releases in nixpkgs. # when adding new GHC releases in nixpkgs.
./respect-ar-path.patch ./respect-ar-path.patch
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
extraPrefix = "utils/haddock/";
stripLen = 1;
})
# cabal passes incorrect --host= when cross-compiling # cabal passes incorrect --host= when cross-compiling
# https://github.com/haskell/cabal/issues/5887 # https://github.com/haskell/cabal/issues/5887
(fetchpatch { (fetchpatch {

8
pkgs/development/compilers/ghc/9.0.2.nix
View file

@ -184,6 +184,14 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
patches = [ patches = [
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
extraPrefix = "utils/haddock/";
stripLen = 1;
})
# Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
(fetchpatch { (fetchpatch {

10
pkgs/development/compilers/ghc/9.2.3.nix
View file

@ -185,6 +185,16 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
patches = [
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
extraPrefix = "utils/haddock/";
stripLen = 1;
})
];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";
# GHC needs the locale configured during the Haddock phase. # GHC needs the locale configured during the Haddock phase.