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

python311Packages.xnd: fix python311 build with upstream patch #268058

Merged
merged 1 commit into from Nov 17, 2023
Merged

python311Packages.xnd: fix python311 build with upstream patch #268058

merged 1 commit into from Nov 17, 2023

Conversation

ghost
Copy link

@ghost ghost commented Nov 17, 2023

Fix renamed functions and moved header file. package builds and unit tests pass. Patch submitted and merged upstream as
https://github.com/xnd-project/xnd/pull/48

ZHF #265948
https://hydra.nixos.org/build/239056417
Result of nixpkgs-review pr 268058 run on x86_64-linux 1

8 packages built:
  • python310Packages.gumath
  • python310Packages.gumath.dist
  • python310Packages.xnd
  • python310Packages.xnd.dist
  • python311Packages.gumath
  • python311Packages.gumath.dist
  • python311Packages.xnd
  • python311Packages.xnd.dist

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/)
  • 23.11 Release Notes (or backporting 23.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.

Fix renamed functions and moved header file. package builds and unit
tests pass. Patch submitted upstream as
https://github.com/xnd-project/xnd/pull/48
@ghost ghost changed the title python311Packages.xnd: fix python311 build python311Packages.xnd: fix python311 build with upstream patch Nov 17, 2023
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

Nicely done. nixpkgs-review happy, nixos x86_64 & aarch64-linux. Ofborg shows success on macos.

@risicle risicle merged commit 717e8f9 into NixOS:master Nov 17, 2023
11 checks passed
@pbsds
Copy link
Member

pbsds commented Nov 17, 2023

The package itself seems to build and run fine, but i cannot create a python environment with it. This is my tests in nixpkgs-review:

$ nix-shell -I nixpkgs=nixpkgs/ -p 'python311.withPackages (ps: [ ps.xnd ps.pdoc ])' --run 'pdoc xnd'
error: collision between `/nix/store/zqwgj0cwr7ssi3jqh3jhbbsjv1kadmvf-python3.11-ndtypes-unstable-2019-08-01/include/docstrings.h' and `/nix/store/cvcwci3iplx07ln9k288ddaw7px29r23-python3.11-xnd-unstable-2019-08-01/include/docstrings.h'

I'd like to move the header into the dev output, but creating it will pull with it the propagated inputs, so i am at a loss.

It seems this just got merged as i am writing this, so i'll look into it myself

@ghost
Copy link
Author

ghost commented Nov 17, 2023

The package itself seems to build and run fine, but i cannot create a python environment with it. This is my tests in nixpkgs-review:

$ nix-shell -I nixpkgs=nixpkgs/ -p 'python311.withPackages (ps: [ ps.xnd ps.pdoc ])' --run 'pdoc xnd'
error: collision between `/nix/store/zqwgj0cwr7ssi3jqh3jhbbsjv1kadmvf-python3.11-ndtypes-unstable-2019-08-01/include/docstrings.h' and `/nix/store/cvcwci3iplx07ln9k288ddaw7px29r23-python3.11-xnd-unstable-2019-08-01/include/docstrings.h'

I'd like to move the header into the dev output, but creating it will pull with it the propagated inputs, so i am at a loss.

It seems this just got merged as i am writing this, so i'll look into it myself

hmm. ndtypes and xnd are part of the same xnd-project ecosystem. this collision seems like it's been an issue since they were added in 2018. i am a little cloudy on the differences of out, lib, dev -- would have to grep around a little to see how to prevent the propogatedBuildInputs from going in dev -- i assume that dev should just contain headers?

@pbsds
Copy link
Member

pbsds commented Nov 18, 2023

Generally libraries goes in lib, and built-time headers go in dev. I'm working on a PR which should fix it. It is intentional that propagated inputs go to dev, but this has an effect on the end user trying to make a shell with python packages, since then the dev output is not neccesarily fetched.

UPDATE: #268337

@ghost ghost deleted the xnd-python311 branch November 19, 2023 00:02
@ghost ghost added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 19, 2023
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.

2 participants