Skip to content

[Backport release-25.05] pypy: 7.3.17 -> 7.3.19#408059

Merged
wolfgangwalther merged 7 commits intorelease-25.05from
backport-393847-to-release-25.05
Aug 25, 2025
Merged

[Backport release-25.05] pypy: 7.3.17 -> 7.3.19#408059
wolfgangwalther merged 7 commits intorelease-25.05from
backport-393847-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented May 17, 2025

Bot-based backport to release-25.05, triggered by a label in #393847.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 17, 2025
Merged
8 tasks
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 4.workflow: backport This targets a stable branch labels May 17, 2025
@nix-owners nix-owners bot requested review from mweinelt and natsukium May 17, 2025 17:33
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 17, 2025
@nix-owners nix-owners bot requested a review from andersk May 17, 2025 17:38
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 408059

x86_64-linux

❌ 2 packages failed to build:
  • fbpanel
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

aarch64-linux

❌ 2 packages failed to build:
  • fbpanel
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

x86_64-darwin

❌ 1 package failed to build:
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

aarch64-darwin

❌ 1 package failed to build:
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

tests.writers.simple.pypy3NoLibs seems to be a regression.

@wolfgangwalther wolfgangwalther marked this pull request as draft June 1, 2025 07:56
@FliegendeWurst
Copy link
Member

FliegendeWurst commented Jun 1, 2025 •
edited
Loading

Yeah looks like it. Proper fix will take a staging cycle. #412921

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 26, 2025
@wolfgangwalther wolfgangwalther force-pushed the backport-393847-to-release-25.05 branch from 5a68587 to b972812 Compare August 9, 2025 16:45
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Aug 9, 2025

Rebased and resolved nixfmt-related conflicts. Since at least one staging cycle has passed, I assume this is ready.

@wolfgangwalther wolfgangwalther marked this pull request as ready for review August 9, 2025 16:45
github-actions[bot]

This comment was marked as resolved.

Sign in to view

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 9, 2025
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Aug 9, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 408059
Commit: b9728122ba70233eaa2575eb74da3f914ee960bb

x86_64-linux

❌ 2 packages failed to build:
  • fbpanel
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

aarch64-linux

❌ 2 packages failed to build:
  • fbpanel
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

x86_64-darwin

❌ 1 package failed to build:
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

aarch64-darwin

❌ 1 package failed to build:
  • tests.writers.simple.pypy3NoLibs
✅ 6 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310
Error logs: `x86_64-linux`
fbpanel 
plugin.h:32:38: warning: 'struct _plugin_instance' declared inside parameter list will not be visible outside of this definition or declaration
   32 |     GtkWidget *(*edit_config)(struct _plugin_instance *this);
      |                                      ^~~~~~~~~~~~~~~~
