From 1197f87349b6b41ce0f5aebffce2012f3c0e11b1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 9 Jun 2018 21:28:40 -0500
Subject: [PATCH 1/2] rambox: 0.5.13 -> 0.5.17

Remove patch that is apparently already applied.
---
 .../instant-messengers/rambox/bare.nix        |  8 ++---
 .../rambox/hide-check-for-updates.patch       | 35 -------------------
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 594004fd294..49cd81ac923 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "rambox-bare-${version}";
-  version = "0.5.13";
+  version = "0.5.17";
 
   src = fetchFromGitHub {
     owner = "saenzramiro";
     repo = "rambox";
     rev = version;
-    sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
+    sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
+    sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
   };
 
-  patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
+  patches = [ ./isDev.patch ]
     ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
 
   configurePhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
deleted file mode 100644
index 8363baef2df..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/saenzramiro/rambox/issues/1283
-
-diff -urNZ a/electron/menu.js b/electron/menu.js
---- a/electron/menu.js	2017-11-02 22:02:59.753119865 +0000
-+++ b/electron/menu.js	2017-11-02 22:08:34.419698562 +0000
-@@ -220,14 +220,6 @@
- 					}
- 				},
- 				{
--					label: locale['menu.help[5]'],
--					click(item, win) {
--						const webContents = win.webContents;
--						const send = webContents.send.bind(win.webContents);
--						send('autoUpdater:check-update');
--					}
--				},
--				{
- 					label: locale['menu.help[6]'],
- 					click() {
- 						sendAction('showAbout')
-@@ -290,14 +282,6 @@
- 			type: 'separator'
- 		});
- 		helpSubmenu.push({
--			label: `&`+locale['menu.help[5]'],
--			click(item, win) {
--				const webContents = win.webContents;
--				const send = webContents.send.bind(win.webContents);
--				send('autoUpdater:check-update');
--			}
--		});
--		helpSubmenu.push({
- 			label: `&`+locale['menu.help[6]'],
- 			click() {
- 				sendAction('showAbout')

From 9bc8b64894229f0a2005156cbc30545fee7e19cf Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 9 Jun 2018 21:40:31 -0500
Subject: [PATCH 2/2] rambox/sencha: 6.5.2 -> 6.5.3

---
 .../networking/instant-messengers/rambox/sencha/bare.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index 5f68e6d8629..46157178fc1 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, gzip, which, unzip, jdk }:
 
 let
-  version = "6.5.2";
+  version = "6.5.3";
   srcs = {
     i686-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
-      sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
+      sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9";
     };
     x86_64-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
-      sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
+      sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz";
     };
   };
 in