gcc: revert "kludge to prevent mass-rebuild" from #238154 #243194
Merged
Conversation
This file contains 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
This reverts commit 8dce1f7.
ghost
mentioned this pull request
ghost
marked this pull request as ready for review
ghost
requested review from
matthewbauer,
alyssais and
Ericson2314
as code owners
ofborg
bot
requested review from
prusnak,
veprbl,
vcunat,
Synthetica9,
SuperSandro2000 and
adevress
|
Doesn't this contain too many commits/ do you need someone to merge master into staging for you? |
I was waiting for the automated merge to happen last night and fell asleep :) Rebased now, just one commit. |
FYI the merge can be triggered manually by choosing the latest run from https://github.com/NixOS/nixpkgs/actions/workflows/periodic-merge-6h.yml and clicking "Re-run all jobs" in the top right |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This PR includes #238154 (which is merged to
masterbut not yet instaging) and reverts the last commit from that PR, which was a kludge to avoid a mass-rebuild (which would have forced #238154 to go tostaging)Things done
sandbox = trueset 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/)This reverts commit 8dce1f7.