cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

tbb: 2021.8.0 -> 2021.11.0 (#301391)

Browse source 
Co-authored-by: silvanshade <silvanshade@users.noreply.github.com>
This commit is contained in:
silvanshade 2024-04-05 09:36:37 -06:00 committed by GitHub
parent 5a64777bac
commit 2d8b10e3f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/bambu-studio/default.nix
View file

@ -38,7 +38,7 @@
, pcre
, qhull
, systemd
, tbb_2021_8
, tbb_2021_11
, webkitgtk
, wxGTK31
, xorg
@ -53,7 +53,7 @@ let
];
});
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost179 tbb_2021_8 jemalloc c-blosc ilmbase ];
buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ];
});
in
stdenv.mkDerivation rec {
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
opencascade-occt
openvdb_tbb_2021_8
pcre
tbb_2021_8
tbb_2021_11
webkitgtk
wxGTK31'
xorg.libX11

6
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -27,7 +27,7 @@
, openvdb
, pcre
, qhull
, tbb_2021_8
, tbb_2021_11
, wxGTK32
, xorg
, libbgcode
@ -61,7 +61,7 @@ let
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
};
});
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_8; };
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; };
wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
in
stdenv.mkDerivation (finalAttrs: {
@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
openvdb_tbb_2021_8
pcre
qhull
tbb_2021_8
tbb_2021_11
wxGTK-override'
xorg.libX11
libbgcode

6
pkgs/by-name/op/openscad-unstable/package.nix
View file

@ -31,7 +31,7 @@
, mesa
, mpfr
, python3
, tbb_2021_8
, tbb_2021_11
, wayland
, wayland-protocols
, wrapGAppsHook
@ -51,7 +51,7 @@ let
hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ tbb_2021_8 ];
buildInputs = [ tbb_2021_11 ];
cmakeFlags = [
# only enable what we need
"-DCCCL_ENABLE_CUB=OFF"
@ -105,7 +105,7 @@ clangStdenv.mkDerivation rec {
# manifold dependencies
clipper2
glm
tbb_2021_8
tbb_2021_11
nvidia-cccl
boost

4
pkgs/by-name/pd/pdf4qt/package.nix
View file

@ -7,7 +7,7 @@
, pkg-config
, qt6
, openjpeg
, tbb_2021_8
, tbb_2021_11
}:
stdenv.mkDerivation (finalAttrs: {
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qtspeech
lcms
openjpeg
tbb_2021_8
tbb_2021_11
];
cmakeFlags = [

4
pkgs/by-name/sa/salmon/package.nix
View file

@ -13,7 +13,7 @@
, libiconv
, libstaden-read
, pkg-config
, tbb_2021_8
, tbb_2021_11
, xz
, zlib
}:
@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
jemalloc
libgff
libstaden-read
tbb_2021_8
tbb_2021_11
xz
zlib
] ++ lib.optionals stdenv.isDarwin [ libiconv ];

4
pkgs/by-name/ue/ueberzugpp/package.nix
View file

@ -6,7 +6,7 @@
, openssl
, zeromq
, cppzmq
, tbb_2021_8
, tbb_2021_11
, spdlog
, libsodium
, fmt
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
openssl
zeromq
cppzmq
tbb_2021_8
tbb_2021_11
spdlog
libsodium
fmt

22
pkgs/development/libraries/tbb/default.nix
View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "tbb";
version = "2021.8.0";
version = "2021.11.0";
outputs = [ "out" "dev" ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "oneapi-src";
repo = "oneTBB";
rev = "v${version}";
hash = "sha256-7MjUdPB1GsPt7ZkYj7DCisq20X8psljsVCjDpCSTYT4=";
hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE=";
};
nativeBuildInputs = [
@ -28,27 +28,11 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
# Fix/suppress warnings on gcc12.1 from https://github.com/oneapi-src/oneTBB/pull/866
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch";
hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c=";
})
# Fix build with GCC 13
(fetchpatch {
url = "https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch";
hash = "sha256-BVQQXgBg8T19DGw2gmFkm3KKOuzzJJNOTf/iNIcnHag=";
})
(fetchpatch {
url = "https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25.patch";
hash = "sha256-IfV/DDb0luxE1l6TofAbQIeJEVxCxZfZqcONGwQEndY=";
})
];
# Fix build with modern gcc
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" ] ++
# error: variable 'val' set but not used
lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++
# Workaround for gcc-12 ICE when using -O3

8
pkgs/top-level/all-packages.nix
View file

@ -17095,7 +17095,7 @@ with pkgs;
swiPrologWithGui = swiProlog.override { withGui = true; };
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_8 = callPackage ../development/libraries/tbb { };
tbb_2021_11 = callPackage ../development/libraries/tbb { };
# many packages still fail with latest version
tbb = tbb_2020_3;
@ -19087,7 +19087,7 @@ with pkgs;
ikos = callPackage ../development/tools/analysis/ikos {
inherit (llvmPackages_14) stdenv clang llvm;
tbb = tbb_2021_8;
tbb = tbb_2021_11;
};
img = callPackage ../development/tools/img { };
@ -19333,7 +19333,7 @@ with pkgs;
mold = callPackage ../development/tools/mold {
stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv;
tbb = tbb_2021_8;
tbb = tbb_2021_11;
};
mold-wrapped = wrapBintoolsWith {
@ -20481,7 +20481,7 @@ with pkgs;
ccrtp = callPackage ../development/libraries/ccrtp { };
cctag = callPackage ../development/libraries/cctag {
tbb = tbb_2021_8;
tbb = tbb_2021_11;
};
cctz = callPackage ../development/libraries/cctz {