Skip to content

Conversation

@silvanshade
Copy link
Member

This PR updates libblake3 to version 1.8.2.

This is the second attempt and fixes #401117.

The change that needed to be made was adding tbb to the propagatedBuildInputs.

@spiage @Floki @imincik Can you please verify this is working? I did test the previous PR locally but somehow my configuration didn't reveal the issue, although I was eventually able to reproduce and hopefully fix.

Related:

Things done

  • Built on platform(s)
    • x86_64-linux

@silvanshade silvanshade requested review from Mic92, flokli and imincik April 23, 2025 15:34
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 23, 2025
@nix-owners nix-owners bot requested review from fgaz and fpletz April 23, 2025 15:42
@flokli
Copy link
Contributor

flokli commented Apr 23, 2025

Nix (and therefore the nixpkgs manual) does build for me again, so LGTM!

@flokli flokli merged commit e729470 into NixOS:master Apr 23, 2025
24 of 28 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Apr 23, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-401156-to-release-24.11 origin/release-24.11
cd .worktree/backport-401156-to-release-24.11
git switch --create backport-401156-to-release-24.11
git cherry-pick -x e4c1dd71baf134ab416015ff675d55a03c9fdc80

@spiage
Copy link

spiage commented Apr 23, 2025

I can't check it )))
#401161

@spiage
Copy link

spiage commented Apr 23, 2025

it is fixed, I can confirm

Version 32911 -> 32912:
  libblake3: 1.8.0 → 1.8.2, +23.0 KiB
  nixos-system-a7: 25.05.20250423.042b910 → 25.05.20250423.6fc2f2e
  tbb: ∅ → 2021.11.0, +1935.9 KiB
<<< /run/booted-system
>>> /run/current-system

@Ericson2314
Copy link
Member

I disabled tbb because the windows build broke. I would like the windows build to work with 25.05 stable.

@Ericson2314
Copy link
Member

@silvanshade Can you try fetchpatch ing some of your recent changes and testing the Windows and FreeBSD builds?

@Ericson2314
Copy link
Member

uxlfoundation/oneTBB#1696 Also would be good to get this in.

@silvanshade
Copy link
Member Author

silvanshade commented Apr 23, 2025

I disabled tbb because the windows build broke. I would like the windows build to work with 25.05 stable.

@Ericson2314 I re-enabled TBB because I was under the impression that the only reason the MinGW builds broke was because of the compiler check (which was removed in BLAKE3-team/BLAKE3#468).

Is that not the case?

@silvanshade Can you try fetchpatch ing some of your recent changes and testing the Windows and FreeBSD builds?

I will try. Can you also verify if you get a chance, just to have an extra point of reference?

uxlfoundation/oneTBB#1696 Also would be good to get this in.

Should I make a new PR adding this to the local patches for the time being?

@Ericson2314
Copy link
Member

@silvanshade Good point, yes 1.8.2 makes it well primed to try this again! Sorry about that.

I will try. Can you also verify if you get a chance, just to have an extra point of reference?

I guess 1.8.2 does have all your recent packages too. I can try also. I made some other windows fixes on nixpkgs master recently, so we should be well-positioned to try things again.

Should I make a new PR adding this to the local patches for the time being?

Sure, or if FreeBSD is not building, I think you can disable building the oneTBB tests on that platform too and that will also suffice.

@Ericson2314
Copy link
Member

Also btw @silvanshade I just tried messaging you on Matrix, if you use that :)

@silvanshade
Copy link
Member Author

Just to give an update for everyone, I've verified the MinGW builds are working with this PR.

The FreeBSD builds required an additional change which is now submitted at #401250

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: nix - Could not generate cflags for libblake3

4 participants