b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.basement: fix build on i686 with GHC >= 9.4

Browse source 
Patches are conditional for now to prevent a big rebuild.
This commit is contained in:
sternenseemann 2023-08-14 20:10:25 +02:00
parent 4f88c9d750
commit 72ba1daaeb
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -271,6 +271,20 @@ self: super: {
ghc-datasize = disableLibraryProfiling super.ghc-datasize;
ghc-vis = disableLibraryProfiling super.ghc-vis;
# Fixes compilation for basement on i686 for GHC >= 9.4
# https://github.com/haskell-foundation/foundation/pull/573
# Patch would not work for GHC >= 9.2 where it breaks compilation on x86_64
# https://github.com/haskell-foundation/foundation/pull/573#issuecomment-1669468867
# TODO(@sternenseemann): make unconditional
basement = appendPatches (lib.optionals pkgs.stdenv.hostPlatform.is32bit [
(fetchpatch {
name = "basement-i686-ghc-9.4.patch";
url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch";
sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7";
stripLen = 1;
})
]) super.basement;
# Waiting for the commit being fetched as a patch to get a release.
espial = appendPatch (fetchpatch {
url = "https://github.com/jonschoning/espial/commit/70375db7e245207b3572779288eade3252c4d9e3.patch";