Skip to content

zeal: migrate to pkgs/by-name, use qt6#438676

Merged
fabianhjr merged 1 commit intoNixOS:masterfrom
Jylhis:zeal
Aug 31, 2025
Merged

zeal: migrate to pkgs/by-name, use qt6#438676
fabianhjr merged 1 commit intoNixOS:masterfrom
Jylhis:zeal

Conversation

@Jylhis
Copy link
Contributor

@Jylhis Jylhis commented Aug 30, 2025

Motivated by qt5.qtwebengine being marked vulnerable (#435067):

  • Move package from pkgs/data/documentation to pkgs/by-name/ze/zeal
  • Switch from Qt5 to Qt6 as the default
  • Remove zeal-qt5 and zeal-qt6 variants in favor of single Qt6 version
  • Add aliases for deprecated Qt-specific variants

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle! labels Aug 30, 2025
@nix-owners nix-owners bot requested a review from peterhoeg August 30, 2025 17:22
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 30, 2025
Motivated by qt5.qtwebengine being marked vulnerable (NixOS#435067):
- Move package from pkgs/data/documentation to pkgs/by-name/ze/zeal
- Switch from Qt5 to Qt6 as the default
- Remove zeal-qt5 and zeal-qt6 variants in favor of single Qt6 version
- Add aliases for deprecated Qt-specific variants
@fabianhjr fabianhjr merged commit 62b595b into NixOS:master Aug 31, 2025
25 of 27 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Sep 1, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-438676-to-release-25.05 origin/release-25.05
cd .worktree/backport-438676-to-release-25.05
git switch --create backport-438676-to-release-25.05
git cherry-pick -x 0e805d89c1af8e75b872d19916bd9e1586ae56f7

@mdaniels5757 mdaniels5757 added 8.has: port to stable This PR already has a backport to the stable release. and removed backport release-25.05 labels Sep 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants