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, numactl,
mpi, mpi,
sparsehash, sparsehash,
tbb_2022_0, tbb_2022,
gtest, gtest,
mpiCheckPhaseHook, mpiCheckPhaseHook,
}: }:
@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [ propagatedBuildInputs = [
mpi mpi
sparsehash sparsehash
tbb_2022_0 tbb_2022
]; ];
cmakeFlags = [ cmakeFlags = [

View File

@ -7,7 +7,7 @@
cmake, cmake,
mimalloc, mimalloc,
ninja, ninja,
tbb_2022_0, tbb_2022,
zlib, zlib,
zstd, zstd,
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = buildInputs =
[ [
tbb_2022_0 tbb_2022
zlib zlib
zstd zstd
] ]

View File

@ -34,7 +34,7 @@
mesa, mesa,
mpfr, mpfr,
python3, python3,
tbb_2022_0, tbb_2022,
wayland, wayland,
wayland-protocols, wayland-protocols,
wrapGAppsHook3, wrapGAppsHook3,
@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec {
[ [
clipper2 clipper2
glm glm
tbb_2022_0 tbb_2022
mimalloc mimalloc
boost boost
cairo cairo

View File

@ -28,7 +28,7 @@
protobuf, protobuf,
pugixml, pugixml,
snappy, snappy,
tbb_2022_0, tbb_2022,
cudaPackages, cudaPackages,
}: }:
@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
opencv opencv
pugixml pugixml
snappy snappy
tbb_2022_0 tbb_2022
] ]
++ lib.optionals cudaSupport [ ++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart cudaPackages.cuda_cudart

View File

@ -10,13 +10,13 @@
boost, boost,
lua, lua,
luabind, luabind,
tbb_2022_0, tbb_2022,
expat, expat,
nixosTests, nixosTests,
}: }:
let let
tbb = tbb_2022_0; tbb = tbb_2022;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "osrm-backend"; pname = "osrm-backend";

View File

@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
boost, boost,
tbb_2022_0, tbb_2022,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
boost boost
cmake cmake
tbb_2022_0 tbb_2022
]; ];
propagatedBuildInputs = [ tbb_2022_0 ]; propagatedBuildInputs = [ tbb_2022 ];
strictDeps = true; strictDeps = true;

View File

@ -7,7 +7,7 @@
ninja, ninja,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "tbb"; pname = "tbb";
version = "2022.0.0"; version = "2022.0.0";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oneapi-src"; owner = "oneapi-src";
repo = "oneTBB"; repo = "oneTBB";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A="; hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
}; };
@ -71,10 +71,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = {
description = "Intel Thread Building Blocks C++ Library"; description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/"; homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20; license = lib.licenses.asl20;
longDescription = '' longDescription = ''
Intel Threading Building Blocks offers a rich and complete approach to Intel Threading Building Blocks offers a rich and complete approach to
expressing parallelism in a C++ program. It is a library that helps you 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 represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance. details and threading mechanisms for scalability and performance.
''; '';
platforms = platforms.unix ++ platforms.windows; platforms = lib.platforms.all;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
silvanshade silvanshade
thoughtpolice thoughtpolice
tmarkus tmarkus
]; ];
}; };
} })

View File

@ -8,7 +8,7 @@
bzip2, bzip2,
zstd, zstd,
spdlog, spdlog,
tbb_2022_0, tbb_2022,
openssl, openssl,
boost, boost,
libpqxx, libpqxx,
@ -32,7 +32,7 @@ let
cp -r ${rapidcheck.dev}/* $out cp -r ${rapidcheck.dev}/* $out
''; '';
catch2 = catch2_3; catch2 = catch2_3;
tbb = tbb_2022_0; tbb = tbb_2022;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tiledb"; pname = "tiledb";

View File

@ -22,7 +22,7 @@
eigen, eigen,
gtest, gtest,
pybind11, pybind11,
tbb_2022_0, tbb_2022,
# tests # tests
pytestCheckHook, pytestCheckHook,
@ -75,7 +75,7 @@ buildPythonPackage rec {
gtest gtest
pybind11 pybind11
units-llnl.passthru.top-level units-llnl.passthru.top-level
tbb_2022_0 tbb_2022
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -6102,7 +6102,6 @@ with pkgs;
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_11 = callPackage ../development/libraries/tbb { }; tbb_2021_11 = callPackage ../development/libraries/tbb { };
tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
# many packages still fail with latest version # many packages still fail with latest version
tbb = tbb_2020_3; tbb = tbb_2020_3;