Skip to content

staging-next-25.05 iteration 2 - 2025-07-29#429274

Merged
vcunat merged 205 commits intorelease-25.05from
staging-next-25.05
Aug 7, 2025
Merged

staging-next-25.05 iteration 2 - 2025-07-29#429274
vcunat merged 205 commits intorelease-25.05from
staging-next-25.05

Conversation

@vcunat
Copy link
Copy Markdown
Member

@vcunat vcunat commented Jul 29, 2025

nixpkgs-ci bot and others added 30 commits June 21, 2025 00:22
(cherry picked from commit d5cb999)
PyPy still reports the old error message in this case.

(cherry picked from commit 9d5a4d1)
Fixes #412735.

#358347 / #400315 left the package broken because configure searces for osx in PATH and hardcodes its path on the Perl code. strictDeps logically prevents the dependency from being in PATH, so an empty string is hardcoded and `sgml2xml-isoent` doesn't work.

The best fix that comes to mind is overriding the autoconf test result via the environment variable.

(cherry picked from commit d822ab9)
There hasn't been movement on this in many years since the package seems
to be in maintenance mode only, but it is a prominently used dependency,
so we'll have to ignore this, pretty much.

Reference haskellari/tree-diff#79.
Reference #384127 (comment).

(cherry picked from commit 50b7532)
(cherry picked from commit 8f7bfa2)
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=NEWS;hb=refs/tags/gnupg-2.4.8

CVE-2022-3219.patch is now
0019-Disallow-compressed-signatures-and-certificates.patch from FreePG.

Signed-off-by: misilelab <misileminecord@gmail.com>
Co-authored-by: Alyssa Ross <hi@alyssa.is>
(cherry picked from commit be9e705)
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 4.workflow: staging A staging-next or staging-next-XX.YY branch labels Jul 29, 2025
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 30, 2025
leona-ya and others added 8 commits July 30, 2025 07:50
The previous patch didn't apply anymore for 14.3.0.
Currently there is no branch for 14.3.0 in https://github.com/iains/gcc-14-branch
nor in homebrew. This lead me to use the -pre branch with a custom target.

(cherry picked from commit 0517934)
Co-authored-by: Alexander Bantyev <alexander.bantyev@moduscreate.com>
(cherry picked from commit a9d7c5e)
Same exact patch, just from upstream instead

(cherry picked from commit 1636888)
@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Aug 3, 2025

nixpkgs-ci bot and others added 6 commits August 4, 2025 00:23
The build was failing due to inconsistent ID generation in XSLT
transformations. The generate_prefs.xsl uses generate-id() which
produces different IDs between function declarations and their usage
when using libxslt.

Switching to Saxon XSLT processor resolves this issue as it handles
generate-id() more consistently.

(cherry picked from commit 3bed64f)
https://hydra.nixos.org/build/303791497
The next haskellPackages bulk update will also resolve this, but picking
the patch will prevent a broken git-annex until the next staging-next is
merged into master.

(cherry picked from commit 75542a9)
(from PR #424682)
https://hydra.nixos.org/build/303801265
@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Aug 7, 2025

@vcunat vcunat merged commit eb30076 into release-25.05 Aug 7, 2025
32 checks passed
@kirillrdy kirillrdy mentioned this pull request Aug 19, 2025
13 tasks
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. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.