From 28afe52ccdec366a1afd6e642ecd24cbb39c9294 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 14 Sep 2025 16:37:10 +0100 Subject: [PATCH] onetbb: rename from `tbb_2022` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the upstream name and there doesn’t seem to be a strong reason to keep around multiple versions now. --- .../onetbb}/fix-32-bit-powerpc-build.patch | 0 .../onetbb}/fix-libtbbmalloc-dlopen.patch | 0 .../tbb_2022 => on/onetbb}/fix-musl-build.patch | 0 .../{tb/tbb_2022 => on/onetbb}/package.nix | 16 +++++++--------- pkgs/top-level/aliases.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 6 files changed, 10 insertions(+), 11 deletions(-) rename pkgs/by-name/{tb/tbb_2022 => on/onetbb}/fix-32-bit-powerpc-build.patch (100%) rename pkgs/by-name/{tb/tbb_2022 => on/onetbb}/fix-libtbbmalloc-dlopen.patch (100%) rename pkgs/by-name/{tb/tbb_2022 => on/onetbb}/fix-musl-build.patch (100%) rename pkgs/by-name/{tb/tbb_2022 => on/onetbb}/package.nix (79%) diff --git a/pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch b/pkgs/by-name/on/onetbb/fix-32-bit-powerpc-build.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch rename to pkgs/by-name/on/onetbb/fix-32-bit-powerpc-build.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch b/pkgs/by-name/on/onetbb/fix-libtbbmalloc-dlopen.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch rename to pkgs/by-name/on/onetbb/fix-libtbbmalloc-dlopen.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-musl-build.patch b/pkgs/by-name/on/onetbb/fix-musl-build.patch similarity index 100% rename from pkgs/by-name/tb/tbb_2022/fix-musl-build.patch rename to pkgs/by-name/on/onetbb/fix-musl-build.patch diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/on/onetbb/package.nix similarity index 79% rename from pkgs/by-name/tb/tbb_2022/package.nix rename to pkgs/by-name/on/onetbb/package.nix index 807ca45e9038..c9371e4b14c5 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "tbb"; + pname = "onetbb"; version = "2022.2.0"; outputs = [ @@ -73,16 +73,14 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; + description = "oneAPI Threading Building Blocks"; + homepage = "https://uxlfoundation.github.io/oneTBB/"; 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 - take advantage of multi-core processor performance without having to be a - threading expert. Intel TBB is not just a threads-replacement library. It - represents a higher-level, task-based parallelism that abstracts platform - details and threading mechanisms for scalability and performance. + oneAPI Threading Building Blocks (oneTBB) is a runtime-based + parallel programming model for C++ code that uses tasks. The + template-based runtime library can help you harness the latent + performance of multi-core processors. ''; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ad3a96c2543f..b4d7e9724230 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2384,8 +2384,8 @@ mapAliases { taplo-lsp = taplo; # Added 2022-07-30 targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 - tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-14 - tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-13 + tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14 + tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13 tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 tclcurl = tclPackages.tclcurl; # Added 2024-10-02 tcllib = tclPackages.tcllib; # Added 2024-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d80c539011b8..67d7e3751a4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5630,6 +5630,7 @@ with pkgs; swi-prolog-gui = swi-prolog.override { withGui = true; }; tbb = tbb_2022; + tbb_2022 = onetbb; teyjus = callPackage ../development/compilers/teyjus { inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;