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.pyside6: fix eval on linux #356081

Merged
merged 2 commits into from
Nov 16, 2024

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Nov 15, 2024

zhf #352882
fixes #356072

i've yet to see the build complete, but i'm now off to bed

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@pbsds pbsds changed the title python312Packages.shiboken6: fix eval on linux python312Packages.pyside6: fix eval on linux Nov 15, 2024
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Agh, sorry about this! Maybe darwinVersionInputs should include the conditional itself. I am confident that this fix is correct but won’t override the draft without @K900 taking a look.

python.pkgs.packaging
python.pkgs.setuptools
]
++ lib.optional stdenv.hostPlatform.isDarwin [
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't be a list, right?

Copy link
Member

Choose a reason for hiding this comment

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

No longer confident the fix is correct 🫠

Copy link
Member Author

Choose a reason for hiding this comment

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

it's so annoying that toString doesn't care about nested lists. We should at some point make structured attrs default

Copy link
Member

Choose a reason for hiding this comment

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

It’s being worked on ^^ #205690

Optimistically, we might be able to flip the default for 25.05.

@pbsds pbsds force-pushed the fix-pyside6-1731648734 branch from 3a37005 to 6bd56f2 Compare November 15, 2024 08:32
@pbsds pbsds marked this pull request as ready for review November 15, 2024 08:32
@ofborg ofborg bot requested a review from gebner November 15, 2024 18:10
@wegank wegank added the backport release-24.11 Backport PR automatically label Nov 16, 2024
@wegank wegank merged commit 7ca460a into NixOS:master Nov 16, 2024
42 of 43 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.11:

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

Successfully merging this pull request may close these issues.

Evaluation failure: python3Packages.pyside6 (Linux-only)
4 participants