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, pypy3: 7.3.1 → 7.3.2 #104150

Merged
merged 2 commits into from Feb 13, 2021
Merged

pypy, pypy3: 7.3.1 → 7.3.2 #104150

merged 2 commits into from Feb 13, 2021

Conversation

andersk
Copy link
Contributor

@andersk andersk commented Nov 18, 2020 •
edited

Motivation for this change

Upgrade pypy.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@andersk
pypy, pypy3: Follow Heptapod move for download URL
b7836e5 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk
pypy, pypy3: 7.3.1 → 7.3.2
9e09ad5 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk andersk requested a review from FRidh as a code owner November 18, 2020 08:26
@taku0
Copy link
Contributor

taku0 commented Jan 31, 2021

Works fine on Linux.

Build fails on macOS Big Sur 11.1, maybe due to this issue #91748. I'm rebuilding on staging branch now.

taku0
taku0 approved these changes Jan 31, 2021
View reviewed changes
Copy link
Contributor

@taku0 taku0 left a comment

Choose a reason for hiding this comment

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

Build fails on macOS even with staging branch:

nix-build -I nixpkgs=. -A pkgs.pypy 
$ nix-build -I nixpkgs=. -A pkgs.pypy
these derivations will be built:
  /nix/store/ra6idr5pxw7xg32i99822n0pd7z5kfsz-pypy-7.3.2.drv
building '/nix/store/ra6idr5pxw7xg32i99822n0pd7z5kfsz-pypy-7.3.2.drv'...
unpacking sources
unpacking source archive /nix/store/jgyiijqndngnssg69pny2rpg3bwn3c8w-pypy2.7-v7.3.2-src.tar.bz2
source root is pypy2.7-v7.3.2-src
setting SOURCE_DATE_EPOCH to timestamp 1600810538 of file pypy2.7-v7.3.2-src/testrunner/test/test_scratchbox_runner.py
patching sources
applying patch /nix/store/33cd04jfbv41cm50c3jdfw7bsqcjy3rl-tk_tcl_paths.patch
patching file lib_pypy/_tkinter/tklib_build.py
configuring
no configure script, doing nothing
building
[version:WARNING] Errors getting Mercurial information: Not running from a Mercurial repository!
[translation:info] 2.7.18 (default, Jan 31 2021, 09:41:01) 
[GCC 4.2.1 Compatible Clang 7.1.0 (tags/RELEASE_710/final)]
[platform:msg] Set platform with 'host' cc=None, using cc='clang', version='Unknown'
[translation:info] Translating target as defined by pypy/goal/targetpypystandalone
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[translation] PyPy config object:
[translation] [objspace]
    [std]
        intshortcut = True
        optimized_list_getitem = True
        withspecialisedtuple = True
    [usemodules]
        __pypy__ = True
        _ast = True
        _cffi_backend = True
        _codecs = True
        _collections = True
        _continuation = True
        _cppyy = True
        _csv = True
        _io = True
        _jitlog = True
        _locale = True
        _lsprof = True
        _md5 = True
        _minimal_curses = True
        _multibytecodec = True
        _multiprocessing = True
        _pickle_support = True
        _pypyjson = True
        _random = True
        _rawffi = True
        _sha = True
        _socket = True
        _sre = True
        _testing = True
        _vmprof = True
        _weakref = True
        array = True
        binascii = True
        bz2 = True
        cStringIO = True
        cmath = True
        cpyext = True
        errno = True
        faulthandler = True
        fcntl = True
        gc = True
        imp = True
        marshal = True
        math = True
        micronumpy = True
        mmap = True
        operator = True
        parser = True
        pwd = True
        pyexpat = True
        pypyjit = True
        select = True
        signal = True
        struct = True
        symbol = True
        termios = True
        thread = True
        time = True
        token = True
        unicodedata = True
        zipimport = True
        zlib = True
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[version:WARNING] Errors getting Mercurial information: Not running from a Mercurial repository!
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/0gm1wsc6q4sii8py1kf83isx8aaq03mj-xlibs-wrapper/lib'
[platform:WARNING] ld: warning: directory not found for option '-L/nix/store/pslgzws8yag8fp0srcfk83ky1zxf62mz-apple-framework-Security/lib'
[translation:info] Error:
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/rpython/translator/goal/translate.py", line 286, in main
    default_goal='compile')
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/rpython/translator/driver.py", line 570, in from_targetspec
    spec = target(driver, args)
   File "pypy/goal/targetpypystandalone.py", line 339, in target
    return self.get_entry_point(config)
   File "pypy/goal/targetpypystandalone.py", line 381, in get_entry_point
    self.space = make_objspace(config)
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/tool/option.py", line 33, in make_objspace
    return StdObjSpace(config)
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/interpreter/baseobjspace.py", line 461, in __init__
    self.initialize()
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/objspace/std/objspace.py", line 110, in initialize
    self.make_builtins()
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/interpreter/baseobjspace.py", line 661, in make_builtins
    self.install_mixedmodule(mixedname, installed_builtin_modules)
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/interpreter/baseobjspace.py", line 692, in install_mixedmodule
    modname = self.setbuiltinmodule(mixedname)
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/interpreter/baseobjspace.py", line 537, in setbuiltinmodule
    mod = Module(self, self.newtext(name))
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/module/_cppyy/moduledef.py", line 38, in __init__
    from pypy.module._cppyy import capi
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/module/_cppyy/capi/__init__.py", line 3, in <module>
    from pypy.module._cppyy.capi.loadable_capi import *
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/pypy/module/_cppyy/capi/loadable_capi.py", line 5, in <module>
    from rpython.rlib import jit, jit_libffi, libffi, rdynload, objectmodel
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/rpython/rlib/jit_libffi.py", line 4, in <module>
    from rpython.rlib import clibffi, jit
   File "/private/var/folders/8z/69zjg6ns4s7crhymsmhp8tp80000gn/T/nix-build-pypy-7.3.2.drv-3/pypy2.7-v7.3.2-src/rpython/rlib/clibffi.py", line 294, in <module>
    assert libc_name is not None, "Cannot find C library, ctypes.util.find_library('c') returned None"
[translation:ERROR] AssertionError: Cannot find C library, ctypes.util.find_library('c') returned None
[translation] batch mode, not calling interactive helpers
builder for '/nix/store/ra6idr5pxw7xg32i99822n0pd7z5kfsz-pypy-7.3.2.drv' failed with exit code 1
error: build of '/nix/store/ra6idr5pxw7xg32i99822n0pd7z5kfsz-pypy-7.3.2.drv' failed

It also fail with 7.3.1, so it is not fault of this PR. Approving.

@taku0 taku0 mentioned this pull request Jan 31, 2021
Closed
@rb2k
Copy link
Contributor

rb2k commented Feb 5, 2021

I just ran into something similar so I thought I'd comment:

assert libc_name is not None, "Cannot find C library, ctypes.util.find_library('c') returned None"

Apple removed the /usr/lib/libc.dylib from disk on macOS Big Sur and only has it available in the linker cache now.
The API calls still work, but things that actually look for the file do not.

This was the patch that fixed it for Python: https://bugs.python.org/issue41100
It is already merged and available in nix: #107453

Seems possibly related?

@taku0 taku0 merged commit 28adb5b into NixOS:master Feb 13, 2021
@andersk andersk deleted the pypy-7.3.2 branch December 26, 2022 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taku0 taku0 taku0 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
0.kind: enhancement 6.topic: python 8.has: package (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@andersk @taku0 @rb2k