Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python312Packages.openusd: fix build #351902

Merged
merged 6 commits into from
Nov 4, 2024
Merged

Conversation

ShaddyDC
Copy link
Contributor

@ShaddyDC ShaddyDC commented Oct 28, 2024

Changelog: https://github.com/PixarAnimationStudios/OpenUSD/blob/59992d2178afcebd89273759f2bddfe730e59aa8/CHANGELOG.md

This is not the latest version as the patch used isn't updated to that version yet.

I tested the basic functionality of some of the binaries.

6 packages built:
blender blender-hip blendfarm openusd python311Packages.openusd python312Packages.openusd

fixes #352873

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 28, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4780

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Please rebase.
The commit message should start with python312Packages. and not talk about a version bump because 24.08 is already in master.

@nyabinary
Copy link
Contributor

In the changelog
"OpenUSD is now licensed under the Tomorrow Open Source Technology license. This is a renaming of the license, but the terms and conditions are the same as before. See this forum post for details."

So the license needs to be updated too.

@nyabinary nyabinary added the 1.severity: legal This PR or issue raises or fixes a legal issue, e.g. licensing compliance label Nov 3, 2024
@gador
Copy link
Member

gador commented Nov 3, 2024

This fails to build with:

openusd> -- Configuring done (4.6s)
openusd> CMake Error at /nix/store/v6zrwwq9l9zdd3bdz6mqwvasc77mjkz8-python3.11-materialx-1.39.1/lib/cmake/MaterialX/MaterialXTargets.cmake:222 (set_target_properties):
openusd>   The link interface of target "MaterialXRender" contains:
openusd>
openusd>     OpenImageIO::OpenImageIO
openusd>
openusd>   but the target was not found.  Possible reasons include:
openusd>
openusd>     * There is a typo in the target name.
openusd>     * A find_package call is missing for an IMPORTED target.
openusd>     * An ALIAS target is missing.
openusd>
openusd> Call Stack (most recent call first):
openusd>   /nix/store/v6zrwwq9l9zdd3bdz6mqwvasc77mjkz8-python3.11-materialx-1.39.1/lib/cmake/MaterialX/MaterialXConfig.cmake:36 (include)
openusd>   cmake/defaults/Packages.cmake:315 (find_package)
openusd>   CMakeLists.txt:23 (include)
openusd>
openusd>
openusd> -- Generating done (0.9s)
openusd> CMake Warning:
openusd>   Manually-specified variables were not used by the project:
openusd>
openusd>     BUILD_TESTING
openusd>     CMAKE_INSTALL_BINDIR
openusd>     CMAKE_INSTALL_DOCDIR
openusd>     CMAKE_INSTALL_INCLUDEDIR
openusd>     CMAKE_INSTALL_INFODIR
openusd>     CMAKE_INSTALL_LIBDIR
openusd>     CMAKE_INSTALL_LIBEXECDIR
openusd>     CMAKE_INSTALL_LOCALEDIR
openusd>     CMAKE_INSTALL_MANDIR
openusd>     CMAKE_INSTALL_OLDINCLUDEDIR
openusd>     CMAKE_INSTALL_SBINDIR
openusd>     CMAKE_POLICY_DEFAULT_CMP0025
openusd>     PYSIDE_BIN_DIR
openusd>
openusd>
openusd> CMake Generate step failed.  Build files cannot be regenerated correctly.

@gador
Copy link
Member

gador commented Nov 3, 2024

ok, this error is due the update of materialX in 993ec32 by @mweinelt
As I've said in #326466 (comment) materialX should not have been updated.
It may have been a good idea to go through a PR workflow and have me tagged in it. I then would have been able to catch that.

The only reasonable way forward in light of ZHF #352882 is to revert the update from the above commit.

I tested this PR with it and it builds fine, then.

@gador
Copy link
Member

gador commented Nov 3, 2024

@ShaddyDC I piggybacked your PR here, did the rebase and added the new license. I hope thats ok.
@mweinelt could you have a look at this PR, as it also contains the revert of the material update and let me know, if you're ok with it?

@mweinelt
Copy link
Member

mweinelt commented Nov 3, 2024

The revert should contain the reason for which it was reverted.

Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

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

  • PR title needs to be updated, it doesn’t reflect what’s happening here anymore
  • Ideally the materialx revert should be first, otherwise the patch fix doesn’t actually fix the build

pkgs/development/python-modules/openusd/default.nix Outdated Show resolved Hide resolved
@gador gador changed the title openusd: 24.05 -> 24.08 openusd: fix build Nov 3, 2024
This reverts commit 993ec32.
MaterialX has some upstream issues which haven't been quite
worked out, yet[1]. It is therefore reasonable to wait
with an update in nixpkgs. It also breaks downstream packages
like python312Packages.openusd as well as blender[2]

[1]: PixarAnimationStudios/OpenUSD#3159
[2]: NixOS#326466 (comment)

Signed-off-by: Florian Brandes <[email protected]>
@ShaddyDC
Copy link
Contributor Author

ShaddyDC commented Nov 3, 2024

@gador thanks for taking this over! Those changes look good to me!

@ShaddyDC ShaddyDC changed the title openusd: fix build python312Packages.openusd: fix build Nov 3, 2024
lib/licenses.nix Show resolved Hide resolved
lib/licenses.nix Outdated Show resolved Hide resolved
lib/licenses.nix Outdated Show resolved Hide resolved
lib/licenses.nix Show resolved Hide resolved
this adds the license for OpenUSD which is explained
here https://forum.aousd.org/t/upcoming-openusd-license-update/1561

Signed-off-by: Florian Brandes <[email protected]>
Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Diff LGTM

pkgs/development/python-modules/openusd/default.nix Outdated Show resolved Hide resolved
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 4, 2024
@ofborg ofborg bot requested a review from gador November 4, 2024 09:33
@gador
Copy link
Member

gador commented Nov 4, 2024

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

nixpkgs-review result

⏩ 1 package blacklisted:
  • nixos-install-tools
✅ 9 packages built:
  • blender
  • blender-hip
  • blendfarm
  • materialx (python312Packages.materialx)
  • nixpkgs-manual
  • openusd
  • python311Packages.materialx
  • python311Packages.openusd
  • python312Packages.openusd

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

blender-hip-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘blender-hip-x86_64-linux’ attribute.

blender-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘blender-x86_64-linux’ attribute.

blendfarm-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘blendfarm-x86_64-linux’ attribute.

materialx-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘materialx-x86_64-linux’ attribute.

nixpkgs-manual-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘nixpkgs-manual-x86_64-linux’ attribute.

openusd-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘openusd-x86_64-linux’ attribute.

python311Packages.materialx-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘python311Packages.materialx-x86_64-linux’ attribute.

python311Packages.openusd-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘python311Packages.openusd-x86_64-linux’ attribute.

python312Packages.openusd-x86_64-linux:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/1j71lcyxcsn2pj4ajw7rskj15pa775vy-nixpkgs’ do not contain ‘python312Packages.openusd-x86_64-linux’ attribute.

@gador
Copy link
Member

gador commented Nov 4, 2024

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

nixpkgs-review result

⏩ 1 package marked as broken and skipped:
  • blender
✅ 6 packages built:
  • materialx (python312Packages.materialx)
  • nixpkgs-manual
  • openusd
  • python311Packages.materialx
  • python311Packages.openusd
  • python312Packages.openusd

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

materialx-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘materialx-aarch64-darwin’ attribute.

nixpkgs-manual-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘nixpkgs-manual-aarch64-darwin’ attribute.

openusd-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘openusd-aarch64-darwin’ attribute.

python311Packages.materialx-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘python311Packages.materialx-aarch64-darwin’ attribute.

python311Packages.openusd-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘python311Packages.openusd-aarch64-darwin’ attribute.

python312Packages.openusd-aarch64-darwin:

Package is missing a meta section.
If the package is using runCommand please make sure to inherit or create a meta section.

error: AttrPathNotFound
Packages in ‘/nix/store/sj0krjxk6f39ys1znksm3cxhlk4q1d3j-nixpkgs’ do not contain ‘python312Packages.openusd-aarch64-darwin’ attribute.

Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Good by me.

@philiptaron philiptaron merged commit b8a2072 into NixOS:master Nov 4, 2024
11 of 12 checks passed
@ShaddyDC ShaddyDC deleted the openusd-bump branch November 5, 2024 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: legal This PR or issue raises or fixes a legal issue, e.g. licensing compliance 6.topic: lib The Nixpkgs function library 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: python311Packages.openusd