[25.05] qt6, python3Packages.pyside6: 6.9.1 -> 6.9.2#437559
Merged
K900 merged 2 commits intoNixOS:staging-25.05from Aug 27, 2025
Merged
[25.05] qt6, python3Packages.pyside6: 6.9.1 -> 6.9.2#437559K900 merged 2 commits intoNixOS:staging-25.05from
K900 merged 2 commits intoNixOS:staging-25.05from
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between d5db150 and original 5c99d67 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
qt6: 6.9.1 -> 6.9.2
+ (cherry picked from commit 5c99d67b8618876563e7b9eacf7567cc62aeb7fd)
+
## pkgs/development/libraries/qt-6/fetch.sh ##
@@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.2/submodules/ -A '*.tar.xz' )
- ## pkgs/development/libraries/qt-6/modules/qtbase/default.nix ##
-@@
- libinput,
- # options
- qttranslations ? null,
-- fetchpatch,
- }:
-
- let
-@@ pkgs/development/libraries/qt-6/modules/qtbase/default.nix: stdenv.mkDerivation rec {
- ./qmlimportscanner-import-path.patch
- # don't pass qtbase's QML directory to qmlimportscanner if it's empty
- ./skip-missing-qml-directory.patch
--
-- # Backport patch recommended by KDE to fix HTTP2 stream corruption issues
-- # FIXME: remove in 6.9.2
-- (fetchpatch {
-- url = "https://invent.kde.org/qt/qt/qtbase/-/commit/904aec2f372e2981af19bf762583a0ef42ec6bb9.diff";
-- hash = "sha256-bSf4TgYUk7Ariu37NHGQKv6wFArVpQLlnHCTbCFzAfI=";
-- })
- ];
-
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-
## pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix ##
@@
lib,
@@ pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
coreutils,
- fetchpatch2,
flex,
+ git,
gperf,
- ninja,
@@ pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix: qtModule {
# Reproducibility QTBUG-136068
./gn-object-sorted.patch
--
+- ]
+- ++ lib.optionals stdenv.cc.isClang [
- # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
- (fetchpatch2 {
- url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1";
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
nixpkgs-ci
bot
added
10.rebuild-linux: 501+
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Manual backport of #437556.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.