diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7167387e37eb0..fe9260366fdb5 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 a6d8836eed35d..bf044574432b0 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 5c499dcd4e435..359ba7c9dc8c6 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 011049884d714..a4604868d6f52 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/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix index 85b095bb61310..9b9cfac2a4742 100644 --- 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 index 72ce99baa6bc2..6e7b9277ebe39 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 1f1277715e670..97ffa6940c361 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 296953af1209d..119fc497c73c0 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 ]; @@ -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 index f9e834519c618..ec88f0ce93947 100644 --- 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 index 10695db23b283..0b570a3c76a26 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/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index f8a2a0f7be6ff..95a5bdc796092 100644 --- 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 index 56c51de76b723..9dadda3bea977 100644 --- 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 index 14887e24ae25f..bbf9e443160bf 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/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index de9207b66365b..accbb1f514c7c 100644 --- 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 index 1813f0a236a16..79a4912f533da 100644 --- 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 index 94e92d5879203..174140744327a 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 fbe980cbdb6fe..4f3a31f5efcd4 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 1e221c5df65e9..6480be33f27a8 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 19699890df1af..76dbfea1b9aa3 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 4836eca8ea3bc..76e9b05dc7b0a 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/2020_3.nix b/pkgs/by-name/tb/tbb_2020/package.nix similarity index 67% rename from pkgs/development/libraries/tbb/2020_3.nix rename to pkgs/by-name/tb/tbb_2020/package.nix index 82101272c3956..a5d6b0fbb2357 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/by-name/tb/tbb_2020/package.nix @@ -7,9 +7,9 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbb"; - version = "2020.3"; + version = "2020.3.3"; outputs = [ "out" @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; - rev = "v${version}"; - sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pCZpQ+t7dDzuS4vhlfSVLwieI0iSQHukXb8Nk5kMMBo="; }; patches = [ @@ -36,14 +36,6 @@ stdenv.mkDerivation rec { 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 (fetchpatch { name = "aarch64-darwin.patch"; @@ -91,29 +83,27 @@ stdenv.mkDerivation rec { 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="; + }; + + 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 = 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 @@ -122,11 +112,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; - maintainers = with maintainers; [ + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ silvanshade thoughtpolice tmarkus ]; }; -} +}) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/by-name/tb/tbb_2021/package.nix similarity index 70% rename from pkgs/development/libraries/tbb/default.nix rename to pkgs/by-name/tb/tbb_2021/package.nix index 8ecaed4e7a4e6..bddbb1a546fee 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/by-name/tb/tbb_2021/package.nix @@ -7,9 +7,9 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbb"; - version = "2021.11.0"; + version = "2021.13.0"; outputs = [ "out" @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { 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 = [ @@ -34,29 +34,12 @@ stdenv.mkDerivation rec { 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 { name = "fix-tbb-freebsd-and-windows-tests.patch"; 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 = [ @@ -93,10 +76,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 +88,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/development/libraries/tbb/2022_0.nix b/pkgs/by-name/tb/tbb_2022/package.nix similarity index 90% rename from pkgs/development/libraries/tbb/2022_0.nix rename to pkgs/by-name/tb/tbb_2022/package.nix index bf7522d5c34d6..66b8c9d4a0f02 100644 --- a/pkgs/development/libraries/tbb/2022_0.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -7,9 +7,9 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbb"; - version = "2022.0.0"; + version = "2022.1.0"; outputs = [ "out" @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; - tag = "v${version}"; - hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DqJkNlC94cPJSXnhyFcEqWYGCQPunMfIfb05UcFGynw="; }; nativeBuildInputs = [ @@ -71,10 +71,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 @@ -83,11 +83,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/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index e31a44de573c0..8b68590dfb6ff 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -8,7 +8,7 @@ bzip2, zstd, spdlog, - tbb_2022_0, + tbb_2022, openssl, boost, libpqxx, @@ -32,7 +32,7 @@ let cp -r ${rapidcheck.dev}/* $out ''; catch2 = catch2_3; - tbb = tbb_2022_0; + tbb = tbb_2022; in stdenv.mkDerivation rec { pname = "tiledb"; diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index ca13763f34f3b..3dc7bdc20630d 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 b5d6f5a7b8bec..05764262a9798 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -5,7 +5,7 @@ cmake, pkg-config, ispc, - tbb_2020_3, + tbb_2020, glfw, openimageio_2, libjpeg, @@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ ispc - # tbb_2021_0 is not backward compatible - tbb_2020_3 + # tbb_2021 is not backward compatible + tbb_2020 glfw openimageio_2 libjpeg @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "v(2.*)" ]; }; - tbb = tbb_2020_3; + tbb = tbb_2020; tests = { inherit (python3Packages) embreex; }; diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index 9cfb79fe914a7..1a8d5c8007592 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -22,7 +22,7 @@ eigen, gtest, pybind11, - tbb_2022_0, + tbb_2022, # tests pytestCheckHook, @@ -75,7 +75,7 @@ buildPythonPackage rec { gtest pybind11 units-llnl.passthru.top-level - tbb_2022_0 + tbb_2022 ]; nativeCheckInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12ac5db7703e0..bf1586d002baa 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 254403a5c8f06..ffc880084775a 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; }; }; @@ -6100,11 +6100,8 @@ 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 { }; - 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; @@ -7384,7 +7381,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 { @@ -7883,7 +7880,7 @@ with pkgs; cctag = callPackage ../development/libraries/cctag { stdenv = clangStdenv; - tbb = tbb_2021_11; + tbb = tbb_2021; }; ceedling = callPackage ../development/tools/ceedling { };