NixOS · 7c6f434c · Jun 20, 2025 · Jun 18, 2025 · Jun 18, 2025 · Jun 18, 2025
diff --git 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_11,
+  tbb_2021,
   wxGTK32,
   xorg,
   libbgcode,
@@ -54,7 +54,7 @@ let
       hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
     };
   });
-  openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; };
+  openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };
   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;
@@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
       opencascade-override'
       openvdb_tbb_2021_8
       qhull
-      tbb_2021_11
+      tbb_2021
       wxGTK-override'
       xorg.libX11
       libbgcode

diff --git 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_11,
+  tbb_2021,
   liburing,
   installShellFiles,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     fuse3
     lib45d
-    tbb_2021_11
+    tbb_2021
     liburing
   ];
 

diff --git 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_11,
+  tbb_2021,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
       opencascade-occt_7_6
       openvdb
       pcre
-      tbb_2021_11
+      tbb_2021
       webkitgtk_4_0
       wxGTK'
       xorg.libX11

diff --git 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_11,
+  tbb_2021,
   libgit2,
   curl,
   fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libgit2
     fmt
-    tbb_2021_11
+    tbb_2021
     nlohmann_json
     curl
   ];

diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix
@@ -7,7 +7,7 @@
   numactl,
   mpi,
   sparsehash,
-  tbb_2022_0,
+  tbb_2022,
   gtest,
   mpiCheckPhaseHook,
 }:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     mpi
     sparsehash
-    tbb_2022_0
+    tbb_2022
   ];
 
   cmakeFlags = [

diff --git 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_11,
+  tbb_2021,
 
   useTBB ? true,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = lib.optionals useTBB [
     # 2022.0 crashes on macOS at the moment
-    tbb_2021_11
+    tbb_2021
   ];
 
   cmakeFlags = [

diff --git 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_11,
+  tbb_2021,
   yaml-cpp,
 }:
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     icu
     (spdlog.override { fmt = fmt_11; })
-    tbb_2021_11
+    tbb_2021
 
     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
@@ -6,7 +6,7 @@
   clipper2,
   gtest,
   glm,
-  tbb_2021_11,
+  tbb_2021,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     glm
-    tbb_2021_11
+    tbb_2021
     clipper2
   ];
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
   checkPhase = ''
-    test/manifold_test
+    test/manifold_test --gtest_filter=-CrossSection.RoundOffset
   '';
 
   meta = {

diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
@@ -7,7 +7,7 @@
   cmake,
   mimalloc,
   ninja,
-  tbb_2022_0,
+  tbb_2022,
   zlib,
   zstd,
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      tbb_2022_0
+      tbb_2022
       zlib
       zstd
     ]

diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
@@ -10,7 +10,7 @@
   flex,
   pkg-config,
   python3,
-  tbb_2021_11,
+  tbb_2021,
   buildPackages,
   nix-update-script,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     capnproto # cmake modules
     flex # include dir
-    tbb_2021_11
+    tbb_2021
     python3
   ];
 

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -34,7 +34,7 @@
   mesa,
   mpfr,
   python3,
-  tbb_2022_0,
+  tbb_2022,
   wayland,
   wayland-protocols,
   wrapGAppsHook3,
@@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec {
     [
       clipper2
       glm
-      tbb_2022_0
+      tbb_2022
       mimalloc
       boost
       cairo

diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
@@ -28,7 +28,7 @@
   protobuf,
   pugixml,
   snappy,
-  tbb_2022_0,
+  tbb_2022,
   cudaPackages,
 }:
 
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
       opencv
       pugixml
       snappy
-      tbb_2022_0
+      tbb_2022
     ]
     ++ lib.optionals cudaSupport [
       cudaPackages.cuda_cudart

diff --git 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_11,
+  tbb_2021,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       opencascade-occt_7_6
       openvdb
       pcre
-      tbb_2021_11
+      tbb_2021
       webkitgtk_4_0
       wxGTK'
       xorg.libX11

diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix
@@ -10,13 +10,13 @@
   boost,
   lua,
   luabind,
-  tbb_2022_0,
+  tbb_2022,
   expat,
   nixosTests,
 }:
 
 let
-  tbb = tbb_2022_0;
+  tbb = tbb_2022;
 in
 stdenv.mkDerivation rec {
   pname = "osrm-backend";

diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   boost,
-  tbb_2022_0,
+  tbb_2022,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     cmake
-    tbb_2022_0
+    tbb_2022
   ];
 
-  propagatedBuildInputs = [ tbb_2022_0 ];
+  propagatedBuildInputs = [ tbb_2022 ];
 
   strictDeps = true;
 

diff --git 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_11,
+  tbb_2021,
   blend2d,
 }:
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtspeech
     lcms
     openjpeg
-    tbb_2021_11
+    tbb_2021
     blend2d
   ];
 

diff --git 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_11,
+  tbb_2021,
   xz,
   zlib,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     jemalloc
     libgff
     libstaden-read
-    tbb_2021_11
+    tbb_2021
     xz
     zlib
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

diff --git 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_11,
+  tbb_2021,
   gfortran,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     gmp
     gfortran
     boost
-    tbb_2021_11
+    tbb_2021
   ];
 
   cmakeFlags = [

diff --git 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_11,
+  tbb_2021,
   boost,
   gfortran,
   criterion,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     gmp
     readline
     zlib
-    tbb_2021_11
+    tbb_2021
     boost
     gfortran
     criterion

diff --git 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_11,
+  tbb_2021,
   tracy,
   replaceVars,
   python3,
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     aws-sdk-cpp
     howard-hinnant-date
     boost
-    tbb_2021_11
+    tbb_2021
     glew
     geos
     spdlog