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

pkgs/applications/graphics/pymeshlab/default.nix

@@ -19,7 +19,7 @@
   boost,
   mpfr,
   xercesc,
-  tbb,
+  onetbb,
   embree,
   vcg,
   libigl,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     mpfr
     xercesc
-    tbb
+    onetbb
     embree
     vcg
     libigl

pkgs/applications/misc/prusa-slicer/default.nix

@@ -27,7 +27,7 @@
   opencascade-occt_7_6_1,
   openvdb,
   qhull,
-  tbb_2022,
+  onetbb,
   wxGTK32,
   xorg,
   libbgcode,
@@ -54,7 +54,6 @@ let
       hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
     };
   });
-  openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };
   wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;
   opencascade-override' =
     if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
@@ -122,9 +121,9 @@ stdenv.mkDerivation (finalAttrs: {
     nanosvg-fltk
     nlopt
     opencascade-override'
-    openvdb_tbb_2022
+    openvdb
     qhull
-    tbb_2022
+    onetbb
     wxGTK-override'
     xorg.libX11
     libbgcode

pkgs/build-support/appimage/default.nix

@@ -203,7 +203,7 @@ rec {
         glew110
         openssl
         libidn
-        tbb
+        onetbb
         wayland
         libgbm
         libxkbcommon

pkgs/by-name/ad/adaptivecpp/tests.nix

@@ -9,7 +9,7 @@
   # Not setting an explicit target makes it default to the generic target.
   targets ? null,
   enablePstlTests ? false,
-  tbb,
+  onetbb,
   cmake,
   boost,
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    tbb
+    onetbb
   ];
   buildInputs = [ boost ];
 

pkgs/by-name/au/autotier/package.nix

@@ -8,7 +8,7 @@
   boost,
   fuse3,
   lib45d,
-  tbb_2022,
+  onetbb,
   liburing,
   installShellFiles,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fuse3
     lib45d
-    tbb_2022
+    onetbb
     liburing
   ];
 

pkgs/by-name/ba/bambu-studio/package.nix

@@ -34,7 +34,7 @@
   opencv,
   pcre,
   systemd,
-  tbb_2022,
+  onetbb,
   webkitgtk_4_1,
   wxGTK31,
   xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     opencascade-occt_7_6
     openvdb
     pcre
-    tbb_2022
+    onetbb
     webkitgtk_4_1
     wxGTK'
     xorg.libX11

pkgs/by-name/ba/basalt-monado/package.nix

@@ -20,7 +20,7 @@
   opencv,
   pkg-config,
   stdenv,
-  tbb,
+  onetbb,
   xorg,
   cudaPackages,
   enableCuda ? config.cudaSupport,
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
     lz4
     magic-enum
     opencv.cxxdev
-    tbb
+    onetbb
     xorg.libX11
   ]
   ++ lib.optionals enableCuda [

pkgs/by-name/bl/blender/package.nix

@@ -74,7 +74,7 @@
   spaceNavSupport ? stdenv.hostPlatform.isLinux,
   sse2neon,
   stdenv,
-  tbb_2022,
+  onetbb,
   vulkan-headers,
   vulkan-loader,
   wayland,
@@ -112,8 +112,6 @@ let
     tag = "v8.0.0";
     hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY=";
   };
-
-  tbb = tbb_2022;
 in
 
 stdenv'.mkDerivation (finalAttrs: {
@@ -262,20 +260,20 @@ stdenv'.mkDerivation (finalAttrs: {
     openexr
     openimageio
     openjpeg
-    (openpgl.override { inherit tbb; })
+    openpgl
     (opensubdiv.override { inherit cudaSupport; })
-    (openvdb.override { inherit tbb; })
+    openvdb
     potrace
     pugixml
     python3
     python3Packages.materialx
-    tbb
+    onetbb
     zlib
     zstd
   ]
   ++ lib.optional embreeSupport embree
   ++ lib.optional hipSupport rocmPackages.clr
