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

python3.pkgs.pypaBuildHook: fix conflicts via propagated inputs 2 #279496

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

DavHau
Copy link
Member

@DavHau DavHau commented Jan 8, 2024

A follow up on #254547

As of now the hook still propagated wheel into the build environment which lead to a collision error as soon as any other version of wheel gets introduced as a dependency.

This makes the nixpkgs python infra more suitable for use with dynamic dependency versions like generated by 2nix tools.

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.11 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.

A follow up on NixOS#254547

As of now the hook still propagated `wheel` into the build environment which lead to a collision error as soon as any other version of wheel gets introduced as a dependency.

This makes the nixpkgs python infra more suitable for use with dynamic dependency versions like generated by 2nix tools.
@DavHau DavHau force-pushed the fix-pyproject-build branch from 921b30d to 34a1a47 Compare January 8, 2024 04:08
@DavHau
Copy link
Member Author

DavHau commented Jan 8, 2024

Having a hard time debugging the ofborg jobs

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants