Skip to content

tbb_2021: 2021.11.0 -> 2021.13.0; shorten name; move to by-name#402508

Closed
ghost wants to merge 2 commits intomasterfrom
unknown repository
Closed

tbb_2021: 2021.11.0 -> 2021.13.0; shorten name; move to by-name#402508
ghost wants to merge 2 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Apr 28, 2025

Consolidated all into tbb_{2022,2021,2020} PR

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 28, 2025
@nix-owners nix-owners bot requested review from hesiod and thoughtpolice April 28, 2025 11:35
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 17, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 16, 2025
@nix-owners nix-owners bot requested a review from silvanshade June 16, 2025 10:09
Copy link
Member

Choose a reason for hiding this comment

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

I would rather we add this an optional separate version, like the others, until we know that changing the default TBB won't cause breakage elsewhere. This seems to have been an issue a few times and I'm not sure of a good policy for how to decide when to change it globally. @Ericson2314 any thoughts about this?

Copy link
Member

Choose a reason for hiding this comment

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

Note that changing this version would also cause tbb_2021_11, which is a top-level alias that many other packages reference directly, to install this version tbb_2021_13:

https://github.com/Saterfield990/nixpkgs/blob/a7f8900f6f8ecbfc36d0543d945a64693a77b075/pkgs/top-level/all-packages.nix#L6105

So I think the best thing to do here is to keep the default.nix here as-is, then add 2021_13.nix under the tbb/ dir as a new version. Then add a new top-level alias for it in the same spot that I link to.

Can you make that change @Saterfield990?

Then either in a separate commit or PR we can update all existing packages that reference tbb_2021_11 to use tbb_2021_13, and if there is breakage found, at least those dependent packages can roll back to _11.

Copy link
Member

Choose a reason for hiding this comment

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

I believe these patches are still needed with this version (from last year) to fix the MinGW builds. You can try cross-compiling for MinGW to double check but pretty sure we want to keep these. They were added to the definition here recently, I think after this PR was originally submitted.

Copy link
Member

Choose a reason for hiding this comment

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

I just tried building this locally for MinGW and it seems to work without these patches. Also looking upstream it appears they have been applied. So I think it's safe to keep these removed after all.

Copy link
Author

Choose a reason for hiding this comment

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

It does not build with those patches since it complains they were applied already.

Copy link
Member

Choose a reason for hiding this comment

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

@silvanshade silvanshade requested a review from Ericson2314 June 16, 2025 16:09
@ghost ghost marked this pull request as draft June 17, 2025 13:26
@ghost ghost changed the title tbb: 2021.11.0 -> 2021.13.0 tbb_2021: 2021.11.0 -> 2021.13.0; shorten name; move to by-name Jun 18, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 18, 2025
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants