From f528044060d3d1cca7551018258cd47d08e2b88c Mon Sep 17 00:00:00 2001 From: Saterfield990 Date: Wed, 18 Jun 2025 17:09:39 +0300 Subject: [PATCH] tbb_2021: shorten name; move to by-name --- pkgs/applications/misc/prusa-slicer/default.nix | 6 +++--- pkgs/by-name/au/autotier/package.nix | 4 ++-- pkgs/by-name/ba/bambu-studio/package.nix | 4 ++-- pkgs/by-name/ca/cabinpkg/package.nix | 4 ++-- pkgs/by-name/li/libblake3/package.nix | 4 ++-- pkgs/by-name/li/libloot/package.nix | 4 ++-- pkgs/by-name/ma/manifold/package.nix | 4 ++-- 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 ++-- .../tb/tbb_2021/package.nix} | 14 +++++++------- pkgs/by-name/ue/ueberzugpp/package.nix | 4 ++-- pkgs/development/libraries/embree/2.x.nix | 2 +- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 7 +++---- 19 files changed, 42 insertions(+), 44 deletions(-) rename pkgs/{development/libraries/tbb/default.nix => by-name/tb/tbb_2021/package.nix} (95%) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7167387e37eb..fe9260366fdb 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_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 index a6d8836eed35..bf044574432b 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_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 index 5c499dcd4e43..359ba7c9dc8c 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_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 index 011049884d71..a4604868d6f5 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_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/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 72ce99baa6bc..6e7b9277ebe3 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_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 index 1f1277715e67..97ffa6940c36 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_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 index fac26c367b75..119fc497c73c 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_11, + tbb_2021, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest glm - tbb_2021_11 + tbb_2021 clipper2 ]; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 10695db23b28..0b570a3c76a2 100644 --- 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/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 14887e24ae25..bbf9e443160b 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_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/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 94e92d587920..174140744327 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_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 index fbe980cbdb6f..4f3a31f5efcd 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_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 index 1e221c5df65e..6480be33f27a 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_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 index 19699890df1a..76dbfea1b9aa 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_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 index 4836eca8ea3b..76e9b05dc7b0 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_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 diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/by-name/tb/tbb_2021/package.nix similarity index 95% rename from pkgs/development/libraries/tbb/default.nix rename to pkgs/by-name/tb/tbb_2021/package.nix index 8ecaed4e7a4e..4045f3028b4d 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/by-name/tb/tbb_2021/package.nix @@ -7,7 +7,7 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbb"; version = "2021.11.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE="; }; @@ -93,10 +93,10 @@ stdenv.mkDerivation rec { 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 @@ -105,11 +105,11 @@ stdenv.mkDerivation rec { 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 ]; }; -} +}) diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index ca13763f34f3..3dc7bdc20630 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_11, + tbb_2021, spdlog, libsodium, fmt, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { openssl zeromq cppzmq - tbb_2021_11 + tbb_2021 spdlog libsodium fmt diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index b5d6f5a7b8be..8f70261921cc 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_0 is not backward compatible + # tbb_2021 is not backward compatible tbb_2020_3 glfw openimageio_2 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12ac5db7703e..bf1586d002ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1899,7 +1899,6 @@ mapAliases { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc18e9c72c1..f200d926456e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -311,7 +311,7 @@ with pkgs; }; 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; }; }; @@ -6101,7 +6101,6 @@ with pkgs; 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 { }; # many packages still fail with latest version tbb = tbb_2020_3; @@ -7383,7 +7382,7 @@ with pkgs; 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 { @@ -7882,7 +7881,7 @@ with pkgs; cctag = callPackage ../development/libraries/cctag { stdenv = clangStdenv; - tbb = tbb_2021_11; + tbb = tbb_2021; }; ceedling = callPackage ../development/tools/ceedling { };