Skip to content

gcc: deduplicate version expressions#250489

Merged
21 commits merged intostagingfrom
unknown repository
Aug 21, 2023
Merged

gcc: deduplicate version expressions#250489
21 commits merged intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 21, 2023

Description of changes

Rebase to staging of:

See this comment. I am going to take advantage of the current short window where master and staging are in sync to merge this to both branches, since it:

  1. Is strictly cleanup (no change to drv-hashes after eval) and
  2. Merge-conflicts with anything that touches gcc

Waiting for ofborg to go green.

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 requested a review from matthewbauer as a code owner August 21, 2023 05:51
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment labels Aug 21, 2023
@ghost ghost marked this pull request as draft August 21, 2023 05:51
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment labels Aug 21, 2023
Adam Joseph added 4 commits August 20, 2023 22:52
@ghost ghost changed the title gcc: resolve merge conflict from staging gcc: deduplicate version expressions Aug 21, 2023
@ghost ghost marked this pull request as ready for review August 21, 2023 05:53
@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
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 21, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 21, 2023

The last merge of staging into master caused a really nasty merge conflict here.

Since this is strictly cleanup (no change after eval), in order to prevent that from happening again I am merging this to both master and staging. It's much easier to rebase other patches past this one than it is to rebase this one past other patches.

@ghost ghost merged commit ed70e8c into NixOS:staging Aug 21, 2023
@ghost ghost deleted the pr/gcc/deduplicate-staging branch August 21, 2023 09:17
@ghost ghost linked an issue Aug 21, 2023 that may be closed by this pull request
AndersonTorres pushed a commit that referenced this pull request Sep 11, 2023
This PR sorts the huge pile of patches and deduplicates it.  Unlike
its predecessors #249707 and
#250489 this commit *does*
affect eval.

Patches below are organized into three general categories:

1. Patches relevant to gcc>=12 on every platform
2. Patches relevant to gcc>=12 on specific platforms
3. Patches relevant only to gcc<12, sorted by the newest version to
   which they might be relevant
ConnorBaker pushed a commit to nixos-cuda/cuda-legacy that referenced this pull request Apr 14, 2025
This PR sorts the huge pile of patches and deduplicates it.  Unlike
its predecessors NixOS/nixpkgs#249707 and
NixOS/nixpkgs#250489 this commit *does*
affect eval.

Patches below are organized into three general categories:

1. Patches relevant to gcc>=12 on every platform
2. Patches relevant to gcc>=12 on specific platforms
3. Patches relevant only to gcc<12, sorted by the newest version to
   which they might be relevant
ConnorBaker pushed a commit to nixos-cuda/cuda-legacy that referenced this pull request Apr 14, 2025
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 NixOS/nixpkgs#249707
and NixOS/nixpkgs#250489 this commit *does*
affect eval.
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: hygiene Cleaning up and removing cruft 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

our gcc-unwrapped expression is illegible

0 participants