gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tbb: tbb_2020 -> tbb_2022; tbb_2020: drop; onetbb: rename from tbb_2022 (#442977)

Browse Source
This commit is contained in:
Emily
2025-09-16 02:30:30 +01:00
committed by GitHub
parent 5c46a967a6 66e1a70fef
commit b467b719bd
77 changed files with 165 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/pymeshlab/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
boost,
mpfr,
xercesc,
tbb,
onetbb,
embree,
vcg,
libigl,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
mpfr
xercesc
tbb
onetbb
embree
vcg
libigl
pkgs/applications/misc/prusa-slicer/default.nix
+3 -4
View File
@@ -27,7 +27,7 @@
opencascade-occt_7_6_1,
openvdb,
qhull,
tbb_2022,
onetbb,
wxGTK32,
xorg,
libbgcode,
@@ -54,7 +54,6 @@ let
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
};
});
openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };
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;
@@ -122,9 +121,9 @@ stdenv.mkDerivation (finalAttrs: {
nanosvg-fltk
nlopt
opencascade-override'
openvdb_tbb_2022
openvdb
qhull
tbb_2022
onetbb
wxGTK-override'
xorg.libX11
libbgcode
pkgs/build-support/appimage/default.nix
+1 -1
View File
@@ -203,7 +203,7 @@ rec {
glew110
openssl
libidn
tbb
onetbb
wayland
libgbm
libxkbcommon
pkgs/by-name/ad/adaptivecpp/tests.nix
+2 -2
View File
@@ -9,7 +9,7 @@
# Not setting an explicit target makes it default to the generic target.
targets ? null,
enablePstlTests ? false,
tbb,
onetbb,
cmake,
boost,
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
tbb
onetbb
];
buildInputs = [ boost ];
pkgs/by-name/au/autotier/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
boost,
fuse3,
lib45d,
tbb_2022,
onetbb,
liburing,
installShellFiles,
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
fuse3
lib45d
tbb_2022
onetbb
liburing
];
pkgs/by-name/ba/bambu-studio/package.nix
+2 -2
View File
@@ -34,7 +34,7 @@
opencv,
pcre,
systemd,
tbb_2022,
onetbb,
webkitgtk_4_1,
wxGTK31,
xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
opencascade-occt_7_6
openvdb
pcre
tbb_2022
onetbb
webkitgtk_4_1
wxGTK'
xorg.libX11
pkgs/by-name/ba/basalt-monado/package.nix
+2 -2
View File
@@ -20,7 +20,7 @@
opencv,
pkg-config,
stdenv,
tbb,
onetbb,
xorg,
cudaPackages,
enableCuda ? config.cudaSupport,
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
lz4
magic-enum
opencv.cxxdev
tbb
onetbb
xorg.libX11
]
++ lib.optionals enableCuda [
pkgs/by-name/bl/blender/package.nix
+5 -7
View File
@@ -74,7 +74,7 @@
spaceNavSupport ? stdenv.hostPlatform.isLinux,
sse2neon,
stdenv,
tbb_2022,
onetbb,
vulkan-headers,
vulkan-loader,
wayland,
@@ -112,8 +112,6 @@ let
tag = "v8.0.0";
hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY=";
};
tbb = tbb_2022;
in
stdenv'.mkDerivation (finalAttrs: {
@@ -262,20 +260,20 @@ stdenv'.mkDerivation (finalAttrs: {
openexr
openimageio
openjpeg
(openpgl.override { inherit tbb; })
openpgl
(opensubdiv.override { inherit cudaSupport; })
(openvdb.override { inherit tbb; })
openvdb
potrace
pugixml
python3
python3Packages.materialx
tbb
onetbb
zlib
zstd
]
++ lib.optional embreeSupport embree
++ lib.optional hipSupport rocmPackages.clr
++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
++ (
if (!stdenv.hostPlatform.isDarwin) then
[
pkgs/by-name/bo/bowtie2/package.nix
+2 -2
View File
@@ -5,7 +5,7 @@
cmake,
perl,
python3,
tbb,
onetbb,
zlib,
runCommand,
bowtie2,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [
tbb
onetbb
zlib
python3
perl
pkgs/by-name/br/brickstore/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
gst_all_1,
cmake,
libglvnd,
tbb,
onetbb,
ninja,
pkg-config,
}:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
qt6.qtwayland
qt6.wrapQtAppsHook
tbb
onetbb
];
patches = [
pkgs/by-name/ca/cabinpkg/package.nix
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
tbb_2022,
onetbb,
libgit2,
curl,
fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libgit2
fmt
tbb_2022
onetbb
nlohmann_json
curl
];
pkgs/by-name/cl/cloudcompare/package.nix
+2 -2
View File
@@ -15,7 +15,7 @@
mpfr,
pcl,
libsForQt5,
tbb,
onetbb,
xercesc,
wrapGAppsHook3,
}:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
libsForQt5.qtbase
libsForQt5.qtsvg
libsForQt5.qttools
tbb
onetbb
xercesc
];
pkgs/by-name/co/cortex-command-community-project/package.nix
+2 -2
View File
@@ -16,7 +16,7 @@
pkg-config,
SDL2,
SDL2_image,
tbb,
onetbb,
}:
stdenv.mkDerivation rec {
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
luajit
minizip
SDL2_image
tbb
onetbb
];
passthru.updateScript = nix-update-script { };
pkgs/by-name/cu/curv/package.nix
+2 -2
View File
@@ -11,7 +11,7 @@
libGL,
libpng,
openexr,
tbb,
onetbb,
xorg,
ilmbase,
llvmPackages,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
libGL
libpng
openexr
tbb
onetbb
xorg.libX11
xorg.libXcursor
xorg.libXext
pkgs/by-name/ea/easyeffects/package.nix
+2 -2
View File
@@ -35,7 +35,7 @@
rubberband,
soundtouch,
speexdsp,
tbb,
onetbb,
wrapGAppsHook4,
zam-plugins,
zita-convolver,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
rubberband
soundtouch
speexdsp'
tbb
onetbb
zita-convolver
];
pkgs/by-name/el/elmerfem/package.nix
+2 -2
View File
@@ -12,7 +12,7 @@
libGLU,
opencascade-occt,
qt6Packages,
tbb,
onetbb,
vtkWithQt6,
llvmPackages,
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
libGL
libGLU
opencascade-occt
tbb
onetbb
vtkWithQt6
]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
pkgs/by-name/en/envision/package.nix
+1 -1
View File
@@ -63,7 +63,7 @@ buildFHSEnv {
libepoxy
lz4
lz4.dev
tbb
onetbb
libxkbcommon
librealsense
boost
pkgs/by-name/f3/f3d/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
gzip,
libXt,
openusd,
tbb,
onetbb,
vtk,
autoPatchelfHook,
python3Packages,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withUsd [
libXt
openusd
tbb
onetbb
];
cmakeFlags = [
pkgs/by-name/ho/houdini/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ buildFHSEnv {
libdrm
libxkbcommon
libudev0-shim
tbb
onetbb
xwayland
qt5.qtwayland
net-tools # needed by licensing tools
pkgs/by-name/is/ispc/package.nix
+2 -2
View File
@@ -10,7 +10,7 @@
flex,
llvmPackages,
ncurses,
tbb,
onetbb,
# the default test target is sse4, but that is not supported by all Hydra agents
testedTargets ?
if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
flex
python3
llvmPackages.libllvm.dev
tbb
onetbb
];
buildInputs = with llvmPackages; [
pkgs/by-name/ka/kaminpar/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
numactl,
mpi,
sparsehash,
tbb_2022,
onetbb,
gtest,
mpiCheckPhaseHook,
}:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
mpi
sparsehash
tbb_2022
onetbb
];
cmakeFlags = [
pkgs/by-name/li/libblake3/package.nix
+2 -2
View File
@@ -4,7 +4,7 @@
cmake,
fetchFromGitHub,
fetchpatch,
tbb_2022,
onetbb,
useTBB ? true,
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = lib.optionals useTBB [
tbb_2022
onetbb
];
cmakeFlags = [
pkgs/by-name/li/libloot/package.nix
+2 -2
View File
@@ -18,7 +18,7 @@
gtest,
icu,
spdlog,
tbb_2022,
onetbb,
yaml-cpp,
}:
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
gtest
icu
spdlog
tbb_2022
onetbb
finalAttrs.passthru.yaml-cpp # has merge-key support
finalAttrs.passthru.libloadorder
pkgs/by-name/ma/manifold/package.nix
+2 -3
View File
@@ -6,7 +6,7 @@
clipper2,
gtest,
glm,
tbb_2022,
onetbb,
python3Packages,
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gtest
glm
tbb_2022
onetbb
];
propagatedBuildInputs = [ clipper2 ];
@@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
tbb = tbb_2022;
tests = {
python = python3Packages.manifold3d;
};
pkgs/by-name/me/meshlab-unstable/package.nix
+2 -2
View File
@@ -17,7 +17,7 @@
boost,
mpfr,
xercesc,
tbb,
onetbb,
embree,
libigl,
corto,
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
boost
mpfr
xercesc
tbb
onetbb
embree
libigl
corto
pkgs/by-name/me/meshlab/package.nix
+2 -2
View File
@@ -17,7 +17,7 @@
boost,
mpfr,
xercesc,
tbb,
onetbb,
embree,
vcg,
libigl,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
boost
mpfr
xercesc
tbb
onetbb
embree
vcg
libigl
pkgs/by-name/mi/mirtk/package.nix
+12 -5
View File
@@ -10,18 +10,18 @@
fltk,
vtk,
zlib,
tbb,
onetbb,
}:
stdenv.mkDerivation {
pname = "mirtk";
version = "unstable-2022-07-22";
version = "2.0.0-unstable-2025-02-27";
src = fetchFromGitHub {
owner = "BioMedIA";
repo = "MIRTK";
rev = "973ce2fe3f9508dec68892dbf97cca39067aa3d6";
hash = "sha256-vKgkDrbyGOcbaYlxys1duC8ZNG0Y2nqh3TtSQ06Ox0Q=";
rev = "ef71a176c120447b3f95291901af7af8b4f00544";
hash = "sha256-77Om/+qApt9AiSYbaPc2QNh+RKcYajobD7VDhvPtf/I=";
fetchSubmodules = true;
};
@@ -41,6 +41,13 @@ stdenv.mkDerivation {
# unclear if specific to Nixpkgs
doCheck = false;
postPatch = ''
# Their old `FindTBB` module conflicts with others.
rm CMake/Modules/FindTBB.cmake
substituteInPlace CMake/Modules/CMakeLists.txt \
--replace-fail '"FindTBB.cmake"' ""
'';
postInstall = ''
install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk
'';
@@ -54,7 +61,7 @@ stdenv.mkDerivation {
fltk
libGLU
python3
tbb
onetbb
vtk
zlib
];
pkgs/by-name/mo/mold/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
cmake,
mimalloc,
ninja,
tbb_2022,
onetbb,
zlib,
zstd,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
tbb_2022
onetbb
zlib
zstd
]
pkgs/by-name/na/naja/package.nix
+2 -2
View File
@@ -11,7 +11,7 @@
pkg-config,
python3,
sphinx,
tbb_2022,
onetbb,
buildPackages,
nix-update-script,
}:
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
capnproto # cmake modules
flex # include dir
tbb_2022
onetbb
python3
];
pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch → pkgs/by-name/on/onetbb/fix-32-bit-powerpc-build.patch
View File
pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch → pkgs/by-name/on/onetbb/fix-libtbbmalloc-dlopen.patch
View File
pkgs/by-name/tb/tbb_2022/fix-musl-build.patch → pkgs/by-name/on/onetbb/fix-musl-build.patch
View File
pkgs/by-name/tb/tbb_2022/package.nix → pkgs/by-name/on/onetbb/package.nix
+7 -9
View File
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tbb";
pname = "onetbb";
version = "2022.2.0";
outputs = [
@@ -73,16 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
description = "oneAPI Threading Building Blocks";
homepage = "https://uxlfoundation.github.io/oneTBB/";
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
take advantage of multi-core processor performance without having to be a
threading expert. Intel TBB is not just a threads-replacement library. It
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
oneAPI Threading Building Blocks (oneTBB) is a runtime-based
parallel programming model for C++ code that uses tasks. The
template-based runtime library can help you harness the latent
performance of multi-core processors.
'';
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
pkgs/by-name/op/openimagedenoise/package.nix
+4 -4
View File
@@ -8,7 +8,7 @@
lib,
python3,
stdenv,
tbb,
onetbb,
xcodebuild,
}:
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
buildInputs = [
tbb
onetbb
]
++ lib.optionals cudaSupport [
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport)
(lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include")
(lib.cmakeFeature "TBB_ROOT" "${tbb}")
(lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include")
(lib.cmakeFeature "TBB_ROOT" "${onetbb}")
];
meta = {
pkgs/by-name/op/openpgl/package.nix
+3 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
ninja,
stdenv,
tbb,
onetbb,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
tbb
onetbb
];
cmakeFlags = [
"-DOPENPGL_BUILD_STATIC=OFF"
"-DTBB_ROOT=${tbb.out}"
"-DTBB_ROOT=${onetbb.out}"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (
pkgs/by-name/op/openscad-unstable/package.nix
+2 -2
View File
@@ -34,7 +34,7 @@
mesa,
mpfr,
python3,
tbb_2022,
onetbb,
wayland,
wayland-protocols,
wrapGAppsHook3,
@@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec {
[
clipper2
glm
tbb_2022
onetbb
mimalloc
boost
cairo
pkgs/by-name/op/openturns/package.nix
+2 -2
View File
@@ -17,7 +17,7 @@
spectra,
stdenv,
swig,
tbb,
onetbb,
# Boolean flags
runTests ? false, # tests take an hour to build on a 48-core machine
enablePython ? false,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
pagmo2
spectra
swig
tbb
onetbb
]
++ lib.optionals enablePython [
python3Packages.dill
pkgs/by-name/op/openvdb/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
boost,
jemalloc,
c-blosc,
tbb,
onetbb,
zlib,
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost
tbb
onetbb
jemalloc
c-blosc
zlib
pkgs/by-name/op/openvino/package.nix
+2 -2
View File
@@ -28,7 +28,7 @@
protobuf,
pugixml,
snappy,
tbb_2022,
onetbb,
cudaPackages,
}:
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
opencv
pugixml
snappy
tbb_2022
onetbb
]
++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart
pkgs/by-name/or/orca-slicer/package.nix
+2 -2
View File
@@ -34,7 +34,7 @@
opencv,
pcre,
systemd,
tbb_2022,
onetbb,
webkitgtk_4_1,
wxGTK31,
xorg,
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
opencascade-occt_7_6
openvdb
pcre
tbb_2022
onetbb
webkitgtk_4_1
wxGTK'
xorg.libX11
pkgs/by-name/os/osrm-backend/package.nix
+2 -5
View File
@@ -10,14 +10,11 @@
boost,
lua,
luabind,
tbb_2022,
onetbb,
expat,
nixosTests,
}:
let
tbb = tbb_2022;
in
stdenv.mkDerivation rec {
pname = "osrm-backend";
version = "6.0.0";
@@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
boost
lua
luabind
tbb
onetbb
expat
];
pkgs/by-name/pa/pagmo2/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
nlopt,
ipopt,
boost,
tbb,
onetbb,
# tests pass but take 30+ minutes
runTests ? false,
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
eigen
nlopt
boost
tbb
onetbb
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt;
pkgs/by-name/pa/papilo/package.nix
+3 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
cmake,
boost,
tbb_2022,
onetbb,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
cmake
tbb_2022
onetbb
];
propagatedBuildInputs = [ tbb_2022 ];
propagatedBuildInputs = [ onetbb ];
strictDeps = true;
pkgs/by-name/pd/pdf4qt/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
qt6,
wrapGAppsHook3,
openjpeg,
tbb_2022,
onetbb,
blend2d,
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qtspeech
lcms
openjpeg
tbb_2022
onetbb
blend2d
];
pkgs/by-name/po/potreeconverter/package.nix
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
cmake,
boost,
tbb,
onetbb,
makeWrapper,
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = [
boost
tbb
onetbb
];
nativeBuildInputs = [
pkgs/by-name/ro/root/package.nix
+2 -2
View File
@@ -46,7 +46,7 @@
patchRcPathCsh,
patchRcPathFish,
patchRcPathPosix,
tbb_2022,
onetbb,
xrootd,
}:
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
patchRcPathPosix
pcre2
python3
tbb_2022
onetbb
xrootd
xxHash
xz
pkgs/by-name/sa/salmon/package.nix
+2 -2
View File
@@ -13,7 +13,7 @@
libiconv,
libstaden-read,
pkg-config,
tbb_2022,
onetbb,
xz,
zlib,
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
jemalloc
libgff
libstaden-read
tbb_2022
onetbb
xz
zlib
]
pkgs/by-name/sc/scipopt-papilo/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
boost,
blas,
gmp,
tbb_2022,
onetbb,
gfortran,
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
gmp
gfortran
boost
tbb_2022
onetbb
];
cmakeFlags = [
pkgs/by-name/sc/scipopt-scip/package.nix
+2 -2
View File
@@ -11,7 +11,7 @@
scipopt-papilo,
scipopt-zimpl,
ipopt,
tbb_2022,
onetbb,
boost,
gfortran,
criterion,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gmp
readline
zlib
tbb_2022
onetbb
boost
gfortran
criterion
pkgs/by-name/su/supercell-wx/package.nix
+2 -2
View File
@@ -24,7 +24,7 @@
gtest,
glm,
qt6,
tbb_2022,
onetbb,
tracy,
replaceVars,
python3,
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
aws-sdk-cpp
howard-hinnant-date
boost
tbb_2022
onetbb
glew
geos
spdlog
pkgs/by-name/tb/tbb_2020/package.nix
-122
View File
@@ -1,122 +0,0 @@
{
lib,
stdenv,
fetchpatch,
fetchurl,
fetchFromGitHub,
fixDarwinDylibNames,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tbb";
version = "2020.3.3";
outputs = [
"out"
"dev"
];
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
tag = "v${finalAttrs.version}";
hash = "sha256-pCZpQ+t7dDzuS4vhlfSVLwieI0iSQHukXb8Nk5kMMBo=";
};
patches = [
# Fixes build with Musl.
(fetchpatch {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch";
hash = "sha256-Oo5FSBPPBaOziWEBOlRmTmbulExMsAmQWBR5faOj1a0=";
})
# Fixes build with Musl.
(fetchpatch {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
hash = "sha256-xp8J/il855VTFIKCN/bFtf+vif6HzcVl4t4/L9nW/xk=";
})
# Fixes build for aarch64-darwin
(fetchpatch {
name = "aarch64-darwin.patch";
url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch";
hash = "sha256-+sNU8yEsVVmQYOCKmlNiyJfKmB/U0GKAmrydwkfrDFQ=";
})
];
nativeBuildInputs = (
lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
]
);
makeFlags =
lib.optionals stdenv.cc.isClang [
"compiler=clang"
]
++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (
if stdenv.hostPlatform.isAarch64 then
"arch=arm64"
else if stdenv.hostPlatform.isx86_64 then
"arch=intel64"
else if stdenv.hostPlatform.isi686 then
"arch=ia32"
else
throw "Unsupported cross architecture"
));
# Fix undefined reference errors with version script under LLVM.
NIX_LDFLAGS = lib.optionalString (
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
) "--undefined-version";
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
mv include $out/
rm $out/include/index.html
runHook postInstall
'';
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 = {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
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
take advantage of multi-core processor performance without having to be a
threading expert. Intel TBB is not just a threads-replacement library. It
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
silvanshade
thoughtpolice
tmarkus
];
};
})
pkgs/by-name/ti/tiledb/package.nix
+3 -4
View File
@@ -9,7 +9,7 @@
bzip2,
zstd,
spdlog,
tbb_2022,
onetbb,
openssl,
boost,
libpqxx,
@@ -35,7 +35,6 @@ let
cp -r ${rapidcheck.dev}/* $out
'';
catch2 = catch2_3;
tbb = tbb_2022;
in
stdenv.mkDerivation rec {
pname = "tiledb";
@@ -100,7 +99,7 @@ stdenv.mkDerivation rec {
bzip2
zstd
spdlog
tbb
onetbb
openssl
boost
libpqxx
@@ -135,7 +134,7 @@ stdenv.mkDerivation rec {
];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib
install_name_tool -add_rpath ${onetbb}/lib $out/lib/libtiledb.dylib
'';
meta = {
pkgs/by-name/to/todds/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
fmt,
hyperscan,
opencv,
tbb_2022,
onetbb,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
fmt
hyperscan
opencv
tbb_2022
onetbb
];
strictDeps = true;
pkgs/by-name/tr/tracy/package.nix
+2 -2
View File
@@ -12,7 +12,7 @@
dbus,
freetype,
glfw,
tbb,
onetbb,
withGtkFileSelector ? false,
gtk3,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [
capstone
freetype
tbb
onetbb
]
++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
pkgs/by-name/ue/ueberzugpp/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
openssl,
zeromq,
cppzmq,
tbb_2022,
onetbb,
spdlog,
libsodium,
fmt,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
openssl
zeromq
cppzmq
tbb_2022
onetbb
spdlog
libsodium
fmt
pkgs/by-name/vi/viskores/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
cmake,
ninja,
llvmPackages,
tbb,
onetbb,
mpi,
mpiSupport ? true,
testers,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
];
propagatedBuildInputs = [
tbb
onetbb
]
++ lib.optional mpiSupport mpi
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
pkgs/by-name/we/webex/package.nix
+2 -2
View File
@@ -50,7 +50,7 @@
xcbutilrenderutil,
xcbutilwm,
p7zip,
tbb,
onetbb,
wayland,
libXScrnSaver,
}:
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
tbb
onetbb
wayland
];
pkgs/development/libraries/cctag/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
boost,
eigen,
opencv,
tbb,
onetbb,
avx2Support ? stdenv.hostPlatform.avx2Support,
}:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
tbb
onetbb
];
buildInputs = [
pkgs/development/libraries/embree/2.x.nix
-71
View File
@@ -1,71 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
ispc,
tbb_2020,
glfw,
openimageio,
libjpeg,
libpng,
libpthreadstubs,
libX11,
python3Packages,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "embree";
version = "2.17.7";
src = fetchFromGitHub {
owner = "embree";
repo = "embree";
tag = "v${finalAttrs.version}";
hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc=";
};
cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
ispc
# tbb_2022 is not backward compatible
tbb_2020
glfw
openimageio
libjpeg
libpng
libX11
libpthreadstubs
];
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(2.*)"
];
};
tbb = tbb_2020;
tests = {
inherit (python3Packages) embreex;
};
};
meta = with lib; {
description = "High performance ray tracing kernels from Intel";
homepage = "https://embree.github.io/";
maintainers = with maintainers; [
hodapp
pbsds
];
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
};
})
pkgs/development/libraries/embree/default.nix
+4 -4
View File
@@ -5,7 +5,7 @@
cmake,
pkg-config,
ispc,
tbb,
onetbb,
glfw,
openimageio,
libjpeg,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DEMBREE_TUTORIALS=OFF"
"-DEMBREE_RAY_MASK=ON"
"-DTBB_ROOT=${tbb}"
"-DTBB_INCLUDE_DIR=${tbb.dev}/include"
"-DTBB_ROOT=${onetbb}"
"-DTBB_INCLUDE_DIR=${onetbb.dev}/include"
];
nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
cmake
];
buildInputs = [
tbb
onetbb
glfw
openimageio
libjpeg
pkgs/development/libraries/opencv/4.x.nix
+2 -2
View File
@@ -69,7 +69,7 @@
tesseract,
leptonica,
enableTbb ? false,
tbb,
onetbb,
enableOvis ? false,
ogre,
enableGPhoto2 ? false,
@@ -406,7 +406,7 @@ effectiveStdenv.mkDerivation {
leptonica
]
++ optionals enableTbb [
tbb
onetbb
]
++ optionals effectiveStdenv.hostPlatform.isDarwin [
bzip2
pkgs/development/libraries/vtk/generic.nix
+2 -3
View File
@@ -69,7 +69,7 @@
opencascade-occt,
# threading
tbb,
onetbb,
llvmPackages,
# rendering
@@ -108,7 +108,6 @@ let
throw ''qtVersion must be "5", "6" or null'';
vtkPackages = lib.makeScope newScope (self: {
inherit
tbb
mpi
mpiSupport
python3Packages
@@ -205,13 +204,13 @@ stdenv.mkDerivation (finalAttrs: {
libtheora
cli11
openslide
onetbb
vtkPackages.hdf5
vtkPackages.cgns
vtkPackages.adios2
vtkPackages.netcdf
vtkPackages.catalyst
vtkPackages.viskores
vtkPackages.tbb
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
pkgs/development/python-modules/cgal/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
cgal,
cmake,
gmp,
tbb,
onetbb,
LAStools,
eigen,
mpfr,
@@ -45,7 +45,7 @@ buildPythonPackage rec {
mpfr
boost
zlib
tbb
onetbb
eigen
]
++ lib.optionals withLAS [
pkgs/development/python-modules/embreex/default.nix
-72
View File
@@ -1,72 +0,0 @@
{
lib,
fetchFromGitHub,
fetchpatch,
buildPythonPackage,
embree2,
cython,
numpy,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "embreex";
version = "2.17.7.post6";
pyproject = true;
src = fetchFromGitHub {
owner = "trimesh";
repo = "embreex";
tag = version;
hash = "sha256-iLIfhngorSFOdkOvlCAJQXGQrVuRfBSDGzvjXOlQuHk=";
};
patches = [
# https://github.com/trimesh/embreex/pull/7
(fetchpatch {
name = "fix-use-after-free.patch";
url = "https://github.com/trimesh/embreex/commit/c6b047285419f8986fae962e2734a01522be7ef7.patch";
hash = "sha256-s8x2vsqbsIR3aoNUDrYs2vQttuNY8lLJ6TC7H8FMRyQ=";
})
];
build-system = [
setuptools
numpy
cython
];
dependencies = [
numpy
];
buildInputs = [
embree2
embree2.tbb
];
pythonImportsCheck = [
"embreex"
"embreex.mesh_construction"
"embreex.rtcore"
"embreex.rtcore_scene"
"embreex.triangles"
];
preCheck = ''
# conflicts with $out
rm -rf embreex/
'';
nativeCheckInputs = [ pytestCheckHook ];
meta = {
description = "Maintained PyEmbree fork, wrapper for Embree v2";
homepage = "https://github.com/trimesh/embreex";
changelog = "https://github.com/trimesh/embreex/releases/tag/${src.tag}";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ pbsds ];
inherit (embree2.meta) platforms;
};
}
pkgs/development/python-modules/freud/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
ninja,
# buildInputs
tbb_2022,
onetbb,
nanobind,
# dependencies
@@ -65,7 +65,7 @@ buildPythonPackage rec {
];
dontUseCmakeConfigure = true;
buildInputs = [
tbb_2022
onetbb
nanobind
];
pkgs/development/python-modules/gudhi/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
gmp,
cgal,
mpfr,
tbb,
onetbb,
numpy,
cython,
pybind11,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
cgal
mpfr
]
++ lib.optionals enableTBB [ tbb ];
++ lib.optionals enableTBB [ onetbb ];
propagatedBuildInputs = [
numpy
scipy
pkgs/development/python-modules/manifold3d/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
pkg-config,
numpy,
clipper2,
tbb,
onetbb,
pytestCheckHook,
trimesh,
}:
@@ -36,7 +36,7 @@ buildPythonPackage rec {
];
buildInputs = [
tbb
onetbb
clipper2
];
pkgs/development/python-modules/openusd/default.nix
+2 -2
View File
@@ -33,7 +33,7 @@
python,
qt6,
setuptools,
tbb,
onetbb,
withDocs ? false,
withOsl ? true,
withTools ? false,
@@ -126,7 +126,7 @@ buildPythonPackage rec {
opencolorio
openimageio
ptex
tbb
onetbb
]
++ lib.optionals stdenv.hostPlatform.isLinux [
libX11
pkgs/development/python-modules/scipp/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
eigen,
gtest,
pybind11,
tbb_2022,
onetbb,
# tests
pytestCheckHook,
@@ -75,7 +75,7 @@ buildPythonPackage rec {
gtest
pybind11
units-llnl.passthru.top-level
tbb_2022
onetbb
];
nativeCheckInputs = [
pkgs/development/python-modules/trimesh/default.nix
+1 -4
View File
@@ -24,7 +24,6 @@
scipy,
pillow,
mapbox-earcut,
embreex,
}:
buildPythonPackage rec {
@@ -63,9 +62,7 @@ buildPythonPackage rec {
pillow
# vhacdx # not packaged
mapbox-earcut
]
++ lib.optionals embreex.meta.available [
embreex
# embreex # not packaged
];
};
pkgs/development/python-modules/umap-learn/default.nix
+4 -1
View File
@@ -73,7 +73,10 @@ buildPythonPackage rec {
tensorflow-probability
];
tbb = [ tbb ];
tbb = [
# Not packaged.
#tbb
];
all = plot ++ parametric_umap ++ tbb;
};
pkgs/games/vcmi/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
python3,
qtbase,
qttools,
tbb,
onetbb,
unshield,
wrapQtAppsHook,
xz,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
minizip
qtbase
qttools
tbb
onetbb
xz
zlib
];
pkgs/os-specific/linux/sysdig/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
jq,
gcc,
elfutils,
tbb,
onetbb,
protobuf,
grpc,
yaml-cpp,
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
openssl
curl
jq
tbb
onetbb
re2
protobuf
grpc
pkgs/top-level/aliases.nix
+5 -1
View File
@@ -828,6 +828,7 @@ mapAliases {
emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
emacsPackages = emacs.pkgs; # Added 2025-03-02
embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
EmptyEpsilon = empty-epsilon; # Added 2024-07-14
enyo-doom = enyo-launcher; # Added 2022-09-09
eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15
@@ -2385,7 +2386,10 @@ mapAliases {
taplo-lsp = taplo; # Added 2022-07-30
targetcli = targetcli-fb; # Added 2025-03-14
taro = taproot-assets; # Added 2023-07-04
tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-13
tbb = onetbb; # Added 2025-09-14
tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14
tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13
tbb_2022 = onetbb; # Added 2025-09-14
tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
tclcurl = tclPackages.tclcurl; # Added 2024-10-02
tcllib = tclPackages.tcllib; # Added 2024-10-02
pkgs/top-level/all-packages.nix
-6
View File
@@ -283,7 +283,6 @@ with pkgs;
cve = with python3Packages; toPythonApplication cvelib;
basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
tbb = tbb_2022;
cereal = cereal_1_3_2;
opencv = opencv.override { enableGtk3 = true; };
};
@@ -2762,7 +2761,6 @@ with pkgs;
);
embree = callPackage ../development/libraries/embree { };
embree2 = callPackage ../development/libraries/embree/2.x.nix { };
emborg = python3Packages.callPackage ../development/python-modules/emborg { };
@@ -5634,9 +5632,6 @@ with pkgs;
swi-prolog-gui = swi-prolog.override { withGui = true; };
# many packages still fail with latest version
tbb = tbb_2020;
teyjus = callPackage ../development/compilers/teyjus {
inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;
};
@@ -7281,7 +7276,6 @@ with pkgs;
cctag = callPackage ../development/libraries/cctag {
stdenv = clangStdenv;
tbb = tbb_2022;
};
ceedling = callPackage ../development/tools/ceedling { };
pkgs/top-level/python-aliases.nix
+1
View File
@@ -241,6 +241,7 @@ mapAliases ({
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
EasyProcess = easyprocess; # added 2023-02-19
email_validator = email-validator; # added 2022-06-22
embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15
enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06
pkgs/top-level/python-packages.nix
+1 -5
View File
@@ -4691,8 +4691,6 @@ self: super: with self; {
embrace = callPackage ../development/python-modules/embrace { };
embreex = callPackage ../development/python-modules/embreex { };
emcee = callPackage ../development/python-modules/emcee { };
emoji = callPackage ../development/python-modules/emoji { };
@@ -8960,9 +8958,7 @@ self: super: with self; {
callPackage ../development/python-modules/marionette-harness/manifestparser.nix
{ };
manifold3d = callPackage ../development/python-modules/manifold3d {
inherit (pkgs.manifold.passthru) tbb;
};
manifold3d = callPackage ../development/python-modules/manifold3d { };
manim = callPackage ../development/python-modules/manim { };