From 052b3cf0e2137e7f18fb9bc671ae7681abd4efc9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 13 Sep 2025 06:11:10 +0100
Subject: [PATCH] treewide: tbb_2021 -> tbb_2022

Everything that built with `tbb_2021` builds successfully with
`tbb_2022` on `aarch64-linux`, and `tbb_2022` no longer causes crashes
on Darwin.
---
 pkgs/applications/misc/prusa-slicer/default.nix | 8 ++++----
 pkgs/by-name/au/autotier/package.nix            | 4 ++--
 pkgs/by-name/ba/bambu-studio/package.nix        | 4 ++--
 pkgs/by-name/bl/blender/package.nix             | 2 +-
 pkgs/by-name/ca/cabinpkg/package.nix            | 4 ++--
 pkgs/by-name/li/libblake3/package.nix           | 5 ++---
 pkgs/by-name/li/libloot/package.nix             | 4 ++--
 pkgs/by-name/ma/manifold/package.nix            | 6 +++---
 pkgs/by-name/na/naja/package.nix                | 4 ++--
 pkgs/by-name/or/orca-slicer/package.nix         | 4 ++--
 pkgs/by-name/pd/pdf4qt/package.nix              | 4 ++--
 pkgs/by-name/sa/salmon/package.nix              | 4 ++--
 pkgs/by-name/sc/scipopt-papilo/package.nix      | 4 ++--
 pkgs/by-name/sc/scipopt-scip/package.nix        | 4 ++--
 pkgs/by-name/su/supercell-wx/package.nix        | 4 ++--
 pkgs/by-name/to/todds/package.nix               | 4 ++--
 pkgs/by-name/ue/ueberzugpp/package.nix          | 4 ++--
 pkgs/development/libraries/embree/2.x.nix       | 2 +-
 pkgs/top-level/all-packages.nix                 | 6 +++---
 19 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index 929b169a254d..dd149014ae99 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -27,7 +27,7 @@
   opencascade-occt_7_6_1,
   openvdb,
   qhull,
-  tbb_2021,
+  tbb_2022,
   wxGTK32,
   xorg,
   libbgcode,
@@ -54,7 +54,7 @@ let
       hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
     };
   });
-  openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };
+  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 +122,9 @@ stdenv.mkDerivation (finalAttrs: {
     nanosvg-fltk
     nlopt
     opencascade-override'
-    openvdb_tbb_2021_8
+    openvdb_tbb_2022
     qhull
-    tbb_2021
+    tbb_2022
     wxGTK-override'
     xorg.libX11
     libbgcode
diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix
index bf044574432b..ffd7a0679cd9 100644
--- a/pkgs/by-name/au/autotier/package.nix
+++ b/pkgs/by-name/au/autotier/package.nix
@@ -8,7 +8,7 @@
   boost,
   fuse3,
   lib45d,
-  tbb_2021,
+  tbb_2022,
   liburing,
   installShellFiles,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fuse3
     lib45d
-    tbb_2021
+    tbb_2022
     liburing
   ];
 
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 6a0b15c2e750..4efb631789db 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -34,7 +34,7 @@
   opencv,
   pcre,
   systemd,
-  tbb_2021,
+  tbb_2022,
   webkitgtk_4_1,
   wxGTK31,
   xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     opencascade-occt_7_6
     openvdb
     pcre
-    tbb_2021
+    tbb_2022
     webkitgtk_4_1
     wxGTK'
     xorg.libX11
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index e2606a869b68..972b702ce663 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -257,7 +257,7 @@ stdenv'.mkDerivation (finalAttrs: {
     libsndfile
     libtiff
     libwebp
-    (manifold.override { tbb_2021 = tbb; })
+    manifold
     opencolorio
     openexr
     openimageio
diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
index 31d35851dcf8..d8144db6aa42 100644
--- a/pkgs/by-name/ca/cabinpkg/package.nix
+++ b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  tbb_2021,
+  tbb_2022,
   libgit2,
   curl,
   fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libgit2
     fmt
-    tbb_2021
+    tbb_2022
     nlohmann_json
     curl
   ];
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index ec149e70c696..ada016a4383e 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -4,7 +4,7 @@
   cmake,
   fetchFromGitHub,
   fetchpatch,
-  tbb_2021,
+  tbb_2022,
 
   useTBB ? true,
 }:
@@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
 
   propagatedBuildInputs = lib.optionals useTBB [
-    # 2022.0 crashes on macOS at the moment
-    tbb_2021
+    tbb_2022
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix
index c73045bca47e..898b59d43b1f 100644
--- a/pkgs/by-name/li/libloot/package.nix
+++ b/pkgs/by-name/li/libloot/package.nix
@@ -18,7 +18,7 @@
   gtest,
   icu,
   spdlog,
-  tbb_2021,
+  tbb_2022,
   yaml-cpp,
 }:
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     icu
     (spdlog.override { fmt = fmt_11; })
-    tbb_2021
+    tbb_2022
 
     finalAttrs.passthru.yaml-cpp # has merge-key support
     finalAttrs.passthru.libloadorder
diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 50c41e0bbdf9..10a3dd62ae49 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -6,7 +6,7 @@
   clipper2,
   gtest,
   glm,
-  tbb_2021,
+  tbb_2022,
   python3Packages,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     glm
