Skip to content

Comments

qt6.qtdeclarative: pick a patch from upstream#421849

Merged
K900 merged 1 commit intoNixOS:stagingfrom
vcunat:p/qtdeclarative-25.05
Jul 2, 2025
Merged

qt6.qtdeclarative: pick a patch from upstream#421849
K900 merged 1 commit intoNixOS:stagingfrom
vcunat:p/qtdeclarative-25.05

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jul 2, 2025 •
edited
Loading

The point is to fix this 25.05 channel blocker:
https://hydra.nixos.org/build/301545847/nixlog/2/tail

All testing done atop release-25.05.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Jul 2, 2025
@vcunat vcunat mentioned this pull request Jul 2, 2025
Merged
1 task
@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: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 4.workflow: backport This targets a stable branch labels Jul 2, 2025
github-actions[bot]

This comment was marked as resolved.

Sign in to view

@vcunat
Copy link
Member Author

vcunat commented Jul 2, 2025

Who would guess that I need to rebuild gtk4 in order to build kdePackages.plasma-systemmonitor after qt6.qtdeclarative update.

@vcunat
Copy link
Member Author

vcunat commented Jul 2, 2025

OK, verified that this fixes kdePackages.plasma-systemmonitor build (on 25.05, libksysguard without qtwebengine).

@vcunat vcunat force-pushed the p/qtdeclarative-25.05 branch from e7b33a4 to 828aa9b Compare July 2, 2025 17:44
@vcunat vcunat changed the base branch from release-25.05 to staging July 2, 2025 17:44
@nixpkgs-ci nixpkgs-ci bot closed this Jul 2, 2025
@vcunat vcunat changed the title [25.05] qt6.qtdeclarative: pick a patch from upstream qt6.qtdeclarative: pick a patch from upstream Jul 2, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Jul 2, 2025
@vcunat vcunat marked this pull request as ready for review July 2, 2025 17:44
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 2, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 2, 2025
@vcunat vcunat dismissed github-actions[bot]’s stale review July 2, 2025 17:47

Retargeted to staging + we'll auto-backport to 25.05.

@nix-owners nix-owners bot requested a review from outfoxxed July 2, 2025 17:57
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 4.workflow: backport This targets a stable branch and removed 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 4.workflow: backport This targets a stable branch labels Jul 2, 2025
@K900 K900 merged commit bc586d0 into NixOS:staging Jul 2, 2025
35 of 57 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 2, 2025

Successfully created backport PR for staging-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jul 2, 2025
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jul 2, 2025
Merged
1 task
@vcunat vcunat deleted the p/qtdeclarative-25.05 branch July 2, 2025 18:04
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 2, 2025

Successfully created backport PR for release-25.05:

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

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@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

@outfoxxed outfoxxed Awaiting requested review from outfoxxed

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vcunat @K900