Skip to content

python3Packages.psutil: use placeholder "out" instead of $out#354785

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
wolfgangwalther:no-python-eval-psutil
Nov 13, 2024
Merged

python3Packages.psutil: use placeholder "out" instead of $out#354785
emilazy merged 1 commit intoNixOS:stagingfrom
wolfgangwalther:no-python-eval-psutil

Conversation

@wolfgangwalther
Copy link
Contributor

This is split from #352976. This commit alone causes 50k+ rebuilds on darwin and 35k+ on linux.

I am still investigating the other commits' impact, but this one should be simple to review by just looking at it.

@ShamrockLee @emilazy

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

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Nov 9, 2024
@wolfgangwalther
Copy link
Contributor Author

Codeowners check failure is unrelated. Seems like staging has the by-name commit already, but not the codeowner commit related to it.. even though they were only 4 minutes apart. That's unlucky! :D

@emilazy
Copy link
Member

emilazy commented Nov 9, 2024

Fixed. Hopefully. Sorry about that.

@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 Nov 9, 2024
To avoid depending on bash eval behavior of pytestFlagsArray, which we'd
like to remove.
@dotlambda dotlambda changed the title python3Packages.psutil: set pytestFlagsArray in preCheck hook python3Packages.psutil: use placeholder "out" instead of $out Nov 13, 2024
@ShamrockLee
Copy link
Contributor

@ofborg build python311Packages.psutil python312Packages.psutil

Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

Builds on x86_64-linux

@wolfgangwalther
Copy link
Contributor Author

The x86_64-darwin ofborg failure is certainly unrelated, because the tests are not even run on darwin.

Should be good to go.

@emilazy emilazy merged commit a49c735 into NixOS:staging Nov 13, 2024
@emilazy
Copy link
Member

emilazy commented Nov 13, 2024

This won’t make 24.11, by the way, but I assume that the changes that would break this would only land in 25.05 anyway.

@wolfgangwalther wolfgangwalther deleted the no-python-eval-psutil branch November 14, 2024 07:07
@wolfgangwalther
Copy link
Contributor Author

This won’t make 24.11, by the way, but I assume that the changes that would break this would only land in 25.05 anyway.

Yeah, absolutely - this is just preparing the mid-term effort of "structuredAttrs by default".

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.

5 participants