Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add patches to fix GHC 8.6.5 on MacOS Big Sur and up #810

Merged
merged 3 commits into from
Feb 15, 2023

Conversation

cidkidnix
Copy link
Contributor

Relevant PR from haskell gitlab https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3689

This allows us to properly load frameworks on Big Sur and up.

default.nix Outdated
haskell = super.haskell // {
compiler = super.haskell.compiler // super.lib.optionalAttrs (super.stdenv.isDarwin) {
ghc865 = super.haskell.compiler.ghc865.overrideAttrs (old: {
patches = (old.patches or []) ++ [ ./haskell-overlays/patches/ghc865/fix-big-sur.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we put all the patches in the same place? some are defined here in the overlays and others are up around like 41.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally I would like to have all compiler patches that we keep (in-repo) to be in a format like this
$GIT_REPO/haskell-overlays/patches/<ghcver>/<platform>/*.patch
or alternatively replace
$GIT_REPO/haskell-overlays/patches to just $GIT_REPO/patches
keeps away a ton of ugly directory tree layouts

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean the patch files themselves, I meant the list of patches being applied to our compilers.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

patches = [
# nixpkgs-21.05 ships with a version of autoreconf that is incompatible with ghc 8.6.5,
# Cf. https://gitlab.haskell.org/ghc/ghc/-/commit/ad2ef3a13f1eb000eab8e3d64592373b91a52806
./haskell-overlays/splices-load-save/ghc-8.6-autoreconf.patch
];

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New commit should make this align more with what we're currently doing

@mankyKitty mankyKitty merged commit ae41504 into develop Feb 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants