tbb_2022: shorten name; move to by-name

+24 -25
+2 -2
pkgs/by-name/ka/kaminpar/package.nix
··· 7 7 numactl, 8 8 mpi, 9 9 sparsehash, 10 - tbb_2022_0, 10 + tbb_2022, 11 11 gtest, 12 12 mpiCheckPhaseHook, 13 13 }: ··· 56 56 propagatedBuildInputs = [ 57 57 mpi 58 58 sparsehash 59 - tbb_2022_0 59 + tbb_2022 60 60 ]; 61 61 62 62 cmakeFlags = [
+2 -2
pkgs/by-name/mo/mold/package.nix
··· 7 7 cmake, 8 8 mimalloc, 9 9 ninja, 10 - tbb_2022_0, 10 + tbb_2022, 11 11 zlib, 12 12 zstd, 13 13 ··· 42 42 43 43 buildInputs = 44 44 [ 45 - tbb_2022_0 45 + tbb_2022 46 46 zlib 47 47 zstd 48 48 ]
+2 -2
pkgs/by-name/op/openscad-unstable/package.nix
··· 34 34 mesa, 35 35 mpfr, 36 36 python3, 37 - tbb_2022_0, 37 + tbb_2022, 38 38 wayland, 39 39 wayland-protocols, 40 40 wrapGAppsHook3, ··· 79 79 [ 80 80 clipper2 81 81 glm 82 - tbb_2022_0 82 + tbb_2022 83 83 mimalloc 84 84 boost 85 85 cairo
+2 -2
pkgs/by-name/op/openvino/package.nix
··· 28 28 protobuf, 29 29 pugixml, 30 30 snappy, 31 - tbb_2022_0, 31 + tbb_2022, 32 32 cudaPackages, 33 33 }: 34 34 ··· 158 158 opencv 159 159 pugixml 160 160 snappy 161 - tbb_2022_0 161 + tbb_2022 162 162 ] 163 163 ++ lib.optionals cudaSupport [ 164 164 cudaPackages.cuda_cudart
+2 -2
pkgs/by-name/os/osrm-backend/package.nix
··· 10 10 boost, 11 11 lua, 12 12 luabind, 13 - tbb_2022_0, 13 + tbb_2022, 14 14 expat, 15 15 nixosTests, 16 16 }: 17 17 18 18 let 19 - tbb = tbb_2022_0; 19 + tbb = tbb_2022; 20 20 in 21 21 stdenv.mkDerivation rec { 22 22 pname = "osrm-backend";
+3 -3
pkgs/by-name/pa/papilo/package.nix
··· 4 4 fetchFromGitHub, 5 5 cmake, 6 6 boost, 7 - tbb_2022_0, 7 + tbb_2022, 8 8 }: 9 9 10 10 stdenv.mkDerivation (finalAttrs: { ··· 39 39 buildInputs = [ 40 40 boost 41 41 cmake 42 - tbb_2022_0 42 + tbb_2022 43 43 ]; 44 44 45 - propagatedBuildInputs = [ tbb_2022_0 ]; 45 + propagatedBuildInputs = [ tbb_2022 ]; 46 46 47 47 strictDeps = true; 48 48
+2 -2
pkgs/by-name/ti/tiledb/package.nix
··· 8 8 bzip2, 9 9 zstd, 10 10 spdlog, 11 - tbb_2022_0, 11 + tbb_2022, 12 12 openssl, 13 13 boost, 14 14 libpqxx, ··· 32 32 cp -r ${rapidcheck.dev}/* $out 33 33 ''; 34 34 catch2 = catch2_3; 35 - tbb = tbb_2022_0; 35 + tbb = tbb_2022; 36 36 in 37 37 stdenv.mkDerivation rec { 38 38 pname = "tiledb";
+7 -7
pkgs/development/libraries/tbb/2022_0.nix pkgs/by-name/tb/tbb_2022/package.nix
··· 7 7 ninja, 8 8 }: 9 9 10 - stdenv.mkDerivation rec { 10 + stdenv.mkDerivation (finalAttrs: { 11 11 pname = "tbb"; 12 12 version = "2022.0.0"; 13 13 ··· 19 19 src = fetchFromGitHub { 20 20 owner = "oneapi-src"; 21 21 repo = "oneTBB"; 22 - tag = "v${version}"; 22 + tag = "v${finalAttrs.version}"; 23 23 hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A="; 24 24 }; 25 25 ··· 71 71 72 72 enableParallelBuilding = true; 73 73 74 - meta = with lib; { 74 + meta = { 75 75 description = "Intel Thread Building Blocks C++ Library"; 76 76 homepage = "http://threadingbuildingblocks.org/"; 77 - license = licenses.asl20; 77 + license = lib.licenses.asl20; 78 78 longDescription = '' 79 79 Intel Threading Building Blocks offers a rich and complete approach to 80 80 expressing parallelism in a C++ program. It is a library that helps you ··· 83 83 represents a higher-level, task-based parallelism that abstracts platform 84 84 details and threading mechanisms for scalability and performance. 85 85 ''; 86 - platforms = platforms.unix ++ platforms.windows; 87 - maintainers = with maintainers; [ 86 + platforms = lib.platforms.all; 87 + maintainers = with lib.maintainers; [ 88 88 silvanshade 89 89 thoughtpolice 90 90 tmarkus 91 91 ]; 92 92 }; 93 - } 93 + })
+2 -2
pkgs/development/python-modules/scipp/default.nix
··· 22 22 eigen, 23 23 gtest, 24 24 pybind11, 25 - tbb_2022_0, 25 + tbb_2022, 26 26 27 27 # tests 28 28 pytestCheckHook, ··· 75 75 gtest 76 76 pybind11 77 77 units-llnl.passthru.top-level 78 - tbb_2022_0 78 + tbb_2022 79 79 ]; 80 80 81 81 nativeCheckInputs = [
-1
pkgs/top-level/all-packages.nix
··· 6102 6102 6103 6103 tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; 6104 6104 tbb_2021_11 = callPackage ../development/libraries/tbb { }; 6105 - tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { }; 6106 6105 # many packages still fail with latest version 6107 6106 tbb = tbb_2020_3; 6108 6107