diff --git a/pkgs/by-name/tb/tbb_2020/package.nix b/pkgs/by-name/tb/tbb_2020/package.nix deleted file mode 100644 index a5d6b0fbb235..000000000000 --- a/pkgs/by-name/tb/tbb_2020/package.nix +++ /dev/null @@ -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 - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5851719a7ba8..ad3a96c2543f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2384,6 +2384,7 @@ mapAliases { taplo-lsp = taplo; # Added 2022-07-30 targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 + tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-14 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