plugin.c: In function 'plugin_start':
plugin.c:188:35: error: passing argument 1 of 'this->class->constructor' from incompatible pointer type [8;;https://gcc.gnu.org/onlinedocs/gcc-14.3.0/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Wincompatible-pointer-types8;;]
  188 |     if (!this->class->constructor(this)) {
      |                                   ^~~~
      |                                   |
      |                                   plugin_instance * {aka struct _plugin_instance *}
plugin.c:188:35: note: expected 'struct _plugin_instance *' but argument is of type 'plugin_instance *' {aka 'struct _plugin_instance *'}
plugin.c: In function 'plugin_stop':
plugin.c:202:29: error: passing argument 1 of 'this->class->destructor' from incompatible pointer type [8;;https://gcc.gnu.org/onlinedocs/gcc-14.3.0/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Wincompatible-pointer-types8;;]
  202 |     this->class->destructor(this);
      |                             ^~~~
      |                             |
      |                             plugin_instance * {aka struct _plugin_instance *}
plugin.c:202:29: note: expected 'struct _plugin_instance *' but argument is of type 'plugin_instance *' {aka 'struct _plugin_instance *'}
make[1]: *** [../.config/rules.mk:276: plugin.o] Error 1
make[1]: Leaving directory '/build/source/panel'
make: *** [.config/rules.mk:46: panel] Error 2
Error logs: `aarch64-linux`
fbpanel 
plugin.h:32:38: warning: 'struct _plugin_instance' declared inside parameter list will not be visible outside of this definition or declaration
   32 |     GtkWidget *(*edit_config)(struct _plugin_instance *this);
      |                                      ^~~~~~~~~~~~~~~~
plugin.c: In function 'plugin_start':
plugin.c:188:35: error: passing argument 1 of 'this->class->constructor' from incompatible pointer type [8;;https://gcc.gnu.org/onlinedocs/gcc-14.3.0/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Wincompatible-pointer-types8;;]
  188 |     if (!this->class->constructor(this)) {
      |                                   ^~~~
      |                                   |
      |                                   plugin_instance * {aka struct _plugin_instance *}
plugin.c:188:35: note: expected 'struct _plugin_instance *' but argument is of type 'plugin_instance *' {aka 'struct _plugin_instance *'}
plugin.c: In function 'plugin_stop':
plugin.c:202:29: error: passing argument 1 of 'this->class->destructor' from incompatible pointer type [8;;https://gcc.gnu.org/onlinedocs/gcc-14.3.0/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Wincompatible-pointer-types8;;]
  202 |     this->class->destructor(this);
      |                             ^~~~
      |                             |
      |                             plugin_instance * {aka struct _plugin_instance *}
plugin.c:202:29: note: expected 'struct _plugin_instance *' but argument is of type 'plugin_instance *' {aka 'struct _plugin_instance *'}
make[1]: *** [../.config/rules.mk:276: plugin.o] Error 1
make[1]: Leaving directory '/build/source/panel'
make: *** [.config/rules.mk:46: panel] Error 2

tests.writers.simple.pypy3NoLibs is still failing.

@dbdr dbdr mentioned this pull request Aug 18, 2025
Closed
3 tasks
@MaxWipfli @wolfgangwalther
python3Packages.pyflakes: disable failing test for PyPy3
32d1a80 
test_misencodedFileUTF16 fails with PyPy3 as it outputs a different
error message than CPython.

(cherry picked from commit 20d8a65)
@wolfgangwalther wolfgangwalther mentioned this pull request Aug 25, 2025
Merged
13 tasks
@MaxWipfli @wolfgangwalther
fbpanel: correctly apply -Wno-error
ce15db6 
(cherry picked from commit f6b62e0)
@nix-owners nix-owners bot requested a review from 7c6f434c August 25, 2025 10:21
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Aug 25, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 408059
Commit: ce15db64e647cb08ed0fcda5c08737f3932edabb

x86_64-linux

✅ 8 packages built:
  • cvs2svn
  • cvs2svn.dist
  • fbpanel
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310
  • tests.writers.simple.pypy3NoLibs

aarch64-linux

❌ 1 package failed to build:
  • tests.writers.simple.pypy3NoLibs
✅ 7 packages built:
  • cvs2svn
  • cvs2svn.dist
  • fbpanel
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310

x86_64-darwin

✅ 7 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310
  • tests.writers.simple.pypy3NoLibs

aarch64-darwin

✅ 7 packages built:
  • cvs2svn
  • cvs2svn.dist
  • nixpkgs-manual
  • pypy (pypy2, pypy27)
  • pypy3 (pypy311)
  • pypy310
  • tests.writers.simple.pypy3NoLibs

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Aug 25, 2025

tests.writers.simple.pypy3NoLibs also fails due to a failing pyflakes dependency for aarch64-linux on release-25.05, so this is not a regression.

@wolfgangwalther wolfgangwalther dismissed github-actions[bot]’s stale review August 25, 2025 10:23

diff due to formatting change, LGTM.

@wolfgangwalther wolfgangwalther merged commit a9a378f into release-25.05 Aug 25, 2025
28 of 32 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-393847-to-release-25.05 branch August 25, 2025 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@natsukium natsukium Awaiting requested review from natsukium

@mweinelt mweinelt Awaiting requested review from mweinelt

@andersk andersk Awaiting requested review from andersk

@FliegendeWurst FliegendeWurst Awaiting requested review from FliegendeWurst

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wolfgangwalther @FliegendeWurst @MaxWipfli