diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fae4eff734e2..b8ee5182c26b 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,43 +40,15 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation { +mkDerivation rec { pname = "psi-plus"; - - # 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"; + version = "1.5.1576"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; - sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; + rev = version; + sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g"; }; cmakeFlags = [