Skip to content

pypy: 7.3.17 -> 7.3.19 #393847

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

Merged
FliegendeWurst merged 5 commits into from
May 17, 2025
Merged

pypy: 7.3.17 -> 7.3.19 #393847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d23255
pypy{27,310}: 7.3.17 -> 7.3.19, pypy311: init at 7.3.19
FliegendeWurst Apr 7, 2025
81b6517
pypy3Packages.mypy: disable
FliegendeWurst Apr 8, 2025
233f899
pypy.tests: disable broken test
FliegendeWurst Apr 8, 2025
7ecebd4
meson: fix build when using pypy
FliegendeWurst Apr 8, 2025
214357a
pypy3Packages.cython: fix
FliegendeWurst Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions pkgs/by-name/me/meson/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
pkg-config,
python3,
replaceVars,
writeShellScriptBin,
zlib,
}:

Expand Down Expand Up @@ -66,12 +67,34 @@ python3.pkgs.buildPythonApplication rec {
./007-freebsd-pkgconfig-path.patch
];

postPatch =
if python3.isPyPy then
''
substituteInPlace mesonbuild/modules/python.py \
--replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \
"PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)"
substituteInPlace mesonbuild/modules/python3.py \
--replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3')" \
"state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}')"
substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \
--replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \
--replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3'
chmod +x "test cases"/*/*/*.py "test cases"/*/*/*/*.py
''
else
null;

nativeBuildInputs = [ installShellFiles ];

nativeCheckInputs = [
ninja
pkg-config
];
nativeCheckInputs =
[
ninja
pkg-config
]
++ lib.optionals python3.isPyPy [
# Several tests hardcode python3.
(writeShellScriptBin "python3" ''exec pypy3 "$@"'')
];

checkInputs =
[
Expand Down Expand Up @@ -116,9 +139,15 @@ python3.pkgs.buildPythonApplication rec {
# pch doesn't work quite right on FreeBSD, I think
''test cases/common/13 pch''
]
++ lib.optionals python3.isPyPy [
# fails for unknown reason
''test cases/python/4 custom target depends extmodule''
]
))
++ [
''HOME="$TMPDIR" python ./run_project_tests.py''
''HOME="$TMPDIR" ${
if python3.isPyPy then python3.interpreter else "python"
} ./run_project_tests.py''
"runHook postCheck"
]
);
Expand Down
63 changes: 49 additions & 14 deletions pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@
sourceVersion = {
major = "7";
minor = "3";
patch = "17";
patch = "19";
};

hash = "sha256-UOBoQPS73pFEgICkEYBoqJuPvK4l/42h4rsUAtyaA0Y=";
hash = "sha256-hwPNywH5+Clm3UO2pgGPFAOZ21HrtDwSXB+aIV57sAM=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
Expand All @@ -153,31 +153,46 @@
sourceVersion = {
major = "7";
minor = "3";
patch = "17";
patch = "19";
};

hash = "sha256-atdLxXjpxtOoocUVAzEwWOPFjDXfhvdIVFPEvmqyS/c=";
hash = "sha256-p8IpMLkY9Ahwhl7Yp0FH9ENO+E09bKKzweupNV1JKcg=";
pythonVersion = "3.10";
db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
python = __splicedPackages.pypy27;
inherit passthruFun;
};

pypy311 = callPackage ./pypy {
self = __splicedPackages.pypy311;
sourceVersion = {
major = "7";
minor = "3";
patch = "19";
};

hash = "sha256-SBfARLtGmjJ05gqjZFdw+B60+RZup/3E5sNRNFVUyNg=";
pythonVersion = "3.11";
db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
python = __splicedPackages.pypy27;
inherit passthruFun;
};

pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
# Not included at top-level
self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
patch = "17";
patch = "19";
};

hash =
{
aarch64-linux = "sha256-qN9c4WUPR1aTP4eAhwyRoKQOfJhw10YpvyQTkry1wuM=";
x86_64-linux = "sha256-nzSX+HszctF+RHNp4AFqS+yZprTSpZq6d0olv+Q1NHQ=";
aarch64-darwin = "sha256-gCJIc5sqzIwb5tlH8Zsy/A44wI4xKzXAXMf7IvEHCeQ=";
x86_64-darwin = "sha256-gtRgQhRmyBraSh2Z3y3xuLNTQbOXyF///lGkwwItCDM=";
aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4=";
x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM=";
aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k=";
x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg=";
}
.${stdenv.system};
pythonVersion = "2.7";
Expand All @@ -190,19 +205,39 @@
sourceVersion = {
major = "7";
minor = "3";
patch = "17";
patch = "19";
};
hash =
{
aarch64-linux = "sha256-v79JVJirwv53G2C/ZOXDwHLgr7z8pprHKCxP9Dd/9BY=";
x86_64-linux = "sha256-NA2kGWYGsiRQmhuLMa/SAYE/CCYB3xicE46QXB1g4K8=";
aarch64-darwin = "sha256-KPKf/JxcyQbo6QgT/BRPA34js4TwUuGE4kIzL3tgqwY=";
x86_64-darwin = "sha256-I/8mS3PlvFt8OhufrHdosj35bH1mDLZBLxxSNSGjNL8=";
aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c=";
x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4=";
aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY=";
x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM=";
}
.${stdenv.system};
pythonVersion = "3.10";
inherit passthruFun;
};

pypy311_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = __splicedPackages.pythonInterpreters.pypy311_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
patch = "19";
};
hash =
{
aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q=";
x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8=";
aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE=";
x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I=";
}
.${stdenv.system};
pythonVersion = "3.11";
inherit passthruFun;
};
}
// lib.optionalAttrs config.allowAliases {
pypy39_prebuilt = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
Expand Down
105 changes: 101 additions & 4 deletions pkgs/development/interpreters/python/pypy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
disallowedReferences = [ python ];

# fix compiler error in curses cffi module, where char* != const char*
NIX_CFLAGS_COMPILE =
if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null;
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
LIBRARY_PATH = lib.makeLibraryPath buildInputs;
LD_LIBRARY_PATH = lib.makeLibraryPath (
Expand Down Expand Up @@ -192,13 +195,18 @@ stdenv.mkDerivation rec {
mkdir -p $out/${executable}-c/pypy/bin
mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable}
ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable}
''
# _testcapi is compiled dynamically, into the store.
# This would fail if we don't do it here.
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
pushd /
Copy link
Member

@SuperSandro2000 SuperSandro2000 May 12, 2025

Choose a reason for hiding this comment

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

Why do we change the working directory to / aka root?

Copy link
Member Author

@FliegendeWurst FliegendeWurst May 12, 2025

Choose a reason for hiding this comment

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

pypy compiles the module to $(pwd)/nix/store/...pypy/...

Copy link
Member

@SuperSandro2000 SuperSandro2000 May 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

But don't we then want to cd to either $out or build root?
This would to very strange things without the sandbox.

Copy link
Member Author

@FliegendeWurst FliegendeWurst May 13, 2025

Choose a reason for hiding this comment

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

Indeed, it does very strange things, if you run into it in regular usage. I don't know why it works the way it does, but this approach works.

Maybe there is a better way to pre-compile the modules, but I didn't find any.

Copy link
Member

@SuperSandro2000 SuperSandro2000 May 13, 2025

Choose a reason for hiding this comment

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

okay, then fine for me :)

$out/bin/${executable} -c "from test import support"
popd
'';

setupHook = python-setup-hook sitePackages;

# TODO: A bunch of tests are failing as of 7.1.1, please feel free to
# fix and re-enable if you have the patience and tenacity.
doCheck = false;
# TODO: Investigate why so many tests are failing.
checkPhase =
let
disabledTests =
Expand All @@ -213,6 +221,9 @@ stdenv.mkDerivation rec {
"test_urllib2net"
"test_urllibnet"
"test_urllib2_localnet"
# test_subclass fails with "internal error"
# test_load_default_certs_env fails for unknown reason
"test_ssl"
]
++ lib.optionals isPy3k [
# disable asyncio due to https://github.com/NixOS/nix/issues/1238
Expand All @@ -226,6 +237,88 @@ stdenv.mkDerivation rec {
# disable __all__ because of spurious imp/importlib warning and
# warning-to-error test policy
"test___all__"
# fail for multiple reasons, TODO: investigate
"test__opcode"
"test_ast"
"test_audit"
"test_builtin"
"test_c_locale_coercion"
"test_call"
"test_class"
"test_cmd_line"
"test_cmd_line_script"
"test_code"
"test_code_module"
"test_codeop"
"test_compile"
"test_coroutines"
"test_cprofile"
"test_ctypes"
"test_embed"
"test_exceptions"
"test_extcall"
"test_frame"
"test_generators"
"test_grammar"
"test_idle"
"test_iter"
"test_itertools"
"test_list"
"test_marshal"
"test_memoryio"
"test_memoryview"
"test_metaclass"
"test_mmap"
"test_multibytecodec"
"test_opcache"
"test_pdb"
"test_peepholer"
"test_positional_only_arg"
"test_print"
"test_property"
"test_pyclbr"
"test_range"
"test_re"
"test_readline"
"test_regrtest"
"test_repl"
"test_rlcompleter"
"test_signal"
"test_sort"
"test_source_encoding"
"test_ssl"
"test_string_literals"
"test_structseq"
"test_subprocess"
"test_super"
"test_support"
"test_syntax"
"test_sys"
"test_sys_settrace"
"test_tcl"
"test_termios"
"test_threading"
"test_trace"
"test_tty"
"test_unpack_ex"
"test_utf8_mode"
"test_weakref"
"test_capi"
"test_concurrent_futures"
"test_dataclasses"
"test_doctest"
"test_future_stmt"
"test_importlib"
"test_inspect"
"test_pydoc"
"test_warnings"
]
++ lib.optionals isPy310 [
"test_contextlib_async"
"test_future"
"test_lzma"
"test_module"
"test_typing"
];
in
''
Expand Down Expand Up @@ -264,6 +357,7 @@ stdenv.mkDerivation rec {

meta = with lib; {
homepage = "https://www.pypy.org/";
changelog = "https://doc.pypy.org/en/stable/release-v${version}.html";
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
mainProgram = "pypy";
license = licenses.mit;
Expand All @@ -274,6 +368,9 @@ stdenv.mkDerivation rec {
"x86_64-darwin"
];
broken = optimizationLevel == "0"; # generates invalid code
maintainers = with maintainers; [ andersk ];
maintainers = with maintainers; [
andersk
fliegendewurst
];
};
}
1 change: 0 additions & 1 deletion pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ stdenv.mkDerivation {
mv -t $out bin include lib-python lib_pypy site-packages
mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
${lib.optionalString stdenv.hostPlatform.isLinux ''
mv lib/libffi.so.6* $out/lib/
rm $out/bin/*.debug
''}

Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/interpreters/python/tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ let
}
);

condaTests =
# depends on mypy, which depends on CPython internals
condaTests = lib.optionalAttrs (!python.isPyPy) (
let
requests = callPackage (
{
Expand Down Expand Up @@ -276,7 +277,8 @@ let
condaExamplePackage = runCommand "import-requests" { } ''
${pythonWithRequests.interpreter} -c "import requests" > $out
'';
};
}
);

in
lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform) (
Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/python-modules/cython/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
gdb,
isPyPy,
ncurses,
numpy,
pkg-config,
Expand Down Expand Up @@ -36,7 +37,9 @@ buildPythonPackage rec {
ncurses
];

env.LC_ALL = "en_US.UTF-8";
env = lib.optionalAttrs (!isPyPy) {
LC_ALL = "en_US.UTF-8";
};

# https://github.com/cython/cython/issues/2785
# Temporary solution
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/mypy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
gitUpdater,
pythonAtLeast,
pythonOlder,
isPyPy,

# build-system
setuptools,
Expand Down Expand Up @@ -35,7 +36,8 @@ buildPythonPackage rec {
version = "1.15.0";
pyproject = true;

disabled = pythonOlder "3.8";
# relies on several CPython internals
disabled = pythonOlder "3.8" || isPyPy;

src = fetchFromGitHub {
owner = "python";
Expand Down
Loading