Skip to content
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.

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

zeal: unstable-2021-12-25 → unstable-2022-10-02 #202103

Merged
merged 1 commit into from
Nov 22, 2022

Conversation

fabianhjr
Copy link
Member

@fabianhjr fabianhjr commented Nov 20, 2022

Change of note: qt5 → qt6

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@fabianhjr fabianhjr changed the title zeal: unstable-2021-12-25 → 2022-10-02 zeal: unstable-2021-12-25 → unstable-2022-10-02 Nov 20, 2022
@fabianhjr
Copy link
Member Author

image

@peterhoeg
Copy link
Member

Why the move to qt6? I'm not saying not to do it, but what is the reason?

@fabianhjr
Copy link
Member Author

fabianhjr commented Nov 21, 2022

In general because, Upstream added qt6 support on July ( zealdocs/zeal#1420 )

Personally because qt 6.4.1 compiled out of the box with gcc12 and qt 5.15.7 didn't (checked, still the latest lgpl patch release)

@peterhoeg
Copy link
Member

peterhoeg commented Nov 21, 2022

The issue with qt6 is that the applications look like crap under KDE because the theme isn't picked up automatically. I'm much more in favour of doing something like this instead:

{
  zeal-qt5 = libsForQt5.callPac......;
  zeal-qt6 = qt6Packages.callPac......;
  zeal = zeal-qt5;
}

At least people have a choice between TheNewHotness and Doesn'tLookLikeTheRedHeadedStepChild.

At least as long as upstream supports both.

A different example is something like Calibre that has moved to Qt6 dropping Qt5 support where we obviously don't have a choice.

@fabianhjr
Copy link
Member Author

Oh, I wasn't aware of that issue. Will amend the merge request like that.

@fabianhjr
Copy link
Member Author

Only tested zeal-qt6 on GNOME 43, could you test zeal-qt5?

@peterhoeg
Copy link
Member

Have a look at #202131 for how to deal with the differences between qt5 and qt6.

@fabianhjr
Copy link
Member Author

Oh right

(if isQt5 then [
    qtlocation
  ]

That is very useful.

@ofborg ofborg bot requested a review from peterhoeg November 21, 2022 16:07
@peterhoeg peterhoeg merged commit 3be2a76 into NixOS:master Nov 22, 2022
@fabianhjr fabianhjr deleted the update-zeal branch November 22, 2022 03:46
@totoroot totoroot mentioned this pull request Apr 24, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants