diff options
author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-06-15 01:11:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-15 01:11:23 +0000 |
commit | 0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac (patch) | |
tree | 97ca1cab586313322af454393b9d76add224efe6 /pkgs/applications | |
parent | a0dd120ff9f5b9e3a36f61969b441a928bbc2282 (diff) | |
parent | 9bc8b64894229f0a2005156cbc30545fee7e19cf (diff) | |
download | nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar.gz nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar.bz2 nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar.lz nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar.xz nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.tar.zst nixlib-0e3e46a52a8cf8b7f4f3b8584388c51deb8874ac.zip |
Merge pull request #41777 from dtzWill/update/rambox-0.5.17
rambox: 0.5.13 -> 0.5.17
Diffstat (limited to 'pkgs/applications')
3 files changed, 7 insertions, 42 deletions
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 594004fd2949..49cd81ac923c 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 8363baef2dfc..000000000000 --- 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') diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 5f68e6d86295..46157178fc1a 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 |