haskell.compiler.ghc{9{6,8},HEAD}: use patched ghcSrc across all involved derivations#304652
Merged
sternenseemann merged 2 commits intoNixOS:haskell-updatesfrom Apr 27, 2024
Merged
Conversation
github-actions
bot
added
the
6.topic: haskell
13 tasks
ofborg
bot
added
11.by: package-maintainer
maralorn
approved these changes
Apr 18, 2024
Member
maralorn
left a comment
maralorn
left a comment
There was a problem hiding this comment.
It does not feel very pretty, because we kinda side-step the normal patch mechanism.
But I guess it is more robust and flexible.
Besides that I trust your judgement on this.
wegank
added
12.approvals: 1
We'll want to (slowly) unify the source used by the different
derivations we use to build GHC. As a first step, use the same base
source for building GHC and all hadrian related packages. This is
achieved by wrapping the fetcher result in `srcOnly` to apply GHC
patches immediately.
To modify the patches (and source) used by GHC we now have a changed
overriding interface for >= 9.6:
```
oldGhc.override {
ghcSrc = oldGhc.src.overrideAttrs (oldAttrs: {
src = …;
patches = …;
});
}
```
This makes the hadrian expressions much simpler as we no longer need to thread through extra arguments for special workarounds. common-hadrian.nix decides in one place which patches we need and directly applies them to the source used to build everything.
sternenseemann
force-pushed
the
common-hadrian-shared-src
branch
from
aae935a to
f0f9bf4
Compare
Member
Author
|
I've removed the Going to merge now, so that it is batched with the set rebuild that we have to do anyways. |
ofborg
bot
added
10.rebuild-darwin: 0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
I think this is the way to untangle this mess. It allows for the use case that motivated #283364, but without making everything even more complicated (e.g. #283364 would have required threading the
patchesargument to two extra places now).Extra details in the commit messages.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.