From feb1706f8ea9f8526aa92c5dad87cb5d04fa11c5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 7 Aug 2020 21:35:41 +0200
Subject: pkgs/psi: Update to latest upstream master

The latest master version no longer crashes on Jingle file transfer
requests. So alongside updating to the latest Git version, I also
dropped the patch disabling Jingle.

Another reason for updating is simply because the client version already
feels old (heck, it's been February since the last update) and I'm
really craving for fresh new bugs.

I rebased the patch for the default configuration against current master
with no changes in configuration (only obsolete stuff removed) and fixed
the move of the src/plugins directory to the project's root directory.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/aszlig/psi/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/aszlig/psi/default.nix')

diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix
index d2e43d76..61fa44da 100644
--- a/pkgs/aszlig/psi/default.nix
+++ b/pkgs/aszlig/psi/default.nix
@@ -23,22 +23,21 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi-im";
     repo = "psi";
-    rev = "f1ca4cc0d45d0c1981fd2abd5da40182bbd8c5fb";
-    sha256 = "170g3dlpd8hp9g4j4y28l8y2xhgsmfay4m7dknvd9vanxd7s42ks";
+    rev = "23c1e3ffa5c33ecf7a7d8064a319b49422bb9469";
+    sha256 = "044npsb5xs25a4ybsk9a6advpdamzb3da19w9lj6q660p19syjar";
     fetchSubmodules = true;
   };
 
   plugins = fetchFromGitHub {
     owner = "psi-im";
     repo = "plugins";
-    rev = "5dc21909fc46c4780e1f4d23c56bf4be94802912";
-    sha256 = "0bxlsmwisc22m8y0py1ms69fyqspyx1a1zcjh6m51c4vmzskfr7a";
+    rev = "c430f74e2e0063ece73e4bcd5ce0430d7259e050";
+    sha256 = "05m8980c5ssnm6wpmcd1hz6glh0p3i1g8vipnfv31rrfw5wh97m3";
   };
 
   patches = [
     ./disable-xep-0232.patch
     ./darkstyle.patch
-    ./disable-jingle.patch
     (substituteAll {
       src = ./config.patch;
       inherit jid resource;
@@ -46,7 +45,7 @@ in stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    cp --no-preserve=all -rt src/plugins "$plugins"/*
+    cp --no-preserve=all -rt plugins "$plugins"/*
   '';
 
   cmakeFlags = [
-- 
cgit 1.4.1