diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 01a8a71f0326..fae4eff734e2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -14,7 +14,7 @@ , libgcrypt , libotr , html-tidy -, libgpgerror +, libgpg-error , libsignal-protocol-c , usrsctp @@ -40,15 +40,43 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation rec { +mkDerivation { pname = "psi-plus"; - version = "1.5.1549"; + + # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi + # and “-R” ending is optional revision number. + # + # The “psi-plus-snapshots” generally provides snapshots of these separate + # repositories glued together (there are also dependencies/libraries): + # + # 1. Psi + # 2. Plugins pack for Psi + # 3. “psimedia” plugin + # 4. Resources for Psi (icons, skins, sounds) + # + # “X.X.XXXX” is literally a version of Psi. + # So often when for instance plugins are updated separately a new snapshot is + # created. And that snapshot would also be linked to “X.X.XXXX” version. + # So many commits may have the same associated version of the snapshot. + # But mind that only one Git tag is created for “X.X.XXXX” version. + # + # It’s not yet defined in the Psi+ project what value to use as a version for + # any further releases that don’t change Psi version. + # + # Let’s do what Debian does for instance (appends “-R” where “R” is a revision + # number). + # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ + # + # This has been communicated with the Psi+ main devs in this XMPP MUC chat: + # psi-dev@conference.jabber.ru + # + version = "1.5.1556-2"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = version; - sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m"; + rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; + sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; }; cmakeFlags = [ @@ -76,7 +104,7 @@ mkDerivation rec { libgcrypt libotr html-tidy - libgpgerror + libgpg-error libsignal-protocol-c usrsctp ] ++ lib.optionals voiceMessagesSupport [ @@ -96,7 +124,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://psi-plus.com"; - description = "XMPP (Jabber) client"; + description = "XMPP (Jabber) client based on Qt5"; maintainers = with maintainers; [ orivej misuzu unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; |