pyrox.dev
Merge pull request #141665 from unclechu/psi-plus-update-from-1.5.1549-to-1.5.1556-2
+33
-5
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+33
-5
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
···
40
40
41
41
assert enablePsiMedia -> enablePlugins;
42
42
43
-
mkDerivation rec {
43
+
mkDerivation {
44
44
pname = "psi-plus";
45
-
version = "1.5.1549";
45
+
46
+
# Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi
47
+
# and “-R” ending is optional revision number.
48
+
#
49
+
# The “psi-plus-snapshots” generally provides snapshots of these separate
50
+
# repositories glued together (there are also dependencies/libraries):
51
+
#
52
+
# 1. Psi
53
+
# 2. Plugins pack for Psi
54
+
# 3. “psimedia” plugin
55
+
# 4. Resources for Psi (icons, skins, sounds)
56
+
#
57
+
# “X.X.XXXX” is literally a version of Psi.
58
+
# So often when for instance plugins are updated separately a new snapshot is
59
+
# created. And that snapshot would also be linked to “X.X.XXXX” version.
60
+
# So many commits may have the same associated version of the snapshot.
61
+
# But mind that only one Git tag is created for “X.X.XXXX” version.
62
+
#
63
+
# It’s not yet defined in the Psi+ project what value to use as a version for
64
+
# any further releases that don’t change Psi version.
65
+
#
66
+
# Let’s do what Debian does for instance (appends “-R” where “R” is a revision
67
+
# number).
68
+
# E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/
69
+
#
70
+
# This has been communicated with the Psi+ main devs in this XMPP MUC chat:
71
+
# psi-dev@conference.jabber.ru
72
+
#
73
+
version = "1.5.1556-2";
46
74
47
75
src = fetchFromGitHub {
48
76
owner = "psi-plus";
49
77
repo = "psi-plus-snapshots";
50
-
rev = version;
51
-
sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m";
78
+
rev = "635879010b6697f7041a7bbea1853a1f4673c7f7";
79
+
sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a";
52
80
};
53
81
54
82
cmakeFlags = [
···
96
124
97
125
meta = with lib; {
98
126
homepage = "https://psi-plus.com";
99
-
description = "XMPP (Jabber) client";
127
+
description = "XMPP (Jabber) client based on Qt5";
100
128
maintainers = with maintainers; [ orivej misuzu unclechu ];
101
129
license = licenses.gpl2Only;
102
130
platforms = platforms.linux;