diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix index 85b095bb6131..9b9cfac2a474 100644 --- a/pkgs/by-name/ka/kaminpar/package.nix +++ b/pkgs/by-name/ka/kaminpar/package.nix @@ -7,7 +7,7 @@ numactl, mpi, sparsehash, - tbb_2022_0, + tbb_2022, gtest, mpiCheckPhaseHook, }: @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ mpi sparsehash - tbb_2022_0 + tbb_2022 ]; cmakeFlags = [ diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index f9e834519c61..ec88f0ce9394 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -7,7 +7,7 @@ cmake, mimalloc, ninja, - tbb_2022_0, + tbb_2022, zlib, zstd, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - tbb_2022_0 + tbb_2022 zlib zstd ] diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index f8a2a0f7be6f..95a5bdc79609 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -34,7 +34,7 @@ mesa, mpfr, python3, - tbb_2022_0, + tbb_2022, wayland, wayland-protocols, wrapGAppsHook3, @@ -79,7 +79,7 @@ clangStdenv.mkDerivation rec { [ clipper2 glm - tbb_2022_0 + tbb_2022 mimalloc boost cairo diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 56c51de76b72..9dadda3bea97 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -28,7 +28,7 @@ protobuf, pugixml, snappy, - tbb_2022_0, + tbb_2022, cudaPackages, }: @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { opencv pugixml snappy - tbb_2022_0 + tbb_2022 ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index de9207b66365..accbb1f514c7 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -10,13 +10,13 @@ boost, lua, luabind, - tbb_2022_0, + tbb_2022, expat, nixosTests, }: let - tbb = tbb_2022_0; + tbb = tbb_2022; in stdenv.mkDerivation rec { pname = "osrm-backend"; diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 1813f0a236a1..79a4912f533d 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, boost, - tbb_2022_0, + tbb_2022, }: stdenv.mkDerivation (finalAttrs: { @@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost cmake - tbb_2022_0 + tbb_2022 ]; - propagatedBuildInputs = [ tbb_2022_0 ]; + propagatedBuildInputs = [ tbb_2022 ]; strictDeps = true; diff --git a/pkgs/development/libraries/tbb/2022_0.nix b/pkgs/by-name/tb/tbb_2022/package.nix similarity index 93% rename from pkgs/development/libraries/tbb/2022_0.nix rename to pkgs/by-name/tb/tbb_2022/package.nix index bf7522d5c34d..178019a9d6ad 100644 --- a/pkgs/development/libraries/tbb/2022_0.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -7,7 +7,7 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbb"; version = "2022.0.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A="; }; @@ -71,10 +71,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; - license = licenses.asl20; + 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 @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ silvanshade thoughtpolice tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index e31a44de573c..8b68590dfb6f 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -8,7 +8,7 @@ bzip2, zstd, spdlog, - tbb_2022_0, + tbb_2022, openssl, boost, libpqxx, @@ -32,7 +32,7 @@ let cp -r ${rapidcheck.dev}/* $out ''; catch2 = catch2_3; - tbb = tbb_2022_0; + tbb = tbb_2022; in stdenv.mkDerivation rec { pname = "tiledb"; diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index 9cfb79fe914a..1a8d5c800759 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -22,7 +22,7 @@ eigen, gtest, pybind11, - tbb_2022_0, + tbb_2022, # tests pytestCheckHook, @@ -75,7 +75,7 @@ buildPythonPackage rec { gtest pybind11 units-llnl.passthru.top-level - tbb_2022_0 + tbb_2022 ]; nativeCheckInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254403a5c8f0..9bc18e9c72c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6102,7 +6102,6 @@ with pkgs; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.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;