Skip to content

gcc: simplify expression by applying workarounds more broadly#250498

Merged
Artturin merged 3 commits intostagingfrom
unknown repository
Sep 19, 2023
Merged

gcc: simplify expression by applying workarounds more broadly#250498
Artturin merged 3 commits intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 21, 2023

Description of changes

This commit simplifies our gcc expression by applying various workarounds unconditionally, rather than only to exactly the versions which applied them prior to the deduplication cleanup.

Unlike its predecessors #249707 and #250489 this commit does affect eval.

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.

@ghost ghost mentioned this pull request Aug 21, 2023
Merged
1 task
@ghost ghost added 8.has: clean-up This PR removes packages or removes other cruft 6.topic: hygiene Cleaning up and removing cruft labels Aug 21, 2023
@ghost ghost marked this pull request as ready for review August 21, 2023 09:18
@ghost ghost requested a review from matthewbauer as a code owner August 21, 2023 09:18
Adam Joseph added 3 commits August 23, 2023 21:47
gcc: simplify expression by applying workarounds more broadly
040cf42 
This commit simplifies our gcc expression by applying various
workarounds unconditionally, rather than only to exactly the
versions which applied them prior to the deduplication cleanup.

Unlike its predecessors #249707
and #250489 this commit *does*
affect eval.
gcc: remove backticks-used-as-quotes (error prone)
80198b8
gcc: unescapify backslash
af319af
@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Aug 24, 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 Aug 24, 2023
Artturin
Artturin approved these changes Sep 19, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@Artturin Artturin left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the only actual non avr changes here are in the echos because we only have 6+

@Artturin Artturin merged commit 2e705d0 into NixOS:staging Sep 19, 2023
@ghost ghost deleted the gcc/deduplicate/simplify2 branch October 22, 2023 09:42
@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

@veprbl veprbl Awaiting requested review from veprbl

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@vcunat vcunat Awaiting requested review from vcunat

Assignees

No one assigned

Labels

6.topic: hygiene Cleaning up and removing cruft 8.has: clean-up This PR removes packages or removes other cruft 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.

1 participant

@Artturin