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.

Sign up for GitHub

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

Jump to bottom

pypy: 5.10.0 -> 6.0.0 #40459

Merged
merged 4 commits into from Dec 18, 2018
Merged

pypy: 5.10.0 -> 6.0.0 #40459

merged 4 commits into from Dec 18, 2018

Conversation

andersk
Copy link
Contributor

@andersk andersk commented May 13, 2018

Motivation for this change

Upgrade pypy from 5.10.0 to 6.0.0. This also includes the improvements from #34066 (but without the addition of pypy3).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@andersk andersk requested a review from FRidh as a code owner May 13, 2018 21:12
@FRidh FRidh self-assigned this May 14, 2018
@andersk
pypy: Change libPrefix from pypy5.10 to pypy2.7
f96349c 
To avoid conflicting with pypy3, as per
NixOS#34066 (comment).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
pypy: Remove redundant --withmod-* flags
91333c1 
--allworkingmodules is already the default.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
pypy: Reenable tests fixed upstream
8b80dec 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
pypy: Set isPy2, isPy27
6d80927 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
Copy link
Contributor Author

andersk commented Nov 20, 2018

Apparently @MP2E separately bumped PyPy to 6.0.0 without taking the rest of these fixes. I’ve rebased the fixes which should still be applied.

@Mic92 Mic92 merged commit ab9c602 into NixOS:master Dec 18, 2018
@Mic92
Copy link
Member

Mic92 commented Dec 18, 2018

Thanks!

@andersk andersk mentioned this pull request Dec 18, 2018
Merged
8 tasks
@andersk andersk deleted the pypy branch December 18, 2018 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees

@FRidh FRidh

Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@andersk @Mic92 @FRidh @GrahamcOfBorg