tbb_2022_0: init at 2022.0.0; openvino: upgrade stdenv, upgrade tbb; …

…tbb_2021_5: drop (#363643)
NixOS · Dec 9, 2024 · 2ed552b · 2ed552b
2 parents 0de86d8 + 77e9ee7
commit 2ed552b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 36 deletions.
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
@@ -1,5 +1,5 @@
 { lib
-, gcc12Stdenv
+, stdenv
 , fetchFromGitHub
 , fetchurl
 , cudaSupport ? opencv.cudaSupport or false
@@ -27,7 +27,7 @@
 , protobuf
 , pugixml
 , snappy
-, tbb_2021_5
+, tbb_2022_0
 , cudaPackages
 }:
 
@@ -36,8 +36,6 @@ let
     cmakeBool
   ;
 
-  stdenv = gcc12Stdenv;
-
   # prevent scons from leaking in the default python version
   scons' = scons.override { inherit python3Packages; };
 
@@ -153,7 +151,7 @@ stdenv.mkDerivation rec {
     opencv.cxxdev
     pugixml
     snappy
-    tbb_2021_5
+    tbb_2022_0
   ] ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
   ];

diff --git a/pkgs/development/libraries/tbb/2021_5.nix → pkgs/development/libraries/tbb/2022_0.nix b/pkgs/development/libraries/tbb/2021_5.nix → pkgs/development/libraries/tbb/2022_0.nix
@@ -7,42 +7,32 @@
 
 stdenv.mkDerivation rec {
   pname = "tbb";
-  version = "2021.5.0";
+  version = "2022.0.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    rev = "v${version}";
-    hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w=";
+    tag = "v${version}";
+    hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
   };
 
   nativeBuildInputs = [
     cmake
   ];
 
   patches = [
-    # port of https://github.com/oneapi-src/oneTBB/pull/1031
-    ./gcc13-fixes-2021.5.0.patch
-
+    # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899
     (fetchpatch {
-      #  Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958)
-      url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch";
-      hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0=";
+      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
+      hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
     })
   ];
 
-  # Disable failing test on musl
-  # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
-  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
-    substituteInPlace test/CMakeLists.txt \
-      --replace-fail 'conformance_resumable_tasks' ""
-  '';
-
   # 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=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++
+  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
@@ -52,6 +42,12 @@ stdenv.mkDerivation rec {
   # 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";
 
+  # Disable failing test on musl
+  # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace test/CMakeLists.txt \
+      --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
+  '';
 
   meta = with lib; {
     description = "Intel Thread Building Blocks C++ Library";

diff --git a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -1259,6 +1259,7 @@ mapAliases {
   taplo-cli = taplo; # Added 2022-07-30
   taplo-lsp = taplo; # Added 2022-07-30
   taro = taproot-assets; # Added 2023-07-04
+  tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14";
   tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
   tclcurl = tclPackages.tclcurl; # Added 2024-10-02
   tcllib = tclPackages.tcllib; # Added 2024-10-02

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -6973,8 +6973,8 @@ with pkgs;
   swi-prolog-gui = swi-prolog.override { withGui = true; };
 
   tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
-  tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.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;