-    tbb_2021
+    tbb_2022
   ];
 
   propagatedBuildInputs = [ clipper2 ];
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tbb = tbb_2021;
+    tbb = tbb_2022;
     tests = {
       python = python3Packages.manifold3d;
     };
diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
index 2995a4089267..9dcf95e28752 100644
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@@ -11,7 +11,7 @@
   pkg-config,
   python3,
   sphinx,
-  tbb_2021,
+  tbb_2022,
   buildPackages,
   nix-update-script,
 }:
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     capnproto # cmake modules
     flex # include dir
-    tbb_2021
+    tbb_2022
     python3
   ];
 
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 763b957d7835..b8c2e79c6b3e 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -34,7 +34,7 @@
   opencv,
   pcre,
   systemd,
-  tbb_2021,
+  tbb_2022,
   webkitgtk_4_1,
   wxGTK31,
   xorg,
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     opencascade-occt_7_6
     openvdb
     pcre
-    tbb_2021
+    tbb_2022
     webkitgtk_4_1
     wxGTK'
     xorg.libX11
diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix
index 174140744327..94b114e535bf 100644
--- a/pkgs/by-name/pd/pdf4qt/package.nix
+++ b/pkgs/by-name/pd/pdf4qt/package.nix
@@ -8,7 +8,7 @@
   qt6,
   wrapGAppsHook3,
   openjpeg,
-  tbb_2021,
+  tbb_2022,
   blend2d,
 }:
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtspeech
     lcms
     openjpeg
-    tbb_2021
+    tbb_2022
     blend2d
   ];
 
diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix
index 0d2250c77f07..8cc252a4ba82 100644
--- a/pkgs/by-name/sa/salmon/package.nix
+++ b/pkgs/by-name/sa/salmon/package.nix
@@ -13,7 +13,7 @@
   libiconv,
   libstaden-read,
   pkg-config,
-  tbb_2021,
+  tbb_2022,
   xz,
   zlib,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     jemalloc
     libgff
     libstaden-read
-    tbb_2021
+    tbb_2022
     xz
     zlib
   ]
diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix
index ea38ed196a9a..71c1daf2189a 100644
--- a/pkgs/by-name/sc/scipopt-papilo/package.nix
+++ b/pkgs/by-name/sc/scipopt-papilo/package.nix
@@ -6,7 +6,7 @@
   boost,
   blas,
   gmp,
-  tbb_2021,
+  tbb_2022,
   gfortran,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     gmp
     gfortran
     boost
-    tbb_2021
+    tbb_2022
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix
index f6a2efe88a67..0665343dd089 100644
--- a/pkgs/by-name/sc/scipopt-scip/package.nix
+++ b/pkgs/by-name/sc/scipopt-scip/package.nix
@@ -11,7 +11,7 @@
   scipopt-papilo,
   scipopt-zimpl,
   ipopt,
-  tbb_2021,
+  tbb_2022,
   boost,
   gfortran,
   criterion,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     gmp
     readline
     zlib
-    tbb_2021
+    tbb_2022
     boost
     gfortran
     criterion
diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 76e9b05dc7b0..2a6c1aa148f6 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -24,7 +24,7 @@
   gtest,
   glm,
   qt6,
-  tbb_2021,
+  tbb_2022,
   tracy,
   replaceVars,
   python3,
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     aws-sdk-cpp
     howard-hinnant-date
     boost
-    tbb_2021
+    tbb_2022
     glew
     geos
     spdlog
diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix
index f6d0a9baca64..9712ba56802e 100644
--- a/pkgs/by-name/to/todds/package.nix
+++ b/pkgs/by-name/to/todds/package.nix
@@ -9,7 +9,7 @@
   fmt,
   hyperscan,
   opencv,
-  tbb_2021,
+  tbb_2022,
   fetchFromGitHub,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     fmt
     hyperscan
     opencv
-    tbb_2021
+    tbb_2022
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 8cf7a044fbf6..419f16eb7c4d 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -7,7 +7,7 @@
   openssl,
   zeromq,
   cppzmq,
-  tbb_2021,
+  tbb_2022,
   spdlog,
   libsodium,
   fmt,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     openssl
     zeromq
     cppzmq
-    tbb_2021
+    tbb_2022
     spdlog
     libsodium
     fmt
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index 6ec8f1040769..d8adcf7df8a2 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     ispc
-    # tbb_2021 is not backward compatible
+    # tbb_2022 is not backward compatible
     tbb_2020
     glfw
     openimageio
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadbbeac1b37..2d888141b13c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -283,7 +283,7 @@ with pkgs;
   cve = with python3Packages; toPythonApplication cvelib;
 
   basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
-    tbb = tbb_2021;
+    tbb = tbb_2022;
     cereal = cereal_1_3_2;
     opencv = opencv.override { enableGtk3 = true; };
   };
@@ -6878,7 +6878,7 @@ with pkgs;
 
   ikos = callPackage ../development/tools/analysis/ikos {
     inherit (llvmPackages_14) stdenv clang llvm;
-    tbb = tbb_2021;
+    tbb = tbb_2022;
   };
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
@@ -7348,7 +7348,7 @@ with pkgs;
 
   cctag = callPackage ../development/libraries/cctag {
     stdenv = clangStdenv;
-    tbb = tbb_2021;
+    tbb = tbb_2022;
   };
 
   ceedling = callPackage ../development/tools/ceedling { };