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.8 -> 5.9 #31903

Merged
merged 2 commits into from Nov 21, 2017
Merged

pypy: 5.8 -> 5.9 #31903

merged 2 commits into from Nov 21, 2017

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Nov 21, 2017

Motivation for this change
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.

@Mic92 Mic92 requested a review from FRidh as a code owner November 21, 2017 17:09
@FRidh
Copy link
Member

FRidh commented Nov 21, 2017 •
edited

Is it correct that only the version number and the indentation changed?

Mic92
Mic92 commented Nov 21, 2017
View reviewed changes
pkgs/development/interpreters/python/pypy/2.7/default.nix
LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs;
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);

patches = [
Copy link
Member Author

@Mic92 Mic92 Nov 21, 2017 •
edited

Choose a reason for hiding this comment

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

Sorry for the line noise. I also had to update this patch. I probably should split up indentation and update into two commits.

@Mic92 Mic92 merged commit 8b692a6 into NixOS:master Nov 21, 2017
@Mic92 Mic92 deleted the pypy-5.9 branch November 21, 2017 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@Mic92 @FRidh @GrahamcOfBorg