haskell.compiler.*: fix stack overrun on 32bit (#402925)

This commit is contained in:
Vladimír Čunát
2025-04-30 09:02:19 +02:00
2 changed files with 20 additions and 0 deletions
@@ -279,6 +279,17 @@
includes = [ "configure.ac" ];
hash = "sha256-L3FQvcm9QB59BOiR2g5/HACAufIG08HiT53EIOjj64g=";
})
]
# Fixes stack overrun in rts which crashes an process whenever
# freeHaskellFunPtr is called with nixpkgs' hardening flags.
# https://gitlab.haskell.org/ghc/ghc/-/issues/25485
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
++ lib.optionals (lib.versionOlder version "9.13" && stdenv.hostPlatform.is32bit) [
(fetchpatch {
name = "ghc-rts-adjustor-fix-i386-stack-overrun.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/39bb6e583d64738db51441a556d499aa93a4fc4a.patch";
sha256 = "0w5fx413z924bi2irsy1l4xapxxhrq158b5gn6jzrbsmhvmpirs0";
})
];
stdenv = stdenvNoCC;
@@ -2302,6 +2302,15 @@ self: super:
# Overwrite the build cores
raaz = disableParallelBuilding super.raaz;
# Test suite uses SHA as a point of comparison which doesn't
# succeeds its own test suite on 32bit:
# https://github.com/GaloisInc/SHA/issues/16
cryptohash-sha256 =
if pkgs.stdenv.hostPlatform.is32bit then
dontCheck super.cryptohash-sha256
else
super.cryptohash-sha256;
# https://github.com/andreymulik/sdp/issues/3
sdp = disableLibraryProfiling super.sdp;
sdp-binary = disableLibraryProfiling super.sdp-binary;