tbb_2022: shorten name; move to by-name

This commit is contained in:
Saterfield990 2025-06-18 16:55:20 +03:00
parent 7246b4b353
commit b7ac3d5e82
10 changed files with 24 additions and 25 deletions

View File

@ -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 = [

View File

@ -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
]

View File

@ -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

View File

@ -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

View File

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

View File

@ -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;

View File

@ -7,7 +7,7 @@
ninja,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "tbb";
version = "2022.0.0";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
};
@ -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
];
};
}
})

View File

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

View File

@ -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 = [

View File

@ -6102,7 +6102,6 @@ with pkgs;
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;