From 0e805d89c1af8e75b872d19916bd9e1586ae56f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Jylh=C3=A4nkangas?= <markus@jylhis.com>
Date: Sat, 30 Aug 2025 22:46:14 +0200
Subject: [PATCH] zeal: migrate to pkgs/by-name, use qt6

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
---
 .../ze/zeal/package.nix}                      | 24 ++++++-------------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  6 -----
 3 files changed, 9 insertions(+), 23 deletions(-)
 rename pkgs/{data/documentation/zeal/default.nix => by-name/ze/zeal/package.nix} (80%)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/by-name/ze/zeal/package.nix
similarity index 80%
rename from pkgs/data/documentation/zeal/default.nix
rename to pkgs/by-name/ze/zeal/package.nix
index dde6f06a4182..5c410836489c 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -6,21 +6,12 @@
   extra-cmake-modules,
   pkg-config,
   httplib,
-  qtbase,
-  qtimageformats,
-  qtwebengine,
-  qtx11extras,
   libarchive,
   libXdmcp,
   libpthreadstubs,
-  wrapQtAppsHook,
   xcbutilkeysyms,
+  qt6,
 }:
-
-let
-  isQt5 = lib.versions.major qtbase.version == "5";
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zeal";
   version = "0.7.2";
@@ -36,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -44,12 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libarchive
     libpthreadstubs
-    qtbase
-    qtimageformats
-    qtwebengine
+    qt6.qtbase
+    qt6.qtimageformats
+    qt6.qtwebengine
     xcbutilkeysyms
-  ]
-  ++ lib.optionals isQt5 [ qtx11extras ];
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "ZEAL_RELEASE_BUILD" true)
@@ -68,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
       peterhoeg
     ];
     mainProgram = "zeal";
-    inherit (qtbase.meta) platforms;
+    inherit (qt6.qtbase.meta) platforms;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 06decd7bd8db..b7b3ce3fa5eb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2536,6 +2536,8 @@ mapAliases {
   zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";
   zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'.";
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
+  zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
+  zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
   zeroadPackages = recurseIntoAttrs {
     zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
     zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 325ae8a848eb..77319f9ae72c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11178,12 +11178,6 @@ with pkgs;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
 
-  zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
-  zeal = zeal-qt5;
-  zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {
-    qtx11extras = null; # Because it does not exist in qt6
-  };
-
   ### APPLICATIONS / GIS
 
   qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };