treewide: tbb_2021 -> tbb_2022
Everything that built with `tbb_2021` builds successfully with `tbb_2022` on `aarch64-linux`, and `tbb_2022` no longer causes crashes on Darwin.
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
opencascade-occt_7_6_1,
|
||||
openvdb,
|
||||
qhull,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
wxGTK32,
|
||||
xorg,
|
||||
libbgcode,
|
||||
@@ -54,7 +54,7 @@ let
|
||||
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
|
||||
};
|
||||
});
|
||||
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };
|
||||
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 +122,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nanosvg-fltk
|
||||
nlopt
|
||||
opencascade-override'
|
||||
openvdb_tbb_2021_8
|
||||
openvdb_tbb_2022
|
||||
qhull
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
wxGTK-override'
|
||||
xorg.libX11
|
||||
libbgcode
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
boost,
|
||||
fuse3,
|
||||
lib45d,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
liburing,
|
||||
installShellFiles,
|
||||
}:
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
fuse3
|
||||
lib45d
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
liburing
|
||||
];
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
opencv,
|
||||
pcre,
|
||||
systemd,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
webkitgtk_4_1,
|
||||
wxGTK31,
|
||||
xorg,
|
||||
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencascade-occt_7_6
|
||||
openvdb
|
||||
pcre
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
webkitgtk_4_1
|
||||
wxGTK'
|
||||
xorg.libX11
|
||||
|
||||
@@ -257,7 +257,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
libsndfile
|
||||
libtiff
|
||||
libwebp
|
||||
(manifold.override { tbb_2021 = tbb; })
|
||||
manifold
|
||||
opencolorio
|
||||
openexr
|
||||
openimageio
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
libgit2,
|
||||
curl,
|
||||
fmt,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libgit2
|
||||
fmt
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
nlohmann_json
|
||||
curl
|
||||
];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
|
||||
useTBB ? true,
|
||||
}:
|
||||
@@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals useTBB [
|
||||
# 2022.0 crashes on macOS at the moment
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
gtest,
|
||||
icu,
|
||||
spdlog,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtest
|
||||
icu
|
||||
(spdlog.override { fmt = fmt_11; })
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
|
||||
finalAttrs.passthru.yaml-cpp # has merge-key support
|
||||
finalAttrs.passthru.libloadorder
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
clipper2,
|
||||
gtest,
|
||||
glm,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
gtest
|
||||
glm
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ clipper2 ];
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tbb = tbb_2021;
|
||||
tbb = tbb_2022;
|
||||
tests = {
|
||||
python = python3Packages.manifold3d;
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
pkg-config,
|
||||
python3,
|
||||
sphinx,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
buildPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
capnproto # cmake modules
|
||||
flex # include dir
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
python3
|
||||
];
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
opencv,
|
||||
pcre,
|
||||
systemd,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
webkitgtk_4_1,
|
||||
wxGTK31,
|
||||
xorg,
|
||||
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencascade-occt_7_6
|
||||
openvdb
|
||||
pcre
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
webkitgtk_4_1
|
||||
wxGTK'
|
||||
xorg.libX11
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
qt6,
|
||||
wrapGAppsHook3,
|
||||
openjpeg,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
blend2d,
|
||||
}:
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtspeech
|
||||
lcms
|
||||
openjpeg
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
blend2d
|
||||
];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
libiconv,
|
||||
libstaden-read,
|
||||
pkg-config,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
xz,
|
||||
zlib,
|
||||
}:
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
jemalloc
|
||||
libgff
|
||||
libstaden-read
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
xz
|
||||
zlib
|
||||
]
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
boost,
|
||||
blas,
|
||||
gmp,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
gfortran,
|
||||
}:
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
gmp
|
||||
gfortran
|
||||
boost
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
scipopt-papilo,
|
||||
scipopt-zimpl,
|
||||
ipopt,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
boost,
|
||||
gfortran,
|
||||
criterion,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
gmp
|
||||
readline
|
||||
zlib
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
boost
|
||||
gfortran
|
||||
criterion
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
gtest,
|
||||
glm,
|
||||
qt6,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
tracy,
|
||||
replaceVars,
|
||||
python3,
|
||||
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aws-sdk-cpp
|
||||
howard-hinnant-date
|
||||
boost
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
glew
|
||||
geos
|
||||
spdlog
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
fmt,
|
||||
hyperscan,
|
||||
opencv,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fmt
|
||||
hyperscan
|
||||
opencv
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
openssl,
|
||||
zeromq,
|
||||
cppzmq,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
spdlog,
|
||||
libsodium,
|
||||
fmt,
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
zeromq
|
||||
cppzmq
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
spdlog
|
||||
libsodium
|
||||
fmt
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
buildInputs = [
|
||||
ispc
|
||||
# tbb_2021 is not backward compatible
|
||||
# tbb_2022 is not backward compatible
|
||||
tbb_2020
|
||||
glfw
|
||||
openimageio
|
||||
|
||||
@@ -283,7 +283,7 @@ with pkgs;
|
||||
cve = with python3Packages; toPythonApplication cvelib;
|
||||
|
||||
basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
|
||||
tbb = tbb_2021;
|
||||
tbb = tbb_2022;
|
||||
cereal = cereal_1_3_2;
|
||||
opencv = opencv.override { enableGtk3 = true; };
|
||||
};
|
||||
@@ -6878,7 +6878,7 @@ with pkgs;
|
||||
|
||||
ikos = callPackage ../development/tools/analysis/ikos {
|
||||
inherit (llvmPackages_14) stdenv clang llvm;
|
||||
tbb = tbb_2021;
|
||||
tbb = tbb_2022;
|
||||
};
|
||||
|
||||
include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
|
||||
@@ -7348,7 +7348,7 @@ with pkgs;
|
||||
|
||||
cctag = callPackage ../development/libraries/cctag {
|
||||
stdenv = clangStdenv;
|
||||
tbb = tbb_2021;
|
||||
tbb = tbb_2022;
|
||||
};
|
||||
|
||||
ceedling = callPackage ../development/tools/ceedling { };
|
||||
|
||||
Reference in New Issue
Block a user