Skip to content

pypaInstallHook: enter "dist" directory before installing#250464

Merged
FRidh merged 1 commit intoNixOS:stagingfrom
tjni:better-install-hook
Aug 21, 2023
Merged

pypaInstallHook: enter "dist" directory before installing#250464
FRidh merged 1 commit intoNixOS:stagingfrom
tjni:better-install-hook

Conversation

@tjni
Copy link
Copy Markdown
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.

@tjni tjni requested review from FRidh and jonringer as code owners August 21, 2023 03:01
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 21, 2023
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 21, 2023
@FRidh
Copy link
Copy Markdown
Member

FRidh commented Aug 21, 2023

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

@FRidh
Copy link
Copy Markdown
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

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants