summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-08 13:58:24 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-08 13:59:50 +0200
commit37bdfd321c4fa7d657e0c27f3cb4432fa4abfb1f (patch)
treec039a6ca68e156689f7663a96e4fb638bb90989e
parentghc: 8.10.4 -> 8.10.5 (diff)
downloadnixpkgs-37bdfd321c4fa7d657e0c27f3cb4432fa4abfb1f.tar.gz
ghc: patch RTS to export allocateWrite againorigin/haskell-updates-ghc-8.10.5
This fixes https://gitlab.haskell.org/ghc/ghc/-/issues/19763 which caused doctest-based test suites to fail in haskellPackages, causing failures of central packages.
-rw-r--r--pkgs/development/compilers/ghc/8.10.5.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.5.nix b/pkgs/development/compilers/ghc/8.10.5.nix
index ba73e003d0ad..bcf43c72fdcc 100644
--- a/pkgs/development/compilers/ghc/8.10.5.nix
+++ b/pkgs/development/compilers/ghc/8.10.5.nix
@@ -115,6 +115,13 @@ stdenv.mkDerivation (rec {
# upstream patch. Don't forget to check backport status of the upstream patch
# when adding new GHC releases in nixpkgs.
./respect-ar-path.patch
+ # Make RTS export allocateWrite again which is used by doctests and
+ # haskell-language-server, remove at 8.10.6.
+ # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19763
+ (fetchpatch {
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/296f25fa5f0fce033b529547e0658076e26f4cda.patch";
+ sha256 = "1mm1j83v96iwzravrb0zp67hjsdsqj8fzlqn5ck84lpfh7f04fmd";
+ })
] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {