Skip to content

Comments

[Backport staging-25.05] qt6: 6.9.0 -> 6.9.1#415929

Merged
K900 merged 2 commits intostaging-25.05from
backport-415926-to-staging-25.05
Jun 11, 2025
Merged

[Backport staging-25.05] qt6: 6.9.0 -> 6.9.1#415929
K900 merged 2 commits intostaging-25.05from
backport-415926-to-staging-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jun 11, 2025

Bot-based backport to staging-25.05, triggered by a label in #415926.

  • 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.

dotlambda added 2 commits June 11, 2025 19:32
@dotlambda @github-actions
qt6: 6.9.0 -> 6.9.1
6f5796a 
(cherry picked from commit b357ca7)
@dotlambda @github-actions
qt6Packages.qtmqtt: 6.9.0 -> 6.9.1
32a0189 
(cherry picked from commit 373cd32)
@nixpkgs-ci nixpkgs-ci bot added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jun 11, 2025
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jun 11, 2025
Merged
13 tasks
@github-actions github-actions bot added the 4.workflow: backport This targets a stable branch label Jun 11, 2025
@K900 K900 merged commit 625453d into staging-25.05 Jun 11, 2025
12 of 16 checks passed
@github-actions github-actions bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 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. labels Jun 11, 2025
@wolfgangwalther wolfgangwalther deleted the backport-415926-to-staging-25.05 branch June 12, 2025 20:29
@vcunat
Copy link
Member

vcunat commented Jun 24, 2025

Had to add 3c40897 from PR #413773

@vcunat
Copy link
Member

vcunat commented Jul 2, 2025 •
edited
Loading

Now kdePackages.plasma-systemmonitor blocks the channel (both *-linux). I assume it needs updating?

FAILED: src/page/.rcc/qmlcache/PlasmaSystemMonitorPage_MissingSensorsDialog_qml.cpp /build/plasma-systemmonitor-6.3.5/build/src/page/.rcc/qmlcache/PlasmaSystemMonitorPage_MissingSensorsDialog_qml.cpp 
cd /build/plasma-systemmonitor-6.3.5/build/src/page && /nix/store/29ax4k0a83zhz43lb73cv610d95wdsx1-cmake-3.31.6/bin/cmake -E make_directory /build/plasma-systemmonitor-6.3.5/build/src/page/.rcc/qmlcache && /nix/store/xrp1gz
bzv1q5ybkz3pz9hria4l69bk3v-qtdeclarative-6.9.1/libexec/qmlcachegen --bare --resource-path /qt/qml/org/kde/ksysguard/page/MissingSensorsDialog.qml -I /build/plasma-systemmonitor-6.3.5/build/bin/ -I /nix/store/xrp1gzbzv1q5ybk
z3pz9hria4l69bk3v-qtdeclarative-6.9.1/lib/qt-6/qml -I /nix/store/5g6hnqkm5bxh4h10jihn5lhigwwks4q1-qt5compat-6.9.1/lib/qt-6/qml -i /build/plasma-systemmonitor-6.3.5/build/bin/org/kde/ksysguard/page/qmldir --resource /build/p
lasma-systemmonitor-6.3.5/build/src/page/.qt/rcc/qmake_org_kde_ksysguard_page.qrc --resource /build/p
lasma-systemmonitor-6.3.5/build/src/page/.qt/rcc/PlasmaSystemMonitorPage_raw_qml_0.qrc -o /build/plasma-systemmonitor-6.3.5/build/src/page/.rcc/qmlcache/PlasmaSystemMonitorPage_MissingSensorsDialog_qml.cpp /build/plasma-systemmonitor-6.3.5/src/page/MissingSensorsDialog.qml

on Hydra e.g. https://hydra.nixos.org/build/301545847/nixlog/2/tail

@K900
Copy link
Contributor

K900 commented Jul 2, 2025

I think we may need https://invent.kde.org/qt/qt/qtdeclarative/-/commit/672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a ...

@vcunat
Copy link
Member

vcunat commented Jul 2, 2025 •
edited
Loading

I think it was a mistake to let this update into release-25.05 before master. (I didn't even realize until now; I had been searching for fixes on master also in case of issues that looked related to this PR.)

@vcunat
Copy link
Member

vcunat commented Jul 2, 2025

Drafting as #421849

@vcunat
Copy link
Member

vcunat commented Jul 4, 2025

For reference, qtwebengine apparently regressed on aarch64-darwin, though I don't expect that's considered important:
https://hydra.nixos.org/build/301703731

@Prince213
Copy link
Member

Prince213 commented Jul 10, 2025 •
edited
Loading

For reference, qtwebengine apparently regressed on aarch64-darwin, though I don't expect that's considered important: https://hydra.nixos.org/build/301703731

Should be fixed by #423843, #424029 and #424034.

@Prince213 Prince213 mentioned this pull request Jul 13, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

@K900 K900 Awaiting requested review from K900

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@NickCao NickCao Awaiting requested review from NickCao

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin 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: 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@vcunat @K900 @Prince213 @dotlambda