aquamarine: drop upstreamed patch#336699
Merged
flokli merged 1 commit intoNixOS:stagingfrom Aug 23, 2024
Merged
Conversation
Without the change build fails on `staging` as:
> applying patch /nix/store/k9x1wxd1rs8jada4lwjll841n54hd46h-CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
> patching file CMakeLists.txt
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file CMakeLists.txt.rej
ofborg
bot
added
10.rebuild-darwin: 1-10
Member
|
I've always been against patching a package on staging that mainly gets updates on master. This can create additional hassle when master is merged to staging. For future changes like these and considering the backwards compatibility of the patch, I think further patches for staging should go to master. But let's merge this one. |
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.
Without the change build fails on
stagingas:Description of changes
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.