From 2fdec94fbfddceceb9d3e95a39ff1ae9dbc5e937 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 22 Mar 2018 17:11:12 +0100
Subject: [PATCH] tdesktop: 1.2.6 -> 1.2.14

tdesktopPackages.preview: 1.2.12 -> 1.2.14
---
 .../telegram/tdesktop/default.nix             | 25 ++++++++-----------
 .../telegram/tdesktop/generic.nix             |  5 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index adf718a70ea..afba9ab022a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,21 +1,18 @@
 { qt5, stdenv }:
 
-let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
-in {
-  stable = mkTelegram {
+let
+  mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
+  stableVersion = {
     stable = true;
-    version = "1.2.6";
-    sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
+    version = "1.2.14";
+    sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "283641";
-    archPatchesHash = "0v4213vrabfa2dmwnqgb8n6hl54938mw9glaim3amyslxphmdrfb";
+    archPatchesRevision = "310557";
+    archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
   };
-  preview = mkTelegram {
+in {
+  stable = mkTelegram stableVersion;
+  preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.12";
-    sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
-    # svn ls -v --depth empty svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "308775";
-    archPatchesHash = "0ggx64kdadrbd4bw5z0wi0fdg6hni7n9nxz9dp56p8hlw1wgpsls";
-  };
+  });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 89bc3da56b8..a49ef87f540 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -123,10 +123,11 @@ mkDerivation rec {
   '';
 
   meta = {
-    description = "Telegram Desktop messaging app";
+    description = "Telegram Desktop messaging app "
+      + (if stable then "(stable version)" else "(pre-release)");
     license = licenses.gpl3;
     platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://desktop.telegram.org/;
-    maintainers = with maintainers; [ abbradar garbas primeos ];
+    maintainers = with maintainers; [ primeos abbradar garbas ];
   };
 }