Skip to content

pypy: 7.3.17 -> 7.3.19#393847

Merged
FliegendeWurst merged 5 commits intoNixOS:masterfrom
FliegendeWurst:pypy-update
May 17, 2025
Merged

pypy: 7.3.17 -> 7.3.19#393847
FliegendeWurst merged 5 commits intoNixOS:masterfrom
FliegendeWurst:pypy-update

Conversation

@FliegendeWurst
Copy link
Member

@FliegendeWurst FliegendeWurst commented Mar 27, 2025 •
edited
Loading

Regular update, and

  • fix for not working test.support module
  • re-enabled most tests. Still lots of undiagnosed failures however.

Closes #240300 (seems this was taken care of upstream)

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 basic functionality of all binary files (usually in ./result/bin/): some pypy3Packages build. Nothing libxml2-based but that's not new.
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Mar 27, 2025
@nix-owners nix-owners bot requested review from mweinelt and natsukium March 27, 2025 22:30
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 27, 2025
@nix-owners nix-owners bot requested a review from andersk March 27, 2025 22:47
@FliegendeWurst

This comment was marked as resolved.

Sign in to view
@FliegendeWurst
Copy link
Member Author

FliegendeWurst commented Mar 28, 2025

Fixed, all pypy versions build on aarch64 Darwin

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@FliegendeWurst

This comment was marked as resolved.

Sign in to view
@FliegendeWurst FliegendeWurst force-pushed the pypy-update branch 2 times, most recently from 180ce57 to 2c073fb Compare April 9, 2025 11:50
@mweinelt mweinelt requested a review from SuperSandro2000 May 9, 2025 12:34
SuperSandro2000
SuperSandro2000 reviewed May 12, 2025
View reviewed changes
pkgs/development/interpreters/python/pypy/default.nix
# _testcapi is compiled dynamically, into the store.
# This would fail if we don't do it here.
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
pushd /
Copy link
Member

@SuperSandro2000 SuperSandro2000 May 12, 2025

Choose a reason for hiding this comment

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

Why do we change the working directory to / aka root?

Copy link
Member Author

@FliegendeWurst FliegendeWurst May 12, 2025

Choose a reason for hiding this comment

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

pypy compiles the module to $(pwd)/nix/store/...pypy/...

Copy link
Member

@SuperSandro2000 SuperSandro2000 May 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

But don't we then want to cd to either $out or build root?
This would to very strange things without the sandbox.

Copy link
Member Author

@FliegendeWurst FliegendeWurst May 13, 2025

Choose a reason for hiding this comment

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

Indeed, it does very strange things, if you run into it in regular usage. I don't know why it works the way it does, but this approach works.

Maybe there is a better way to pre-compile the modules, but I didn't find any.

Copy link
Member

@SuperSandro2000 SuperSandro2000 May 13, 2025

Choose a reason for hiding this comment

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

okay, then fine for me :)

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 13, 2025
@FliegendeWurst FliegendeWurst mentioned this pull request May 17, 2025
Closed
13 tasks
@FliegendeWurst FliegendeWurst merged commit a3902d9 into NixOS:master May 17, 2025
37 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 17, 2025

Successfully created backport PR for release-25.05:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 17, 2025
Merged
1 task
@nixpkgs-ci nixpkgs-ci bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 17, 2025
@trofi
Copy link
Contributor

trofi commented Jun 1, 2025

Bisect says 7ecebd4 this caused eval regression on pythonInterpreters.pypy310_prebuilt.tests.test-packageOverrides. Proposed a possible fix as:

@applePrincess applePrincess mentioned this pull request Jun 5, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@natsukium natsukium Awaiting requested review from natsukium

@mweinelt mweinelt Awaiting requested review from mweinelt

@andersk andersk Awaiting requested review from andersk

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@FliegendeWurst @trofi @SuperSandro2000 @wegank