Merge pull request #41777 from dtzWill/update/rambox-0.5.17

rambox: 0.5.13 -> 0.5.17
This commit is contained in:
Yegor Timoshenko 2018-06-15 01:11:23 +00:00 committed by GitHub
commit 0e3e46a52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 42 deletions

View File

@ -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 = ''

View File

@ -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')

View File

@ -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