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.

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

Jump to bottom

neochat / spectral cleanups #107700

Merged
merged 3 commits into from Dec 27, 2020
Merged

neochat / spectral cleanups #107700

merged 3 commits into from Dec 27, 2020

Conversation

peterhoeg
Copy link
Member

Motivation for this change

This does a few things all related to neochat:

  1. drop spectral which is no longer maintained and alias it to neochat
  2. rename/fix casing and fix up build of kquickimageedit
  3. update kquickimageedit
  4. bunch of neochat cleanups

There is some noise from nixpkgs-fmt.

Cc: @mjlbach @lovesegfault

@GrahamcOfBorg build neochat

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mjlbach
Copy link
Contributor

mjlbach commented Dec 27, 2020

Thank you for cleaning this up! I noticed you dropped kitemmodels, is this not necessary (along with the qt wrap hook)? When I was debugging the missing dependencies this had come up, but I was using stdenv.mkderivation at the time from the original spectral derivation.

SuperSandro2000
SuperSandro2000 reviewed Dec 27, 2020
View reviewed changes
pkgs/development/libraries/kquickimageedit/default.nix
sha256 = "sha256-4X3GO/NPzA3c9KiGIkznLHUjLfNNNnPXif7IFwY5dOM=";
};

nativeBuildInputs = [ extra-cmake-modules ];
Copy link
Member

Choose a reason for hiding this comment

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

Missing meta.

Copy link
Member Author

Choose a reason for hiding this comment

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

We have historically not had meta info for the KDE framework libraries which is where this will be moving when it matures.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107700 run on x86_64-linux 1

4 packages built:
  • libsForQt5.kquickimageedit (libsForQt515.kquickimageedit)
  • libsForQt512.kquickimageedit
  • libsForQt514.kquickimageedit
  • neochat

gpl3 is a deprecated license, check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

@peterhoeg
Copy link
Member Author

gpl3 is a deprecated license, check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

Nice catch, fixed.

@peterhoeg
Copy link
Member Author

I noticed you dropped kitemmodels

Not needed.

along with the qt wrap hook)?

When we use mkDerivation from libsForQt5 this is handled for us.

@peterhoeg peterhoeg merged commit 83cbd45 into NixOS:master Dec 27, 2020
@mjlbach
Copy link
Contributor

mjlbach commented Dec 27, 2020

@peterhoeg I'm sorry I didn't catch this earlier, but qtgraphicaleffects and kitemmodels are in fact needed to launch neochat on non-nixos builds.

@mjlbach
Copy link
Contributor

mjlbach commented Dec 27, 2020 

❯ nixGLNvidia ./result/bin/neochat
Gtk-Message: 14:52:46.544: Failed to load module "canberra-gtk-module"
Gtk-Message: 14:52:46.544: Failed to load module "pk-gtk-module"
Gtk-Message: 14:52:46.545: Failed to load module "canberra-gtk-module"
Gtk-Message: 14:52:46.545: Failed to load module "pk-gtk-module"
QQmlApplicationEngine failed to load component
qrc:/qml/main.qml:19:1: Type Kirigami.ApplicationWindow unavailable
file:///nix/store/1vvhlf5lyc83xapin99qc4vw93nspdf1-kirigami2-5.76.0/lib/qt-5.15.2/qml/org/kde/kirigami.2/styles/org.kde.desktop/ApplicationWindow.qml:12:1: Type Base.ApplicationWindow unavailable
file:///nix/store/1vvhlf5lyc83xapin99qc4vw93nspdf1-kirigami2-5.76.0/lib/qt-5.15.2/qml/org/kde/kirigami.2/ApplicationWindow.qml:10:1: module "QtGraphicalEffects" is not installed

❯ nixGLNvidia ./result/bin/neochat
Gtk-Message: 14:53:10.875: Failed to load module "canberra-gtk-module"
Gtk-Message: 14:53:10.875: Failed to load module "pk-gtk-module"
Gtk-Message: 14:53:10.876: Failed to load module "canberra-gtk-module"
Gtk-Message: 14:53:10.876: Failed to load module "pk-gtk-module"
QQmlApplicationEngine failed to load component
qrc:/qml/main.qml:118:20: Type RoomDrawer unavailable
qrc:/imports/NeoChat/Panel/RoomDrawer.qml:13:1: module "org.kde.kitemmodels" is not installed

@peterhoeg peterhoeg deleted the f/neochat branch December 28, 2020 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@peterhoeg @mjlbach @SuperSandro2000