diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9bc461a0c704..3ae183a1ff92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22038,6 +22038,11 @@ githubId = 91412114; keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ]; }; + silvanshade = { + github = "silvanshade"; + githubId = 11022302; + name = "silvanshade"; + }; Silver-Golden = { name = "Brendan Golden"; email = "github+nixpkgs@brendan.ie"; diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index b7965ddea4fa..68fa286d164a 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -3,26 +3,29 @@ stdenv, cmake, fetchFromGitHub, + tbb_2022_0, + useTBB ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-YJ3rRzpmF6oS8p377CEoRteARCD1lr/L7/fbN5poUXw="; + hash = "sha256-08D5hnU3I0VJ+RM/TNk2LxsEAvOLuO52+08zlKssXbc="; }; sourceRoot = finalAttrs.src.name + "/c"; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals useTBB [ tbb_2022_0 ]; cmakeFlags = [ + (lib.cmakeBool "BLAKE3_USE_TBB" useTBB) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; @@ -33,7 +36,10 @@ stdenv.mkDerivation (finalAttrs: { asl20 cc0 ]; - maintainers = with lib.maintainers; [ fgaz ]; + maintainers = with lib.maintainers; [ + fgaz + silvanshade + ]; platforms = lib.platforms.all; }; })