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.6 -> 5.8 #27636

Merged
merged 2 commits into from Aug 30, 2017
Merged

pypy: 5.6 -> 5.8 #27636

merged 2 commits into from Aug 30, 2017

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Jul 25, 2017

this commit includes a patch, backported from master, to skip a
failing test

Motivation for this change

maintenance

Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@bendlas
pypy: 5.6 -> 5.8
fec79a9 
this commit includes a patch, backported from master, to skip a
failing test
@FRidh FRidh self-assigned this Jul 25, 2017
FRidh
FRidh reviewed Jul 25, 2017
View reviewed changes
pkgs/development/interpreters/python/pypy/2.7/default.nix Outdated
@@ -3,13 +3,13 @@
, makeWrapper, callPackage, self, gdbm, db
, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
, pkgs, pythonPackages, packageOverrides ? (self: super: {})
Copy link
Member

Choose a reason for hiding this comment

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

The packages set is an attribute of the interpreter, python. Please use that instead.

pkgs/development/interpreters/python/pypy/2.7/default.nix Outdated
substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';

buildInputs = [ bzip2 openssl pkgconfig python libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
++ (with pythonPackages; [ pycparser ])
Copy link
Member

Choose a reason for hiding this comment

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

Maybe its good to use python.withPackages here so that its clear that pycparser is for that instance of Python.

@bendlas
Copy link
Contributor Author

bendlas commented Jul 31, 2017

thanks for the feedback
I had to get rid of a usage of python.interpreter, to use a python.withPackages instance, but that would be a separate ticket.

@bendlas
Copy link
Contributor Author

bendlas commented Jul 31, 2017

Thinking about this, it's actually a regression because now pypy can't be built by pypy anymore ...
maybe we need to replicate the behavior of python.interpreter as part of this PR. What do you think, @FRidh ?

@FRidh
Copy link
Member

FRidh commented Aug 1, 2017

I had to get rid of a usage of python.interpreter, to use a python.withPackages instance, but that would be a separate ticket.

That's fine. We still need to fix python.buildEnv to use correct meta.

Thinking about this, it's actually a regression because now pypy can't be built by pypy anymore ...
maybe we need to replicate the behavior of python.interpreter as part of this PR. What do you think, @FRidh ?

Could you clarify? I do not see any regression.

@bendlas
Copy link
Contributor Author

bendlas commented Aug 1, 2017

e.g. if you wanted to build pypy with pypy: pypy.override { python = pypy; }
But that case should be fixed by the latest commit.

@bendlas
Copy link
Contributor Author

bendlas commented Aug 2, 2017

That's fine. We still need to fix python.buildEnv to use correct meta.

Could you clarify?

@FRidh
Copy link
Member

FRidh commented Aug 2, 2017

You now wrote

${pythonForPypy}/bin/${python.executable}

Yesterday I committed ea4121d.

@bendlas
Copy link
Contributor Author

bendlas commented Aug 2, 2017

oh, cool, so now I'm able to use .interpreter on a withPackages - wrapped python?

@FRidh
Copy link
Member

FRidh commented Aug 2, 2017 via email

@bendlas
Copy link
Contributor Author

bendlas commented Aug 3, 2017

updated

@fpletz
Copy link
Member

fpletz commented Aug 30, 2017

Builds fine for me.

@fpletz
Copy link
Member

fpletz commented Aug 30, 2017

@FRidh Any reason not to merge this?

@fpletz fpletz added this to the 17.09 milestone Aug 30, 2017
@FRidh FRidh merged commit b2686dc into NixOS:master Aug 30, 2017
@bendlas bendlas deleted the update-pypy branch October 22, 2023 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

Assignees

@FRidh FRidh

Labels
None yet
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bendlas @FRidh @fpletz