Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gcc: deduplicate version expressions #250489

Merged
21 commits merged into from Aug 21, 2023
Merged

gcc: deduplicate version expressions #250489

21 commits merged into from Aug 21, 2023

Conversation

ghost
Copy link

@ghost ghost commented Aug 21, 2023 •
edited by ghost
Loading

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
@ghost ghost marked this pull request as draft August 21, 2023 05:51
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
Adam Joseph added 16 commits August 20, 2023 22:59
gcc: if atLeast 13, use deduplicated version
c3bae70
gcc: if atLeast 12, use deduplicated version
dc3eb56
gcc: if atLeast 11, use deduplicated version
8a822d6
gcc: if atLeast 10, use deduplicated version
c72e136
gcc: if atLeast 9, use deduplicated version
01902c7
gcc: if atLeast 8, use deduplicated version
942d7ec
gcc: if atLeast 7, use deduplicated version
b3d07e8
gcc: if atLeast 6, use deduplicated version
b505fb4
gcc: if atLeast 4.9, use deduplicated version
8a4148a
gcc: if atLeast 4.8, use deduplicated version
da87387
gcc: move patches attribute into patches/ subdirectory
7367bb6
gcc: move version-map out of all-packages.nix, into pkgs/
0219875
gcc: update gccFun for deduplicated gcc expressions
57e5724
gcc: clean up version conditions
869b639
gcc: match weird whack-a-mole per-version hash algorithm
fa0fc88
gcc: resolve merge conflict from staging
39b20be
This was referenced Aug 21, 2023
Merged
Merged
@ghost
Copy link
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
9 of 11 checks passed
@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
our gcc-unwrapped expression is illegible #242336
Closed
AndersonTorres pushed a commit that referenced this pull request Sep 11, 2023
@AndersonTorres
gcc: patches: reorganize and simplify
d43e772 
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
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
This pull request was closed.
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

Assignees
No one assigned
Labels
6.topic: hygiene 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

our gcc-unwrapped expression is illegible
0 participants