Skip to content

Conversation

@dotlambda
Copy link
Member

@dotlambda dotlambda commented Aug 20, 2025

This reverts commit c31236e because the patches now fail to apply.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

This reverts commit c31236e because the
patches now fail to apply.
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 6.topic: python Python is a high-level, general-purpose programming language. labels Aug 20, 2025
@nix-owners nix-owners bot requested review from ShaddyDC and gador August 20, 2025 05:51
@LordGrimmauld
Copy link
Contributor

Not sure this is the ideal fix. Notably, 25.08 added python 3.13 support which we might want.
The patches fail, but embree 4 support was merged upstream on their development branch and will be coming to 25.11.

I am open to the proposed revert here, but i'd prefer a real fix (e.g. an update to an unstable version on the dev branch which includes the embree 4 support)

@dotlambda
Copy link
Member Author

I tried to swap the first patch for PixarAnimationStudios/OpenUSD#2313 which makes it apply cleanly but then ran into some build error. Since it's currently broken a revert is the best alternative we have until someone puts in the work to figure out that build failure.

@LordGrimmauld
Copy link
Contributor

Fair enough. I might poke later, but a revert sounds good then. Thank you for the extra context of of it yielding a build error, if its more complex than just a simple patch replacement (or bump to -unstable) then a revert seems fair.

@dotlambda
Copy link
Member Author

or bump to -unstable

I didn't try that.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 20, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Aug 20, 2025
@vcunat vcunat merged commit 89ae155 into NixOS:staging-next Aug 21, 2025
33 of 35 checks passed
@dotlambda dotlambda deleted the python3Packages.openusd branch August 21, 2025 05:18
@ruffsl
Copy link
Contributor

ruffsl commented Aug 21, 2025

I tried to swap the first patch for PixarAnimationStudios/OpenUSD#2313 which makes it apply cleanly but then ran into some build error.

Wasn't that PR merged and mainlined? Is that patch still needed?

@LordGrimmauld
Copy link
Contributor

Wasn't that PR merged and mainlined? Is that patch still needed?

Merged and should make it out in 25.11

This was 25.08, which would still need that patch aiui?

@ruffsl
Copy link
Contributor

ruffsl commented Aug 21, 2025

Merged and should make it out in 25.11

Never mind me, I didn't see that.

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

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants