tbb_2021: drop

2025-09-14 03:51:09 +01:00
parent 052b3cf0e2
commit 3c792df555
2 changed files with 1 additions and 103 deletions
@@ -1,103 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  ninja,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tbb";
-  version = "2021.12.0";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  src = fetchFromGitHub {
-    owner = "oneapi-src";
-    repo = "oneTBB";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-yG/Fs+3f9hNKzZ8le+W7+JDZk9hMzPsVAzbq0yTcUTc=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-  ];
-
-  patches = [
-    # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
-      hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
-    })
-    # Fix tests on FreeBSD and Windows
-    (fetchpatch {
-      name = "fix-tbb-freebsd-and-windows-tests.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
-      hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
-    })
-    # Fix 32-bit PowerPC build
-    (fetchpatch {
-      url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch";
-      hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg=";
-    })
-  ];
-
-  patchFlags = [
-    "-p1"
-    "--ignore-whitespace"
-  ];
-
-  # 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"
-    ]
-    ++
-      # 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
-      # https://gcc.gnu.org/PR108854
-      lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ];
-
-  # 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)' ""
-  '';
-
-  enableParallelBuilding = true;
-
-  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.all;
-    maintainers = with lib.maintainers; [
-      silvanshade
-      thoughtpolice
-      tmarkus
-    ];
-  };
-})
@@ -2323,6 +2323,7 @@ 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
  tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
  tclcurl = tclPackages.tclcurl; # Added 2024-10-02
  tcllib = tclPackages.tcllib; # Added 2024-10-02