Skip to content

[24.11] tbb_2022_0: init at 2022.0.0#391413

Merged
wolfgangwalther merged 1 commit intoNixOS:release-24.11from
silvanshade:tbb-backport-24.11
Mar 24, 2025
Merged

[24.11] tbb_2022_0: init at 2022.0.0#391413
wolfgangwalther merged 1 commit intoNixOS:release-24.11from
silvanshade:tbb-backport-24.11

Conversation

@silvanshade
Copy link
Member

@silvanshade silvanshade commented Mar 20, 2025

This PR is a backport of tbb_2022_0 to release 24.11 from #363643

The backport is needed for NixOS/nix#12676

@Ericson2314

@silvanshade silvanshade changed the title tbb_2022_0: init at 2022.0.0 [Backport release-24.11] tbb_2022_0: init at 2022.0.0 Mar 20, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 20, 2025
@wolfgangwalther
Copy link
Contributor

Please do the following when manually backporting changes:

  • mention in the PR description which other PR you are backporting
  • cherry-pick with -x, which will put the commit reference in the new commit message and allow the "check cherry-picks" job to work.

This is also documented: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

(cherry picked from commit f312872)
@silvanshade silvanshade changed the title [Backport release-24.11] tbb_2022_0: init at 2022.0.0 [24.11] tbb_2022_0: init at 2022.0.0 Mar 24, 2025
@silvanshade silvanshade self-assigned this Mar 24, 2025
@silvanshade
Copy link
Member Author

@wolfgangwalther Thanks, I've tried to make the changes suggested from the documentation.

I've also opted not to fix lints (formatting, style) that would result in additional modifications to the original commits. I didn't see anything in the documentation about that.

@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 391413


x86_64-linux

✅ 2 packages built:
  • tbb_2022_0
  • tbb_2022_0.dev

aarch64-linux

✅ 2 packages built:
  • tbb_2022_0
  • tbb_2022_0.dev

x86_64-darwin

✅ 2 packages built:
  • tbb_2022_0
  • tbb_2022_0.dev

aarch64-darwin

✅ 2 packages built:
  • tbb_2022_0
  • tbb_2022_0.dev

@wolfgangwalther wolfgangwalther merged commit 513b58a into NixOS:release-24.11 Mar 24, 2025
33 of 43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants