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

Multiple ghc-9.4.x build fixes #214145

Merged
merged 3 commits into from
Feb 4, 2023
Merged

Multiple ghc-9.4.x build fixes #214145

merged 3 commits into from
Feb 4, 2023

Conversation

peti
Copy link
Member

@peti peti commented Feb 2, 2023

All changes tested and verified on x86_64-linux.

@peti peti self-assigned this Feb 2, 2023
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 2, 2023
@sternenseemann sternenseemann changed the base branch from master to haskell-updates February 2, 2023 11:08
@sternenseemann
Copy link
Member

Rebased and switched target to haskell-updates, made commit messages conformant with CONTRIBUTING.md while I was at it.

fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0);

# The Haskell library has additional dependencies when compiled with ghc-9.4.x.
X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft;
Copy link
Member

Choose a reason for hiding this comment

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

This is due to haskell/cabal#8455. This override should not be required, as it is clearly a Cabal bug. I would prefer that we not add such workarounds yet, hoping that a patch for the problem will become available.

Another possibility could be using Cabal 3.6 for building Setup.hs.

Copy link
Member Author

Choose a reason for hiding this comment

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

I would like to use GHC 9.4.4 now. Hoping that a patch might emerge on the future doesn't really help me much with that goal.


# Package 'libpcre2-8', required by 'glib-2.0', not found.
# text >=1.0.0.0 && <1.3.
glib = addExtraLibrary pkgs.pcre2 (doJailbreak super.glib);
Copy link
Member

Choose a reason for hiding this comment

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

Same note about haskell/cabal#8455.

# Package 'libpcre2-8', required by 'glib-2.0', not found.
# text >=1.0.0.0 && <1.3.
glib = addExtraLibrary pkgs.pcre2 (doJailbreak super.glib);
cairo = addExtraLibraries [pkgs.pcre2 pkgs.xorg.libXdmcp] (doJailbreak super.cairo);
Copy link
Member

Choose a reason for hiding this comment

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

Same note about haskell/cabal#8455.

# In addition to the overrides required by glib and cairo, pango needs the
# pkg-config file for mount.pc, which in turn requires a whole lot of other
# pkg-config files.
pango = addExtraLibraries (with pkgs; [pcre2 xorg.libXdmcp util-linuxMinimal libselinux libsepol pcre fribidi libthai libdatrie]) (doJailbreak super.pango);
Copy link
Member

Choose a reason for hiding this comment

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

Same note about haskell/cabal#8455.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Feb 2, 2023
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 2, 2023
@peti
Copy link
Member Author

peti commented Feb 3, 2023

@sternenseemann , I am not sure what you would like me to do. Are you opposed to merging those fixes?

@sternenseemann
Copy link
Member

See #214446.

@peti
Copy link
Member Author

peti commented Feb 4, 2023

See #214446.

👍

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Feb 4, 2023
@peti peti merged commit 77e4641 into NixOS:haskell-updates Feb 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: haskell 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants