quaternion: update, libquotient: init #84160

colemickens · 2020-04-03T02:06:36Z

Motivation for this change

It seems like quaternion (a matrix client) has moved from libqmatrixclient to libQuotient.

This PR includes two commits:

libQuotient: init at 0.5.3.2
quaternion: 0.0.9.4c -> 0.0.9.4e

Things done

doronbehar · 2020-04-03T08:05:13Z

@GrahamcOfBorg eval

doronbehar · 2020-04-03T08:09:49Z

Has moved from libqmatrixclient to libQuotient.

I thought it was just a rename. Could you please swtich the libQuotient: init commit to a:

libqmatrixclient: rename to libQuotient ?

Reference: quotient-im/libQuotient@3d2b359

Perhaps you should add that link to the commit message.

pkgs/applications/networking/instant-messengers/quaternion/default.nix

pkgs/top-level/all-packages.nix

Emantor · 2020-04-03T12:21:34Z

Error was:

error: while evaluating 'callPackageWith' at /home/phoenix/.cache/nixpkgs-review/pr-84160/nixpkgs/lib/customisation.nix:117:35, called from /home/phoenix/.cache/nixpkgs-review/pr-84160/nixpkgs/pkgs/top-level/all-packages.nix:1234:12:
while evaluating 'makeOverridable' at /home/phoenix/.cache/nixpkgs-review/pr-84160/nixpkgs/lib/customisation.nix:67:24, called from /home/phoenix/.cache/nixpkgs-review/pr-84160/nixpkgs/lib/customisation.nix:121:8:
undefined variable 'version' at /home/phoenix/.cache/nixpkgs-review/pr-84160/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix:22:14

Note that this removes quaternion-git, which should probably point to quaternion.

colemickens · 2020-04-04T06:38:05Z

Eh, I don't think there's a clean way to split this into two commits. It should probably be squashed to one but I've forced-pushed this enough times for one night.

nixpkgs-review rev HEAD passes.

colemickens · 2020-04-04T06:39:18Z

I'm not sure what to do about removing quaternion-git. Do I do that in top-level/aliases.nix ?

doronbehar · 2020-04-04T11:34:58Z

Eh, I don't think there's a clean way to split this into two commits. It should probably be squashed to one but I've forced-pushed this enough times for one night.

It's OK don't mind it.

I'm not sure what to do about removing quaternion-git. Do I do that in top-level/aliases.nix ?

I'd apply this patch, for both quaternion-git and libqmatrixclient:

diff --git i/pkgs/top-level/aliases.nix w/pkgs/top-level/aliases.nix
index 88e7d4d9e84..f77bf5374c8 100644
--- i/pkgs/top-level/aliases.nix
+++ w/pkgs/top-level/aliases.nix
@@ -33,6 +33,8 @@ in
   ### Deprecated aliases - for backward compatibility
 
 mapAliases ({
+  quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-04
+  libqmatrixclient = throw "libqmatrixclient was renamed to libQuotient"; # added 2020-04-04
   PPSSPP = ppsspp; # added 2017-10-01
   QmidiNet = qmidinet;  # added 2016-05-22
   accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19

With the commit message:

aliases: throw messages for libqmatrixclient and quaternion-git

And another commit removing libqmatrixclient with the message:

libqmatrixclient: remove at 0.4.2.1 & 0.5.2

doronbehar · 2020-04-04T11:44:23Z

@colemickens Also, please add yourself as maintainer to libQuotient.

colemickens · 2020-04-10T01:40:10Z

There we go, all of these commits look good. I think I've addressed all feedback.

colemickens · 2020-04-10T01:46:10Z

I'm not sure this works though. Can an existing user validate if this works in non-Sway desktops? The main widget is just always white, so even after it syncs there is no chat contents.

colemickens · 2020-04-10T01:47:57Z

Seems related:

Rendering QML with QQuickWidget
qrc:/qml/Timeline.qml:4:1: module "QtQuick.Layouts" is not installed
qrc:/qml/Timeline.qml:3:1: module "QtQuick.Controls.Styles" is not installed
qrc:/qml/Timeline.qml:1:1: module "QtQuick" is not installed
qrc:/qml/Timeline.qml:2:1: module "QtQuick.Controls" is not installed
qrc:/qml/Timeline.qml:4:1: module "QtQuick.Layouts" is not installed
qrc:/qml/Timeline.qml:3:1: module "QtQuick.Controls.Styles" is not installed
qrc:/qml/Timeline.qml:1:1: module "QtQuick" is not installed
qrc:/qml/Timeline.qml:2:1: module "QtQuick.Controls" is not installed
qrc:/qml/Timeline.qml:4:1: module "QtQuick.Layouts" is not installed
qrc:/qml/Timeline.qml:3:1: module "QtQuick.Controls.Styles" is not installed
qrc:/qml/Timeline.qml:1:1: module "QtQuick" is not installed
qrc:/qml/Timeline.qml:2:1: module "QtQuick.Controls" is not installed
qrc:/qml/Timeline.qml:4:1: module "QtQuick.Layouts" is not installed
qrc:/qml/Timeline.qml:3:1: module "QtQuick.Controls.Styles" is not installed
qrc:/qml/Timeline.qml:1:1: module "QtQuick" is not installed
qrc:/qml/Timeline.qml:2:1: module "QtQuick.Controls" is not installed

colemickens · 2020-04-10T01:55:46Z

I feel like this is missing some usual wrapper that I'm expecting for a qt5 app. I'll dig into it more.

peterhoeg · 2020-04-10T02:02:18Z

I pulled down the patch a few days ago and have been running it here on KDE since without any issues.

Emantor

Per https://nixos.org/nixpkgs/manual/#sec-language-qt

Emantor · 2020-04-10T06:00:17Z

pkgs/development/libraries/libQuotient/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtmultimedia }:
+
+stdenv.mkDerivation rec {


Suggested change

stdenv.mkDerivation rec {

mkDerivation rec {

Emantor · 2020-04-10T06:00:26Z

pkgs/development/libraries/libQuotient/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtmultimedia }:


Suggested change

{ stdenv, fetchFromGitHub, cmake, qtbase, qtmultimedia }:

{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }:

Emantor · 2020-04-10T06:45:14Z

pkgs/development/libraries/libQuotient/default.nix

+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {


Suggested change

meta = with stdenv.lib; {

meta = with lib; {

Emantor · 2020-04-10T06:50:31Z

pkgs/applications/networking/instant-messengers/quaternion/default.nix

-    buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ];
-
-    nativeBuildInputs = [ cmake qttools ];
+stdenv.mkDerivation rec {


Suggested change

stdenv.mkDerivation rec {

mkDerivation rec {

colemickens · 2020-04-10T09:45:57Z

Thanks @Emantor, that did the trick, working for me with Wayland/sway.

(It did crash fairly easily, but I'm going to ignore that, I know there's other Qt5 updates coming and I know they include Wayland improvements.)

I think this is good to go now.

doronbehar · 2020-04-10T10:24:16Z

I got segmentation fault after login and pressing "No" here:

But I can't reproduce... Anyway, this sounds like an upstream issue we shouldn't quarrel about.

Besides that, all looks good to me.

peterhoeg · 2020-04-10T13:07:48Z

Should be libquotient instead of libQuotient. Otherwise good to go!

colemickens · 2020-04-13T19:49:24Z

Hmm. Why should it be libquotient? It seems to be libQuotient everywhere in the source and the cmake name is capitalized as well: project(Quotient VERSION "${API_VERSION}.0" LANGUAGES CXX).

I'm not really a fan of the mixed-case name myself, but I figured it was better to call that package what it's called upstream. I think it prevents cases of someone coming along and saying "oh, where is libQuotient, it's not here, I'll package it... oh wait it's already packaged as libquotient", which just happened to me with libturbojpeg/libjpeg_turbo.

Is there a convention here we follow or am I reading the situation wrong? Thanks!

doronbehar · 2020-04-13T20:18:11Z

Yea I too think it's not that important @colemickens . The best advice for a "wait libfoo is not packaged?" is to use nix search lib foo which most of the times works. @colemickens Could you please fix the merge conflicts?

peterhoeg · 2020-04-13T23:52:32Z

To avoid exactly the problem you mention, the convention is that they are all lower case. I mean, the software referenced here "Quaternion" is still called "quaternion".

doronbehar · 2020-04-14T09:28:08Z

@colemickens Though I slightly disagree with @peterhoeg, he has commit access whereas I don't :). I'm confident you will finally get your PR merged once you'd only rename libQuotient to libquotient. Don't forget the aliases.nix as well.

worldofpeace · 2020-04-14T12:43:13Z

The nixpkgs manual actually mentions that attributes in all-packages.nix should be all lowercase like this.

pkgs/top-level/aliases.nix

colemickens · 2020-04-17T17:58:14Z

Hi. I don't mind updating capitalization, just wanted to know for guidance going forward. I do appreciate the review and will fix the capitalization later today and push. Knowing the manual encourages lower-cased attributes gives me the guidance I was looking for. :)

Regarding API/ABI compatibility... I don't really know at all. I can try to find out.

colemickens · 2020-04-27T09:58:54Z

Alright, this should be closer. Thanks for the guidance.

pkgs/applications/networking/instant-messengers/quaternion/default.nix

aliases: throw messages for libqmatrixclient and quaternion-git

colemickens force-pushed the nixpkgs-quaternion branch from c064046 to 4a043cb Compare April 3, 2020 02:07

doronbehar mentioned this pull request Apr 3, 2020

Some PRs trigger: code: 2, kind: NotFound, message: "No such file or directory" NixOS/ofborg#446

Closed

Emantor suggested changes Apr 3, 2020

View reviewed changes

colemickens force-pushed the nixpkgs-quaternion branch from 4a043cb to 70a601f Compare April 4, 2020 06:23

ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Apr 4, 2020

ofborg bot requested a review from peterhoeg April 4, 2020 06:30

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Apr 4, 2020

colemickens force-pushed the nixpkgs-quaternion branch 3 times, most recently from 25530d1 to 7dbf441 Compare April 4, 2020 06:35

colemickens force-pushed the nixpkgs-quaternion branch 2 times, most recently from df73aaa to 49d8c7d Compare April 10, 2020 01:39

Emantor suggested changes Apr 10, 2020

View reviewed changes

colemickens force-pushed the nixpkgs-quaternion branch from 49d8c7d to 70f9dd8 Compare April 10, 2020 09:43

doronbehar approved these changes Apr 10, 2020

View reviewed changes

Emantor approved these changes Apr 10, 2020

View reviewed changes

colemickens force-pushed the nixpkgs-quaternion branch from 70f9dd8 to bea3e15 Compare April 13, 2020 20:45

worldofpeace reviewed Apr 14, 2020

View reviewed changes

pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved

colemickens force-pushed the nixpkgs-quaternion branch from bea3e15 to 9498751 Compare April 27, 2020 09:58

colemickens commented Apr 27, 2020

View reviewed changes

pkgs/applications/networking/instant-messengers/quaternion/default.nix Outdated Show resolved Hide resolved

colemickens force-pushed the nixpkgs-quaternion branch from 9498751 to be5220d Compare April 27, 2020 20:44

colemickens changed the title ~~quaternion: update, libQuotient: init~~ quaternion: update, libquotient: init Apr 27, 2020

colemickens added 2 commits April 27, 2020 13:45

libquotient: rename from libqmatrixclient; v0.5.2 -> v0.5.3.2

c15f590

aliases: throw messages for libqmatrixclient and quaternion-git

quaternion: 0.0.9.4c -> 0.0.9.4e

3ceefd2

colemickens force-pushed the nixpkgs-quaternion branch from be5220d to 3ceefd2 Compare April 27, 2020 20:46

worldofpeace merged commit f1d1dca into NixOS:master Apr 28, 2020

DIzFer mentioned this pull request May 6, 2020

qt5: 5.12.7 -> 5.14.2 #84232

Merged

37 tasks

colemickens deleted the nixpkgs-quaternion branch December 30, 2022 01:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

quaternion: update, libquotient: init #84160

quaternion: update, libquotient: init #84160

colemickens commented Apr 3, 2020

doronbehar commented Apr 3, 2020

doronbehar commented Apr 3, 2020

Emantor commented Apr 3, 2020

colemickens commented Apr 4, 2020

colemickens commented Apr 4, 2020

doronbehar commented Apr 4, 2020

doronbehar commented Apr 4, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

peterhoeg commented Apr 10, 2020

Emantor left a comment

Emantor Apr 10, 2020

Emantor Apr 10, 2020

Emantor Apr 10, 2020

Emantor Apr 10, 2020

colemickens commented Apr 10, 2020

doronbehar commented Apr 10, 2020 •

edited

Loading

peterhoeg commented Apr 10, 2020

colemickens commented Apr 13, 2020

doronbehar commented Apr 13, 2020

peterhoeg commented Apr 13, 2020

doronbehar commented Apr 14, 2020

worldofpeace commented Apr 14, 2020

colemickens commented Apr 17, 2020

colemickens commented Apr 27, 2020

		@@ -0,0 +1,24 @@
		{ stdenv, fetchFromGitHub, cmake, qtbase, qtmultimedia }:

		stdenv.mkDerivation rec {

	{ stdenv, fetchFromGitHub, cmake, qtbase, qtmultimedia }:
	{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }:

quaternion: update, libquotient: init #84160

quaternion: update, libquotient: init #84160

Conversation

colemickens commented Apr 3, 2020

Motivation for this change

Things done

doronbehar commented Apr 3, 2020

doronbehar commented Apr 3, 2020

Emantor commented Apr 3, 2020

colemickens commented Apr 4, 2020

colemickens commented Apr 4, 2020

doronbehar commented Apr 4, 2020

doronbehar commented Apr 4, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

colemickens commented Apr 10, 2020

peterhoeg commented Apr 10, 2020

Emantor left a comment

Choose a reason for hiding this comment

Emantor Apr 10, 2020

Choose a reason for hiding this comment

Emantor Apr 10, 2020

Choose a reason for hiding this comment

Emantor Apr 10, 2020

Choose a reason for hiding this comment

Emantor Apr 10, 2020

Choose a reason for hiding this comment

colemickens commented Apr 10, 2020

doronbehar commented Apr 10, 2020 • edited Loading

peterhoeg commented Apr 10, 2020

colemickens commented Apr 13, 2020

doronbehar commented Apr 13, 2020

peterhoeg commented Apr 13, 2020

doronbehar commented Apr 14, 2020

worldofpeace commented Apr 14, 2020

colemickens commented Apr 17, 2020

colemickens commented Apr 27, 2020

doronbehar commented Apr 10, 2020 •

edited

Loading