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

nheko: add identicons support #150487

Merged

Conversation

unclechu
Copy link
Member

Motivation for this change

Nheko has support for identicons. There is a checkbox in the settings of nheko but it wasn’t clickable because the dependency (“qt-jdenticon” plugin) was missing.

This change adds “qt-jdenticon” as a new package (Qt plugin) and as a dependency for Nheko. This package is maintained by Nheko team.

2021-12-13 00-59-48

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.05 Release Notes (or backporting 21.11 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.

@unclechu unclechu mentioned this pull request Dec 12, 2021
13 tasks
@unclechu unclechu requested review from Ekleog and fpletz December 12, 2021 23:15
@unclechu
Copy link
Member Author

Context reference: #150437 (comment)

@unclechu unclechu force-pushed the nheko-add-qt-jdenticon-dependency branch 2 times, most recently from f868254 to aa95e4f Compare December 12, 2021 23:21
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And please change the git history into two commits:

libsForQt5.qt-jdenticon: init at 0.2.1

And:

nheko: Add support for `jdenticon`

Or alike.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 19, 2022
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
@doronbehar
Copy link
Contributor

qt-jdenticon is meant for qt5, and nheko is built with qt6. Closing.

@doronbehar doronbehar closed this Oct 31, 2024
@unclechu
Copy link
Member Author

unclechu commented Oct 31, 2024

@doronbehar

qt-jdenticon is meant for qt5, and nheko is built with qt6. Closing.

It works for me on Nheko build for Qt6. Here is a demonstration:

https://github.com/unclechu/nixos-config/blob/1fcdb7e65cb21e523c81adc5c6d5cbea947a6cd5/apps/nheko/default.nix#L28-L59

https://github.com/unclechu/nixos-config/blob/1fcdb7e65cb21e523c81adc5c6d5cbea947a6cd5/apps/nheko/default.nix#L73-L76

It works both for Qt5 and Qt6 just fine.

@unclechu unclechu reopened this Oct 31, 2024
@doronbehar
Copy link
Contributor

Hmm OK, then please add it to both qt5-packages.nix and qt6-packages.nix, as I asked you already 3 years ago :) fix the merge conflicts, and we'll see. Also, remember to separate the qt-jdenticon: init commit to a separate commit.

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 31, 2024
@unclechu unclechu force-pushed the nheko-add-qt-jdenticon-dependency branch from aa95e4f to 4443077 Compare December 22, 2024 05:10
@unclechu
Copy link
Member Author

@doronbehar I fixed everything, please have another look.

I think I was wrong about qt-jdenticon was working both for Qt5 and Qt6. 0.2.* was made for Qt5 but I was actually using 0.3.0 that is made to work with Qt6, with newer Nheko. So I didn’t add the package to qt5-packages.nix, I assume it won’t work judging by CMake configuration file which only mentions Qt6. But I added the package to qt6-packages.nix (removed from all-packages.nix).

  • So now it’s 0.3.0 version instead of 0.2.1
  • I made separate commits for adding qt-jdenticon package and using the package for Nheko
  • Applied new nixfmt
  • Tested that the library package builds like this: nix-build -E 'with import ./. {}; qt6Packages.qt-jdenticon'
  • And built Nheko like this: nix-build -E 'with import ./. { config.permittedInsecurePackages=["olm-3.2.16"]; }; nheko' and tested that jdenticons are rendered properly: 2024-12-22 07-06-14

@unclechu unclechu requested a review from doronbehar December 22, 2024 05:19
@doronbehar
Copy link
Contributor

I added a few minor modifications which were hard to explain in a review :), and forced pushed. I'm sure you won't mind.

@doronbehar doronbehar force-pushed the nheko-add-qt-jdenticon-dependency branch from 4443077 to 4a83946 Compare December 22, 2024 09:23
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Dec 22, 2024
@github-actions github-actions bot removed 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: policy discussion 6.topic: golang 6.topic: vim 6.topic: ocaml 6.topic: nodejs 6.topic: hardware 6.topic: coq "A formal proof management system" 6.topic: pantheon The Pantheon desktop environment 6.topic: lua 6.topic: docker tools 6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: cuda Parallel computing platform and API 6.topic: vscode 6.topic: lib The Nixpkgs function library 6.topic: games 6.topic: php 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET 6.topic: nvidia 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Dec 22, 2024
@doronbehar doronbehar marked this pull request as ready for review December 22, 2024 09:30
@adamcstephens adamcstephens merged commit 4323f32 into NixOS:master Dec 22, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants