Skip to content

tbb_2021: 2021.13.0 -> 2021.12.0#418720

Merged
7c6f434c merged 1 commit intoNixOS:masterfrom
Prince213:push-lukuqtrxpsyz
Jun 22, 2025
Merged

tbb_2021: 2021.13.0 -> 2021.12.0#418720
7c6f434c merged 1 commit intoNixOS:masterfrom
Prince213:push-lukuqtrxpsyz

Conversation

@Prince213
Copy link
Member

@Prince213 Prince213 commented Jun 21, 2025

Fixes #418695.

Related to #402480.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@Prince213 Prince213 added 0.kind: bug Something is broken 0.kind: regression Something that worked before working no longer 0.kind: build failure A package fails to build 6.topic: darwin Running or building packages on Darwin labels Jun 21, 2025
@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 Jun 21, 2025
@silvanshade
Copy link
Member

silvanshade commented Jun 21, 2025

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-merge-bot
Copy link
Contributor

nixpkgs-merge-bot bot commented Jun 21, 2025

@silvanshade merge not permitted (#305350):
CommitterPR: pr author is not committer
R-Ryantm Maintainer merge: pr author is not r-ryantm

silvanshade
silvanshade approved these changes Jun 21, 2025
View reviewed changes
pkgs/by-name/tb/tbb_2021/package.nix
stdenv.mkDerivation (finalAttrs: {
pname = "tbb";
version = "2021.13.0";
version = "2021.12.0";
Copy link
Member

@silvanshade silvanshade Jun 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another PR that needs 2021.13.0 so rolling back to 2021.12.0 isn't a good permanent fix:

#415996

Copy link
Member Author

@Prince213 Prince213 Jun 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should fix Nix first. Maybe we could update blender to use tbb_2022.

Copy link
Member

@silvanshade silvanshade Jun 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. I approve the changes but don't have merge rights.

Ultimately the macOS TBB build needs to be investigated by someone knowledgeable about nix on Darwin because this issue with segfaults has happened a few times before. I noted when I encountered it previously that the segfaults don't happen with the homebrew TBB so there is probably something wrong with how we are packaging it.

@silvanshade silvanshade requested a review from Ericson2314 June 21, 2025 13:55
@github-actions github-actions bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 21, 2025
@7c6f434c 7c6f434c merged commit 8bbdfce into NixOS:master Jun 22, 2025
28 of 30 checks passed
@Prince213
Copy link
Member Author

Prince213 commented Jun 22, 2025

Thanks!

@Prince213 Prince213 mentioned this pull request Jun 23, 2025
Open
@mcgilly17
Copy link

mcgilly17 commented Jun 24, 2025

@Prince213 Did this work for you? I'm still getting the same build error that you were in your issue.

@Prince213
Copy link
Member Author

Prince213 commented Jun 24, 2025 •
edited
Loading

@Prince213 Did this work for you? I'm still getting the same build error that you were in your issue.

Yeah it's working on 96f9a7e (current master) with nix build -L .#nix on aarch64-darwin.

Please open another issue for discussion.

@ojsef39
Copy link
Contributor

ojsef39 commented Jun 25, 2025

@Prince213 Did this work for you? I'm still getting the same build error that you were in your issue.

Got it working by also overriding nix-init and nurl to build from master branch

@Prince213 Prince213 deleted the push-lukuqtrxpsyz branch November 25, 2025 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hesiod hesiod Awaiting requested review from hesiod

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

1 more reviewer

@silvanshade silvanshade silvanshade approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

0.kind: bug Something is broken 0.kind: build failure A package fails to build 0.kind: regression Something that worked before working no longer 6.topic: darwin Running or building packages on Darwin 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. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Build failure: nix

5 participants

@Prince213 @silvanshade @mcgilly17 @ojsef39 @7c6f434c