-  ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
+  ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
   ++ (
     if (!stdenv.hostPlatform.isDarwin) then
       [

pkgs/by-name/bo/bowtie2/package.nix

@@ -5,7 +5,7 @@
   cmake,
   perl,
   python3,
-  tbb,
+  onetbb,
   zlib,
   runCommand,
   bowtie2,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    tbb
+    onetbb
     zlib
     python3
     perl

pkgs/by-name/br/brickstore/package.nix

@@ -7,7 +7,7 @@
   gst_all_1,
   cmake,
   libglvnd,
-  tbb,
+  onetbb,
   ninja,
   pkg-config,
 }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     qt6.qtwayland
     qt6.wrapQtAppsHook
-    tbb
+    onetbb
   ];
 
   patches = [

pkgs/by-name/ca/cabinpkg/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  tbb_2022,
+  onetbb,
   libgit2,
   curl,
   fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libgit2
     fmt
-    tbb_2022
+    onetbb
     nlohmann_json
     curl
   ];

pkgs/by-name/cl/cloudcompare/package.nix

@@ -15,7 +15,7 @@
   mpfr,
   pcl,
   libsForQt5,
-  tbb,
+  onetbb,
   xercesc,
   wrapGAppsHook3,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     libsForQt5.qtbase
     libsForQt5.qtsvg
     libsForQt5.qttools
-    tbb
+    onetbb
     xercesc
   ];
 

pkgs/by-name/co/cortex-command-community-project/package.nix

@@ -16,7 +16,7 @@
   pkg-config,
   SDL2,
   SDL2_image,
-  tbb,
+  onetbb,
 }:
 
 stdenv.mkDerivation rec {
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     luajit
     minizip
     SDL2_image
-    tbb
+    onetbb
   ];
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/cu/curv/package.nix

@@ -11,7 +11,7 @@
   libGL,
   libpng,
   openexr,
-  tbb,
+  onetbb,
   xorg,
   ilmbase,
   llvmPackages,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     libGL
     libpng
     openexr
-    tbb
+    onetbb
     xorg.libX11
     xorg.libXcursor
     xorg.libXext

pkgs/by-name/ea/easyeffects/package.nix

@@ -35,7 +35,7 @@
   rubberband,
   soundtouch,
   speexdsp,
-  tbb,
+  onetbb,
   wrapGAppsHook4,
   zam-plugins,
   zita-convolver,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     rubberband
     soundtouch
     speexdsp'
-    tbb
+    onetbb
     zita-convolver
   ];
 

pkgs/by-name/el/elmerfem/package.nix

@@ -12,7 +12,7 @@
   libGLU,
   opencascade-occt,
   qt6Packages,
-  tbb,
+  onetbb,
   vtkWithQt6,
   llvmPackages,
 }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     opencascade-occt
-    tbb
+    onetbb
     vtkWithQt6
   ]
   ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

pkgs/by-name/en/envision/package.nix

@@ -63,7 +63,7 @@ buildFHSEnv {
           libepoxy
           lz4
           lz4.dev
-          tbb
+          onetbb
           libxkbcommon
           librealsense
           boost

pkgs/by-name/f3/f3d/package.nix

@@ -8,7 +8,7 @@
   gzip,
   libXt,
   openusd,
-  tbb,
+  onetbb,
   vtk,
   autoPatchelfHook,
   python3Packages,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals withUsd [
     libXt
     openusd
-    tbb
+    onetbb
   ];
 
   cmakeFlags = [

pkgs/by-name/ho/houdini/package.nix

@@ -36,7 +36,7 @@ buildFHSEnv {
       libdrm
       libxkbcommon
       libudev0-shim
-      tbb
+      onetbb
       xwayland
       qt5.qtwayland
       net-tools # needed by licensing tools

pkgs/by-name/is/ispc/package.nix

@@ -10,7 +10,7 @@
   flex,
   llvmPackages,
   ncurses,
-  tbb,
+  onetbb,
   # the default test target is sse4, but that is not supported by all Hydra agents
   testedTargets ?
     if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     flex
     python3
     llvmPackages.libllvm.dev
-    tbb
+    onetbb
   ];
 
   buildInputs = with llvmPackages; [

pkgs/by-name/ka/kaminpar/package.nix

@@ -7,7 +7,7 @@
   numactl,
   mpi,
   sparsehash,
-  tbb_2022,
+  onetbb,
   gtest,
   mpiCheckPhaseHook,
 }:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     mpi
     sparsehash
-    tbb_2022
+    onetbb
   ];
 
   cmakeFlags = [