Merged
Conversation
github-actions
bot
added
the
6.topic: python
ofborg
bot
added
10.rebuild-darwin: 1-10
Member
Author
|
@ofborg build pypy38Packages.pip pypy39Packages.pip |
Contributor
|
tested successfully on x86_64-linux |
FRidh
reviewed
Feb 25, 2023
Member
There was a problem hiding this comment.
should this if .... maybe be moved into the passthru.sitePackages?
Member
Author
There was a problem hiding this comment.
I don't think that's possible in this context/how sitePackages is used throughout the tree?
When PyPy introduced Python 3.8 support with version 7.3.6, they also migrated to using CPython's directory layout [0]: > The 3.8 package now uses the same layout as CPython, and many of the PyPy-specific changes to `sysconfig`, `distutils.sysconfig`, and `distutils.commands.install.py` have been removed. The stdlib now is located in `<base>/lib/pypy3.8` on `posix` systems... When we upgraded past this version and added Python 3.8 support [1], the `sitePackages` value was never updated, leading `bootstrapped-pip` to fail to build, because wheel was trying to be located in `$out/site-packages`, when it was actually installed to `$out/lib/pypy3.8/site-packages`. [0]: https://www.pypy.org/posts/2021/10/pypy-v736-release.html [1]: eec28b8
winterqt
force-pushed
the
pypy3-fix-site-packages
branch
from
d011a4a to
e4dd2b8
Compare
Contributor
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-22.11
git worktree add -d .worktree/backport-217558-to-release-22.11 origin/release-22.11
cd .worktree/backport-217558-to-release-22.11
git checkout -b backport-217558-to-release-22.11
ancref=$(git merge-base 4ef8ffa6c19935a8e2dc60ed01c882cf574352f1 e4dd2b8ca0269c0d283f4f74ccfe9bec082b3563)
git cherry-pick -x $ancref..e4dd2b8ca0269c0d283f4f74ccfe9bec082b3563 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
When PyPy introduced Python 3.8 support with version 7.3.6, they also migrated to using CPython's directory layout 0:
When we upgraded past this version and added Python 3.8 support 1, the sitePackages value was never updated, leading
bootstrapped-pipto fail to build, because wheel was trying to be located in$out/site-packages, when it was actually installed to$out/lib/pypy3.8/site-packages.Fixes #150818.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)