Skip to content

staging-next-25.11 iteration 1 - 2025-12-06#468267

Merged
vcunat merged 140 commits intorelease-25.11from
staging-next-25.11
Dec 15, 2025
Merged

staging-next-25.11 iteration 1 - 2025-12-06#468267
vcunat merged 140 commits intorelease-25.11from
staging-next-25.11

Conversation

qbisi and others added 30 commits November 16, 2025 15:31
This commit, together with #442540,
changes the way python environments are built:

  * When generating wrappers for python executables, we inherit argv[0]
    from the wrapper. This causes python to initialize its configuration
    in the environment with all the correct paths.
  * We also resolve argv[0] to absolute path when invoking python from
    PATH. This helps set python's prefix correctly on Darwin.

The end result is that python environments no longer appear to be venvs,
and behave more like a vanilla python installation. In addition it's
possible to create a venv using an environment and use packages from
both the environment and the venv.

(cherry picked from commit abe61db)
This is necessary after #445095,
which moved libc++ to -cxx-isystem to improve compatibility with build
systems that invoke `clang` to compile C++ code.

(cherry picked from commit d46fa26)
(cherry picked from commit 1af2b4e)
(cherry picked from commit 9e6e563)
This patch is included in 2.58.1.

(cherry picked from commit 2344c36)
This is a security release and the APNG patch applies as is without
modification from 1.6.50

Link: https://www.openwall.com/lists/oss-security/2025/11/22/1
Fixes: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018
(cherry picked from commit 2a692fc)
Static linux-pam is marked broken.

(cherry picked from commit 49ba430)
@vcunat
Copy link
Member Author

vcunat commented Dec 10, 2025

nixpkgs-ci bot and others added 23 commits December 10, 2025 17:30
The binary on cache.nixos.org was broken, probably badly signed,
as shown e.g. by ./result-bin/bin/autogen --help
It's unknown how it broke, but we need to rebuild it to fix many builds
https://hydra.nixos.org/build/315983923/nixlog/4/tail

Thanks to emilazy for finding the problem and workaround.
It's failing on Hydra even after many retries.  I fail to reproduce
the issue and log looks like some parallel-make problem:
https://hydra.nixos.org/build/315811942#tabs-buildsteps

It's weird that other versions and other platforms
don't seem to suffer from this issue.
Unfortunately, hundreds of Hydra jobs depend on this one.
(cherry picked from commit 728441c)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/316138852/nixlog/3/tail
Boulder has mostly removed keys and certificates for testing in the
meantime. They have to be generated on-the-fly. The ipki keys just
require minica. The webpki keys would require softhsm and this somehow
fails. We currently get away without them, probably because we have
disabled all the tests that require them.

(cherry picked from commit edcf84b)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/315683959/nixlog/3/tail
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 717c6fc)
(cherry picked from commit 4c883a2)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/315685706/nixlog/4/tail
(cherry picked from commit 8a9d84b)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/316012891/nixlog/3/tail
(cherry picked from commit 41c3b51)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/315744664/nixlog/4/tail
(cherry picked from commit cb2743d)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/315971344/nixlog/3/tail
(cherry picked from commit fb6b69a)
This fixes the build.  I haven't investigated what's going on.
https://hydra.nixos.org/build/315984931/nixlog/3/tail
This broke via staging merge.

(cherry picked from commit ee0923a)
(cherry picked from commit 9b2c8bd)
@vcunat vcunat added this pull request to the merge queue Dec 15, 2025
Merged via the queue into release-25.11 with commit c6f52eb Dec 15, 2025
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 4.workflow: staging A staging-next or staging-next-XX.YY branch 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.