diff options
Diffstat (limited to 'pkgs/applications/networking')
11 files changed, 48 insertions, 137 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f2cb0864efdd..4e7d35f105c3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -24,10 +24,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "60.0.1"; + version = "60.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn"; + sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg"; }; patches = nixpkgsPatches ++ [ @@ -47,10 +47,10 @@ rec { firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.8.0esr"; + version = "52.8.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1"; + sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a"; }; patches = nixpkgsPatches; @@ -66,10 +66,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.0.1esr"; + version = "60.0.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b"; + sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5b2ede611d03..6067911b7165 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,7 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, browserpass, chrome-gnome-shell, uget-integrator +, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration , libudev , kerberos }: @@ -63,6 +63,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); libs = lib.optional ffmpegSupport ffmpeg diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index 304df0947acf..66bf20c2b843 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "terraform-provider-ibm-${version}"; - version = "0.9.1"; + version = "0.10.0"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; subPackages = [ "./" ]; @@ -20,7 +20,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "IBM-Cloud"; repo = "terraform-provider-ibm"; - sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6"; + sha256 = "03drvhhh6pkk8yzzp8iiq478kcky9swxvxadxzxh0v4jzdprg9lr"; rev = "v${version}"; }; 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 diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 96218ef87b5f..c41b6116b29d 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , kdoctools , kbookmarks @@ -69,6 +70,13 @@ in mkDerivation rec { kdoctools ]; + patches = [ + (fetchpatch { + url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d"; + sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn"; + }) + ]; + meta = { description = "Integrated IRC client for KDE"; license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 13add2690db3..401eb755896f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.2"; + version = "0.27"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; + sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index c6e5d0f3cb31..7ca1e595c35d 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: + pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -8,6 +9,14 @@ pythonPackages.buildPythonPackage rec { sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; }; + patches = [ + # Fix preferences when built against libtorrent >=0.16 + (fetchpatch { + url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; + sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 4db546651dd9..be574acc8c75 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.3.1"; + version = "0.9.4"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb"; + sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9"; }; nativeBuildInputs = [ @@ -29,7 +29,10 @@ buildPythonApplication rec { ]; patches = [ - ./disable-syncthing-binary-configuration.patch + (fetchpatch { + url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch; + sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7"; + }) (substituteAll { src = ./paths.patch; killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; @@ -37,6 +40,8 @@ buildPythonApplication rec { }) ]; + setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ]; + postPatch = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" @@ -48,9 +53,9 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK3 & python based GUI for Syncthing"; - maintainers = with maintainers; [ ]; - platforms = syncthing.meta.platforms; homepage = https://github.com/syncthing/syncthing-gtk; license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = syncthing.meta.platforms; }; } diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch deleted file mode 100644 index 14c2b62e6e38..000000000000 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/glade/find-daemon.glade -+++ b/glade/find-daemon.glade -@@ -112,6 +112,7 @@ - <object class="GtkEntry" id="vsyncthing_binary"> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="margin_right">20</property> - <signal name="changed" handler="cb_check_value" swapped="no"/> - </object> -@@ -126,6 +127,7 @@ - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="yalign">0.51999998092651367</property> ---- a/glade/ui-settings.glade -+++ b/glade/ui-settings.glade -@@ -943,6 +943,7 @@ - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="yalign">0.51999998092651367</property> -@@ -974,6 +975,7 @@ - <object class="GtkEntry" id="vsyncthing_binary"> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="hexpand">True</property> - <signal name="changed" handler="cb_check_value" swapped="no"/> - </object> ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -168,6 +168,8 @@ - yield k - - def get(self, key): -+ if key == "syncthing_binary": -+ return self.REQUIRED_KEYS[key][1] - return self.values[key] - - def set(self, key, value): ---- a/syncthing_gtk/finddaemondialog.py -+++ b/syncthing_gtk/finddaemondialog.py -@@ -163,7 +163,7 @@ - self["lblDownloadProgress"].set_markup(_("Download failed.")) - self["btDownload"].set_visible(True) - self["pbDownload"].set_visible(False) -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["btSave"].set_sensitive(True) - -@@ -179,7 +179,7 @@ - - def cb_extract_finished(self, downloader, *a): - """ Called after extraction is finished """ -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["vsyncthing_binary"].set_text(downloader.get_target()) - self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>") ---- a/syncthing_gtk/wizard.py -+++ b/syncthing_gtk/wizard.py -@@ -60,7 +60,6 @@ - self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) - # Pages - self.add_page(IntroPage(self)) -- self.add_page(FindDaemonPage()) - self.add_page(GenerateKeysPage()) - self.add_page(HttpSettingsPage()) - self.add_page(SaveSettingsPage()) |