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

pypaInstallHook: enter "dist" directory before installing #250464

Merged
merged 1 commit into from
Aug 21, 2023
Merged

pypaInstallHook: enter "dist" directory before installing #250464

merged 1 commit into from
Aug 21, 2023

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Aug 21, 2023

Description of changes

openshot-qt has an installer directory in its source tree, which breaks the current simple logic in pypaInstallHook. Let's fix that by always entering the dist directory before we install.

I paid a bit more attention to the log output and decided to silence the success output of pushd and popd, which just prints the directory stack and isn't useful and added a message to report when a wheel was successfully installed to mirror the output of pypaBuildHook (except without the nice terminal colors that build uses).

/cc @FRidh

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.

@FRidh
Copy link
Member

FRidh commented Aug 21, 2023

Same issue as with build. Have you tested this with some builds?

@FRidh
Copy link
Member

FRidh commented Aug 21, 2023

I tested some builds on top of 8410e34306c94b03cbeb6facac4cffb4b4bd3551 (last python-updates run).

@FRidh FRidh merged commit 130e063 into NixOS:staging Aug 21, 2023
@tjni tjni deleted the better-install-hook branch August 21, 2023 06:46
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