diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-07-07 18:50:02 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-07-07 18:50:02 +0200 |
commit | c869aa9ac9553c49ee7dff9ac7f8f510b1e8d5f7 (patch) | |
tree | 7ae901aaea40844309b1b5932092b74242207904 /pkgs/development/compilers/ghc | |
parent | 312ad6d25c2d55d52aae84445173f746ce8b8541 (diff) | |
parent | 98472c0467e56d143b2f97a669eddefb7cf99b19 (diff) |
Merge branch 'master' into staging-next
The purpose is to integrate the usual Haskell rebuild.
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/8.10.7.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.0.2.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.2.3.nix | 10 |
3 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index e2cd496640f1a..b7f027440de1d 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -194,6 +194,14 @@ stdenv.mkDerivation (rec { # when adding new GHC releases in nixpkgs. ./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 # https://github.com/haskell/cabal/issues/5887 (fetchpatch { diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index b998176af9749..0881b58ff7172 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -187,6 +187,14 @@ stdenv.mkDerivation (rec { 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; + }) + # 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 (fetchpatch { diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.3.nix index 7803a50525590..a7a80f4b9f145 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.3.nix @@ -188,6 +188,16 @@ stdenv.mkDerivation (rec { 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 ."; # GHC needs the locale configured during the Haddock phase. |