-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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 cabal-paths patch for ghc 9.2.x #184041
Add cabal-paths patch for ghc 9.2.x #184041
Conversation
|
Result of 2 packages built:
|
Feel free to add a conditional |
@sternenseemann Any recommendation for a cleaner method of doing this? {
# ...
regex-rure = doDistribute ((if isDarwin && isAarch64 then x: x else markUnbroken) super.regex-rure);
# ...
} Seems to work fine, just looks a little confusing imo |
There's an override section in |
This patch didn't seem to work correctly, trying to build |
Don't remember the ordering precisely (you can check |
I can't work out exactly what's going on, but it seems like ...
I can update the PR with this commit so someone can maybe take a look and see if I am missing something. Otherwise I could
edit: i realize i am somewhat assuming that the package will build properly on linux, but is that the case? Is gcc used for C2hs on linux? if not, maybe i could remove the override in configuration-9.2.x.nix to resolve this. |
5c9f360
to
750e57e
Compare
@sternenseemann sorry for the ping, i've pushed a version that i can get to locally report |
Ah, right I remember now. The problem is that |
Can you rebase on Porting that stuff to 9.4.* can be done in a separate step then. |
This patch should be applied for 9.0 ( |
haskellPackages is 9.2 now, 9.0 had and has a patch for this already which no longer applies for Cabal 3.8 shipped with GHC 9.2. |
Looks like the patch that got added to all builds for 9.2.x (https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch) updates some of the same files as this patch, so I have to hardcode it to address those changes. I would say this should be fine, except for the note that says
But I guess that could just be addressed with a revert of the appropriate commit? |
I'm also still seeing the |
097e631
to
12a98a8
Compare
alright, i think this should be ready for another pass of reviewing. i can kick off nixpkgs-review, but as per comments above, is there anything i can do to more thoroughly verify things are working as expected? i can try running |
This mass-subscribed a bunch of people, who won't get unsubscribed from retrieving notifications. Please open a new PR. |
Description of changes
I tweaked the
cabal-paths.patch
file included for GHC builds (see #140774) to work on the updated Cabal PathsModule code that is used in GHC 9.2.3+.Tested by building and running
haskell.packages.ghc923.ghcid.bin
andhaskell.packages.ghc923.ormolu
.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