-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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
[haskell-updates] ghc: Backport compact unwind support #166571
[haskell-updates] ghc: Backport compact unwind support #166571
Conversation
pkgs/development/haskell-modules/patches/inline-c-cpp-fcompact-unwind.patch
Outdated
Show resolved
Hide resolved
75ccbd1
to
8b78429
Compare
8b78429
to
b9fa562
Compare
b9fa562
to
35f137e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise LGTM.
@@ -182,6 +183,17 @@ stdenv.mkDerivation (rec { | |||
|
|||
outputs = [ "out" "doc" ]; | |||
|
|||
patches = [ | |||
# Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. | |||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left a comment on the ghc MR w.r.t. documentation, given that it's a full rebuild to update it, can you take a look at that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've addressed that comment in an extra upstream commit, which is not part of the fetchpatch
below, so no rebuild is required.
This technically leaves the feature undocumented in our build, but I don't expect any significant number of people to use the built documentation in the store, let alone a user who needs to use the feature.
@roberth Did you check that |
@sternenseemann I actually assumed that it'd be new enough or that it'd be okay because it'd be updated somewhat frequently. That appears to have been a little presumptuous. I've tried to build an updated ghcHEAD, but it fails to build
I've made a start https://github.com/NixOS/nixpkgs/compare/ghcHEAD-update?expand=1 but it's not something I can actually carry out now, so I don't think a PR should have my name on it :) |
Okay, so this is going to be a side quest where I have to make a new |
Motivation
Allow to fix C++ exception handling in GHC-linked programs.
Make sure inline-c-cpp actually works using its test suite
Solve a problem with hercules-ci-agent on darwin (tbd in upcoming release)
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes