Skip to content

[25.05] zeal: migrate to pkgs/by-name, use qt6 #439086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 1 commit into from
Sep 1, 2025
Merged

[25.05] zeal: migrate to pkgs/by-name, use qt6 #439086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions pkgs/data/documentation/zeal/default.nix → pkgs/by-name/ze/zeal/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -36,20 +27,19 @@ stdenv.mkDerivation (finalAttrs: {
cmake
extra-cmake-modules
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
];

buildInputs = [
httplib
libXdmcp
libarchive
libpthreadstubs
qtbase
qtimageformats
qtwebengine
qt6.qtbase
qt6.qtimageformats
qt6.qtwebengine
xcbutilkeysyms
]
++ lib.optionals isQt5 [ qtx11extras ];
];

cmakeFlags = [
(lib.cmakeBool "ZEAL_RELEASE_BUILD" true)
Expand All @@ -68,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
peterhoeg
];
mainProgram = "zeal";
inherit (qtbase.meta) platforms;
inherit (qt6.qtbase.meta) platforms;
};
})
2 changes: 2 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,8 @@ mapAliases {
z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
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'.";
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
Expand Down
6 changes: 0 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11922,12 +11922,6 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};

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 { };
Expand Down
Loading