tbb_{2022,2021,2020}: 2022.0.0 -> 2022.1.0; 2021.11.0 -> 2021.13.0; 2020.3 -> 2020.3.3; shorten name; move to by-name; disable manifold failing test for openscad-unstable (#402480)

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

···
   opencascade-occt_7_6_1,
   openvdb,
   qhull,
-  tbb_2021_11,
+  tbb_2021,
   wxGTK32,
   xorg,
   libbgcode,
···
       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;
···
       opencascade-override'
       openvdb_tbb_2021_8
       qhull
-      tbb_2021_11
+      tbb_2021
       wxGTK-override'
       xorg.libX11
       libbgcode

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

···
   boost,
   fuse3,
   lib45d,
-  tbb_2021_11,
+  tbb_2021,
   liburing,
   installShellFiles,
 }:
···
     boost
     fuse3
     lib45d
-    tbb_2021_11
+    tbb_2021
     liburing
   ];
 

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

···
   opencv,
   pcre,
   systemd,
-  tbb_2021_11,
+  tbb_2021,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
···
       opencascade-occt_7_6
       openvdb
       pcre
-      tbb_2021_11
+      tbb_2021
       webkitgtk_4_0
       wxGTK'
       xorg.libX11

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

···
   lib,
   stdenv,
   fetchFromGitHub,
-  tbb_2021_11,
+  tbb_2021,
   libgit2,
   curl,
   fmt,
···
   buildInputs = [
     libgit2
     fmt
-    tbb_2021_11
+    tbb_2021
     nlohmann_json
     curl
   ];

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

···
   numactl,
   mpi,
   sparsehash,
-  tbb_2022_0,
+  tbb_2022,
   gtest,
   mpiCheckPhaseHook,
 }:
···
   propagatedBuildInputs = [
     mpi
     sparsehash
-    tbb_2022_0
+    tbb_2022
   ];
 
   cmakeFlags = [

pkgs/by-name/li/libblake3/package.nix

···
   cmake,
   fetchFromGitHub,
   fetchpatch,
-  tbb_2021_11,
+  tbb_2021,
 
   useTBB ? true,
 }:
···
 
   propagatedBuildInputs = lib.optionals useTBB [
     # 2022.0 crashes on macOS at the moment
-    tbb_2021_11
+    tbb_2021
   ];
 
   cmakeFlags = [

pkgs/by-name/li/libloot/package.nix

···
   gtest,
   icu,
   spdlog,
-  tbb_2021_11,
+  tbb_2021,
   yaml-cpp,
 }:
 
···
     gtest
     icu
     (spdlog.override { fmt = fmt_11; })
-    tbb_2021_11
+    tbb_2021
 
     finalAttrs.passthru.yaml-cpp # has merge-key support
     finalAttrs.passthru.libloadorder

pkgs/by-name/ma/manifold/package.nix

···
   clipper2,
   gtest,
   glm,
-  tbb_2021_11,
+  tbb_2021,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
···
   buildInputs = [
     gtest
     glm
-    tbb_2021_11
+    tbb_2021
     clipper2
   ];
 
···
 
   doCheck = true;
   checkPhase = ''
-    test/manifold_test
+    test/manifold_test --gtest_filter=-CrossSection.RoundOffset
   '';
 
   meta = {

pkgs/by-name/mo/mold/package.nix

···
   cmake,
   mimalloc,
   ninja,
-  tbb_2022_0,
+  tbb_2022,
   zlib,
   zstd,
 
···
 
   buildInputs =
     [
-      tbb_2022_0
+      tbb_2022
       zlib
       zstd
     ]

pkgs/by-name/na/naja/package.nix

···
   flex,
   pkg-config,
   python3,
-  tbb_2021_11,
+  tbb_2021,
   buildPackages,
   nix-update-script,
 }:
···
     boost
     capnproto # cmake modules
     flex # include dir
-    tbb_2021_11
+    tbb_2021
     python3
   ];
 

pkgs/by-name/op/openscad-unstable/package.nix

···
   mesa,
   mpfr,
   python3,
-  tbb_2022_0,
+  tbb_2022,
   wayland,
   wayland-protocols,
   wrapGAppsHook3,
···
     [
       clipper2
       glm
-      tbb_2022_0
+      tbb_2022
       mimalloc
       boost
       cairo

pkgs/by-name/op/openvino/package.nix

···
   protobuf,
   pugixml,
   snappy,
-  tbb_2022_0,
+  tbb_2022,
   cudaPackages,
 }:
 
···
       opencv
       pugixml
       snappy
-      tbb_2022_0
+      tbb_2022
     ]
     ++ lib.optionals cudaSupport [
       cudaPackages.cuda_cudart

pkgs/by-name/or/orca-slicer/package.nix

···
   opencv,
   pcre,
   systemd,
-  tbb_2021_11,
+  tbb_2021,
   webkitgtk_4_0,
   wxGTK31,
   xorg,
···
       opencascade-occt_7_6
       openvdb
       pcre
-      tbb_2021_11
+      tbb_2021
       webkitgtk_4_0
       wxGTK'
       xorg.libX11

pkgs/by-name/os/osrm-backend/package.nix

···
   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";

pkgs/by-name/pa/papilo/package.nix

···
   fetchFromGitHub,
   cmake,
   boost,
-  tbb_2022_0,
+  tbb_2022,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
···
   buildInputs = [
     boost
     cmake
-    tbb_2022_0
+    tbb_2022
   ];
 
-  propagatedBuildInputs = [ tbb_2022_0 ];
+  propagatedBuildInputs = [ tbb_2022 ];
 
   strictDeps = true;
 

pkgs/by-name/pd/pdf4qt/package.nix

···
   qt6,
   wrapGAppsHook3,
   openjpeg,
-  tbb_2021_11,
+  tbb_2021,
   blend2d,
 }:
 
···
     qt6.qtspeech
     lcms
     openjpeg
-    tbb_2021_11
+    tbb_2021
     blend2d
   ];
 

pkgs/by-name/sa/salmon/package.nix

···
   libiconv,
   libstaden-read,
   pkg-config,
-  tbb_2021_11,
+  tbb_2021,
   xz,
   zlib,
 }:
···
     jemalloc
     libgff
     libstaden-read
-    tbb_2021_11
+    tbb_2021
     xz
     zlib
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

pkgs/by-name/sc/scipopt-papilo/package.nix

···
   boost,
   blas,
   gmp,
-  tbb_2021_11,
+  tbb_2021,
   gfortran,
 }:
 
···
     gmp
     gfortran
     boost
-    tbb_2021_11
+    tbb_2021
   ];
 
   cmakeFlags = [

pkgs/by-name/sc/scipopt-scip/package.nix

···
   scipopt-papilo,
   scipopt-zimpl,
   ipopt,
-  tbb_2021_11,
+  tbb_2021,
   boost,
   gfortran,
   criterion,
···
     gmp
     readline
     zlib
-    tbb_2021_11
+    tbb_2021
     boost
     gfortran
     criterion

pkgs/by-name/su/supercell-wx/package.nix

···
   gtest,
   glm,
   qt6,
-  tbb_2021_11,
+  tbb_2021,
   tracy,
   replaceVars,
   python3,
···
     aws-sdk-cpp
     howard-hinnant-date
     boost
-    tbb_2021_11
+    tbb_2021
     glew
     geos
     spdlog

pkgs/by-name/ti/tiledb/package.nix

···
   bzip2,
   zstd,
   spdlog,
-  tbb_2022_0,
+  tbb_2022,
   openssl,
   boost,
   libpqxx,
···
     cp -r ${rapidcheck.dev}/* $out
   '';
   catch2 = catch2_3;
-  tbb = tbb_2022_0;
+  tbb = tbb_2022;
 in
 stdenv.mkDerivation rec {
   pname = "tiledb";

pkgs/by-name/ue/ueberzugpp/package.nix

···
   openssl,
   zeromq,
   cppzmq,
-  tbb_2021_11,
+  tbb_2021,
   spdlog,
   libsodium,
   fmt,
···
       openssl
       zeromq
       cppzmq
-      tbb_2021_11
+      tbb_2021
       spdlog
       libsodium
       fmt

pkgs/development/libraries/embree/2.x.nix

···
   cmake,
   pkg-config,
   ispc,
-  tbb_2020_3,
+  tbb_2020,
   glfw,
   openimageio_2,
   libjpeg,
···
   ];
   buildInputs = [
     ispc
-    # tbb_2021_0 is not backward compatible
-    tbb_2020_3
+    # tbb_2021 is not backward compatible
+    tbb_2020
     glfw
     openimageio_2
     libjpeg
···
         "v(2.*)"
       ];
     };
-    tbb = tbb_2020_3;
+    tbb = tbb_2020;
     tests = {
       inherit (python3Packages) embreex;
     };

pkgs/development/libraries/tbb/2020_3.nix pkgs/by-name/tb/tbb_2020/package.nix

···
   fixDarwinDylibNames,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tbb";
-  version = "2020.3";
+  version = "2020.3.3";
 
   outputs = [
     "out"
···
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    rev = "v${version}";
-    sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pCZpQ+t7dDzuS4vhlfSVLwieI0iSQHukXb8Nk5kMMBo=";
   };
 
   patches = [
···
     (fetchpatch {
       url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
       hash = "sha256-xp8J/il855VTFIKCN/bFtf+vif6HzcVl4t4/L9nW/xk=";
-    })
-
-    # Fixes build with upcoming gcc-13:
-    #  https://github.com/oneapi-src/oneTBB/pull/833
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch";
-      hash = "sha256-LWgf7Rm6Zp4TJdvMqnAkoAebbVS+WV2kB+4iY6jRka4=";
     })
 
     # Fixes build for aarch64-darwin
···
     runHook postInstall
   '';
 
-  postInstall =
-    let
-      pcTemplate = fetchurl {
-        url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in";
-        sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";
-      };
-    in
-    ''
-      # Generate pkg-config file based on upstream template.
-      # It should not be necessary with tbb after 2021.2.
-      mkdir -p "$out/lib/pkgconfig"
-      substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \
-        --subst-var-by CMAKE_INSTALL_PREFIX "$out" \
-        --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \
-        --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \
-        --subst-var-by TBB_VERSION "${version}" \
-        --subst-var-by TBB_LIB_NAME "tbb"
-    '';
+  pcTemplate = fetchurl {
+    url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in";
+    hash = "sha256-2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";
+  };
 
-  meta = with lib; {
+  postInstall = ''
+    # Generate pkg-config file based on upstream template.
+    # It should not be necessary with tbb after 2021.2.
+    mkdir -p "$out/lib/pkgconfig"
+    substitute "${finalAttrs.pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \
+    --subst-var-by CMAKE_INSTALL_PREFIX "$out" \
+    --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \
+    --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \
+    --subst-var-by TBB_VERSION "${finalAttrs.version}" \
+    --subst-var-by TBB_LIB_NAME "tbb"
+  '';
+
+  meta = {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
       expressing parallelism in a C++ program. It is a library that helps you
···
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       silvanshade
       thoughtpolice
       tmarkus
     ];
   };
-}
+})

pkgs/development/libraries/tbb/2022_0.nix pkgs/by-name/tb/tbb_2022/package.nix

···
   ninja,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tbb";
-  version = "2022.0.0";
+  version = "2022.1.0";
 
   outputs = [
     "out"
···
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    tag = "v${version}";
-    hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DqJkNlC94cPJSXnhyFcEqWYGCQPunMfIfb05UcFGynw=";
   };
 
   nativeBuildInputs = [
···
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
       expressing parallelism in a C++ program. It is a library that helps you
···
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       silvanshade
       thoughtpolice
       tmarkus
     ];
   };
-}
+})

pkgs/development/libraries/tbb/default.nix pkgs/by-name/tb/tbb_2021/package.nix

···
   ninja,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tbb";
-  version = "2021.11.0";
+  version = "2021.13.0";
 
   outputs = [
     "out"
···
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    rev = "v${version}";
-    hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZoUzY71SweVQ8/1k09MNSXiEqab6Ae+QTbxORnar9JU=";
   };
 
   nativeBuildInputs = [
···
     (fetchpatch {
       url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
       hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
-    })
-    (fetchpatch {
-      name = "fix-tbb-mingw-compile.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1361.patch";
-      hash = "sha256-jVa4HQetZv0vImdv549MyTy6/8t9dy8m6YAmjPGNQ18=";
-    })
-    (fetchpatch {
-      name = "fix-tbb-mingw-link.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";
-      hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";
     })
     # Fix tests on FreeBSD and Windows
     (fetchpatch {
···
       url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
       hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
     })
-    # Fix Threads::Threads target for static from https://github.com/oneapi-src/oneTBB/pull/1248
-    # This is a conflict-resolved cherry-pick of the above PR to due to formatting differences.
-    (fetchpatch {
-      name = "fix-cmake-threads-threads-target-for-static.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1248.patch";
-      hash = "sha256-3WKzxU93vxuy7NgW+ap+ocZz5Q5utZ/pK7+FQExzLLA=";
-    })
   ];
 
   patchFlags = [
···
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
       expressing parallelism in a C++ program. It is a library that helps you
···
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       silvanshade
       thoughtpolice
       tmarkus
     ];
   };
-}
+})

pkgs/development/python-modules/scipp/default.nix

···
   eigen,
   gtest,
   pybind11,
-  tbb_2022_0,
+  tbb_2022,
 
   # tests
   pytestCheckHook,
···
     gtest
     pybind11
     units-llnl.passthru.top-level
-    tbb_2022_0
+    tbb_2022
   ];
 
   nativeCheckInputs = [

pkgs/top-level/aliases.nix

···
   taplo-lsp = taplo; # Added 2022-07-30
   targetcli = targetcli-fb; # Added 2025-03-14
   taro = taproot-assets; # Added 2023-07-04
-  tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14";
   tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
   tclcurl = tclPackages.tclcurl; # Added 2024-10-02
   tcllib = tclPackages.tcllib; # Added 2024-10-02

pkgs/top-level/all-packages.nix

···
   };
 
   basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
-    tbb = tbb_2021_11;
+    tbb = tbb_2021;
     cereal = cereal_1_3_2;
     opencv = opencv.override { enableGtk3 = true; };
   };
···
 
   swi-prolog-gui = swi-prolog.override { withGui = true; };
 
-  tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
-  tbb_2021_11 = callPackage ../development/libraries/tbb { };
-  tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
   # many packages still fail with latest version
-  tbb = tbb_2020_3;
+  tbb = tbb_2020;
 
   teyjus = callPackage ../development/compilers/teyjus {
     inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;
···
 
   ikos = callPackage ../development/tools/analysis/ikos {
     inherit (llvmPackages_14) stdenv clang llvm;
-    tbb = tbb_2021_11;
+    tbb = tbb_2021;
   };
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
···
 
   cctag = callPackage ../development/libraries/cctag {
     stdenv = clangStdenv;
-    tbb = tbb_2021_11;
+    tbb = tbb_2021;
   };
 
   ceedling = callPackage ../development/tools/ceedling { };