diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-09 21:28:40 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-09 21:32:54 -0500 |
| commit | 1197f87349b6b41ce0f5aebffce2012f3c0e11b1 (patch) | |
| tree | 06a3cbbec8ee130ab6c241a9b05374cc3badcae8 | |
| parent | 253d78142dfd31ed769dc7d67500665e6441d235 (diff) | |
| download | nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar.gz nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar.bz2 nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar.lz nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar.xz nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.tar.zst nixlib-1197f87349b6b41ce0f5aebffce2012f3c0e11b1.zip | |
rambox: 0.5.13 -> 0.5.17
Remove patch that is apparently already applied.
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/bare.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch | 35 |
2 files changed, 4 insertions, 39 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') |