Skip to content

staging-next 2025-09-21#444862

Merged
vcunat merged 1353 commits intomasterfrom
staging-next
Oct 5, 2025
Merged

staging-next 2025-09-21#444862
vcunat merged 1353 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Sep 21, 2025

@vcunat vcunat added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 21, 2025
@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 Sep 21, 2025
nixpkgs-ci bot and others added 3 commits September 21, 2025 06:05
We were already technically tracking unstable here,
so just update to the latest commit which includes
a cmake 4 fix.
K900 and others added 2 commits October 4, 2025 21:10
Since #420382, we set an absolute default CLANG_RESOURCE_DIR for LLVM
versions >= 21, which breaks the bootstrap tools because the absolute
path was removed by nuke-ref while building and isn't there while
bootstrapping.

Pass -resource-dir explicitly while testing Clang to make it work.
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 4, 2025
Even though this patch is really for Qt 6, the code affected was
unchanged, and the patch applies cleanly.

Patch is temporarily conditional on x86_64-darwin to avoid extra
rebuilds on staging-next.
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 5, 2025
@qbisi qbisi mentioned this pull request Oct 5, 2025
13 tasks
@vcunat vcunat added this pull request to the merge queue Oct 5, 2025
Merged via the queue into master with commit 15ed8f7 Oct 5, 2025
36 checks passed
@qbisi qbisi mentioned this pull request Oct 5, 2025
13 tasks
@leonklingele leonklingele mentioned this pull request Oct 6, 2025
13 tasks
@vcunat vcunat mentioned this pull request Oct 7, 2025
@qbisi qbisi mentioned this pull request Oct 9, 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.