Skip to content

tbb: tbb_2020 -> tbb_2022; tbb_2020: drop; onetbb: rename from tbb_2022#442977

Merged
emilazy merged 12 commits intoNixOS:stagingfrom
emilazy:push-zxvnryortpqx
Sep 16, 2025
Merged

tbb: tbb_2020 -> tbb_2022; tbb_2020: drop; onetbb: rename from tbb_2022#442977
emilazy merged 12 commits intoNixOS:stagingfrom
emilazy:push-zxvnryortpqx

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Sep 14, 2025

This version is maintained, works with LLVM 21, and does not seem to result in any regressions to immediate reverse dependencies on aarch64-linux any more other than packages already fixed or dropped.

I successfully built:

  • bowtie2
  • brickstore
  • cloudcompare
  • curv
  • easyeffects
  • elmerfem
  • embree
  • envision
  • f3d
  • ikos
  • ispc
  • meshlab
  • meshlab-unstable
  • mirtk
  • opencv4
  • openimagedenoise
  • openpgl
  • openturns
  • openvdb
  • pagmo2
  • potreeconverter
  • python313Packages.cgal
  • python313Packages.gudhi
  • python313Packages.openusd
  • python313Packages.pymeshlab
  • sysdig
  • tracy
  • viskores
  • vcmi
  • vtk

cc @pbsds @Hodapp87 for python313Packages.embreex and embree2 drops. There is a WIP pull request to update the former to Embree 4, but it seems stalled.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: games Gaming on NixOS labels Sep 14, 2025
@emilazy
Copy link
Member Author

emilazy commented Sep 14, 2025

cc @silvanshade @thoughtpolice @hesiod again

@pbsds
Copy link
Member

pbsds commented Sep 14, 2025

ACK on embree2 and embreex. It's sad to see it go considering my PhD data procesing pipeline is greatly accelerated by it, but that thing is stuck on python310 anyway. Dropping them should not affect the affordance of trimesh, only speed. LGTM

@emilazy
Copy link
Member Author

emilazy commented Sep 15, 2025

Good luck with your PhD! For what it’s worth, Embree 2 can be built with an internal tasking library; I don’t know how performance would compare or if any functionality would suffer, but that would presumably at least cut the dependency on tbb_2020. So if you want to keep carrying python3Packages.embreex then that may be an option; my instinct is just to drop old versions of things when they don’t seem load‐bearing and are downstream of another old version. I’ll leave the drop in here for now, but I’m happy to try a build with that set if it’d avoid delaying your PhD 😅

Rebased for conflicts, also.

@emilazy emilazy changed the base branch from master to staging September 15, 2025 16:07
@nixpkgs-ci nixpkgs-ci bot closed this Sep 15, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Sep 15, 2025
github-actions[bot]

This comment was marked as resolved.

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 15, 2025
This version is maintained, works with LLVM 21, and does not seem
to result in any regressions to immediate reverse dependencies on
`aarch64-linux` any more other than packages already fixed or dropped.
This is the upstream name and there doesn’t seem to be a strong
reason to keep around multiple versions now.
@github-actions github-actions bot dismissed their stale review September 15, 2025 16:30

All good now, thank you!

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 15, 2025
@pbsds
Copy link
Member

pbsds commented Sep 15, 2025

Good luck with your PhD! For what it’s worth, Embree 2 can be [...]

Hey that's pretty neat! However locking it to some old version if nixpkgs is fine for now. I'm doing the final experiments and writeup anyway. :)

@silvanshade silvanshade self-assigned this Sep 15, 2025
@silvanshade silvanshade self-requested a review September 15, 2025 22:02
@silvanshade silvanshade removed their assignment Sep 15, 2025
@silvanshade
Copy link
Member

@emilazy This looks good. Thanks for working on it. Would you consider maybe adding yourself as a maintainer?

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Sep 15, 2025
@emilazy
Copy link
Member Author

emilazy commented Sep 16, 2025

I probably wouldn’t be a great choice for it; this is ultimately drive‐by work to fix things up for the upcoming LLVM 21 bump, I don’t use the package directly :) I try to leave things simpler than when I started, though! If there’s any other particularly mysterious Darwin problems in future I can try to take a look…

@emilazy emilazy merged commit b467b71 into NixOS:staging Sep 16, 2025
30 of 33 checks passed
@emilazy emilazy deleted the push-zxvnryortpqx branch September 16, 2025 01:30
@qbisi
Copy link
Contributor

qbisi commented Sep 16, 2025

Glad to see only "one" tbb.

@emilazy emilazy mentioned this pull request Oct 11, 2025
13 tasks
wentasah added a commit to wentasah/rosdistro that referenced this pull request Oct 16, 2025
tbb_* was renamed to onetbb.
See NixOS/nixpkgs#442977.

tbb_2021_11, which was used in rosdep before has been replaced by
tbb_2021 earlier in NixOS/nixpkgs#402480.

Signed-off-by: Michal Sojka <[email protected]>
emersonknapp pushed a commit to ros/rosdistro that referenced this pull request Oct 17, 2025
tbb_* was renamed to onetbb.
See NixOS/nixpkgs#442977.

tbb_2021_11, which was used in rosdep before has been replaced by
tbb_2021 earlier in NixOS/nixpkgs#402480.

Signed-off-by: Michal Sojka <[email protected]>
wentasah added a commit to wentasah/nix-ros-overlay that referenced this pull request Oct 30, 2025
In recent nixpkgs, all tbb_* versions were renamed to a single onetbb
package: NixOS/nixpkgs#442977. This change was
reflected in rosdep (ros/rosdistro#48172) and
merged pretty quickly, definitely faster than we'll be able to switch
master branch to the new nixpkgs version (we need to solve all Qt5
problems before).

Therefore, we add this alias so that people using recent rosdep (e.g.
via ros2nix) with the master branch do not end up with broken
derivations.
wentasah added a commit to wentasah/nix-ros-overlay that referenced this pull request Oct 30, 2025
In recent nixpkgs, all tbb_* versions were renamed to a single onetbb
package: NixOS/nixpkgs#442977. This change was
reflected in rosdep (ros/rosdistro#48172) and
merged pretty quickly, definitely faster than we'll be able to switch
master branch to the new nixpkgs version (we need to solve all Qt5
problems before).

Therefore, we add this alias so that people using recent rosdep (e.g.
via ros2nix) with the master branch do not end up with broken
derivations.
wentasah added a commit to wentasah/nix-ros-overlay that referenced this pull request Oct 30, 2025
In recent nixpkgs, all tbb_* versions were renamed to a single onetbb
package: NixOS/nixpkgs#442977. This change was
reflected in rosdep (ros/rosdistro#48172) and
merged pretty quickly, definitely faster than we'll be able to switch
master branch to the new nixpkgs version (we need to solve all Qt5
problems before).

Therefore, we add this alias so that people using recent rosdep (e.g.
via ros2nix) with the master branch do not end up with broken
derivations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: games Gaming on NixOS 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants