Merge pull request #145889 from misuzu/psiplus-update

psi-plus: 1.5.1556-2 -> 1.5.1576

authored by Jörg Thalheim and committed by GitHub 808a8f52 e4c43ce8

+4 -32
+4 -32
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
··· 40 40 41 41 assert enablePsiMedia -> enablePlugins; 42 42 43 - mkDerivation { 43 + mkDerivation rec { 44 44 pname = "psi-plus"; 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"; 45 + version = "1.5.1576"; 74 46 75 47 src = fetchFromGitHub { 76 48 owner = "psi-plus"; 77 49 repo = "psi-plus-snapshots"; 78 - rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; 79 - sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; 50 + rev = version; 51 + sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g"; 80 52 }; 81 53 82 54 cmakeFlags = [