Skip to content

gcc: revert "kludge to prevent mass-rebuild" from #238154#243194

Merged
Ericson2314 merged 1 commit intostagingfrom
unknown repository
Jul 14, 2023
Merged

gcc: revert "kludge to prevent mass-rebuild" from #238154#243194
Ericson2314 merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jul 13, 2023

Description of changes

This PR includes #238154 (which is merged to master but not yet in staging) and reverts the last commit from that PR, which was a kludge to avoid a mass-rebuild (which would have forced #238154 to go to staging)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

This reverts commit 8dce1f7383b064ae5adee7702a8eeed06346dd24.

Revert "gcc: kludge to prevent mass-rebuild"
c04c1a1 
This reverts commit 8dce1f7383b064ae5adee7702a8eeed06346dd24.
@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Jul 13, 2023
@ghost ghost mentioned this pull request Jul 13, 2023
Merged
@ghost ghost marked this pull request as ready for review July 13, 2023 03:15
@ghost ghost requested review from Ericson2314, alyssais and matthewbauer as code owners July 13, 2023 03:15
@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Jul 13, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 13, 2023
@Ericson2314
Copy link
Member

Ericson2314 commented Jul 13, 2023

Doesn't this contain too many commits/ do you need someone to merge master into staging for you?

@github-actions github-actions bot removed the 6.topic: lib The Nixpkgs function library label Jul 13, 2023
@ghost
Copy link
Author

ghost commented Jul 13, 2023

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.

@Artturin
Copy link
Member

Artturin commented Jul 13, 2023

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

@Ericson2314 Ericson2314 merged commit badbdfd into NixOS:staging Jul 14, 2023
@ghost ghost deleted the pr/gcc/crossStageStatic-undo-the-hack branch July 14, 2023 05:01
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@alyssais alyssais Awaiting requested review from alyssais

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@prusnak prusnak Awaiting requested review from prusnak

@veprbl veprbl Awaiting requested review from veprbl

@vcunat vcunat Awaiting requested review from vcunat

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@adevress adevress Awaiting requested review from adevress

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Ericson2314 @Artturin