Merge branch 'master' into staging

14 files changed, 55 insertions, 110 deletions

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index dda976905610..78d9086dd961 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -16,7 +16,7 @@ let
   mkPluginInfo = { output ? "out", allowedVars ? [ output ]
                  , flags ? [], envVars ? {}
                  }: let
-    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shSearch = ["'"] ++ map (var: "@${var}@") allowedVars;
     shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
     # We need to triple-escape "val":
     #  * First because makeWrapper doesn't do any quoting of its arguments by
@@ -94,8 +94,8 @@ let
         output = "flash";
         allowedVars = [ "flash" "flashVersion" ];
         flags = [
-          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
-          "--ppapi-flash-version=$flashVersion"
+          "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=@flashVersion@"
         ];
       }}
 
@@ -107,7 +107,7 @@ let
       ${mkPluginInfo {
         output = "widevine";
         flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
-        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib";
       }}
     '';
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index dc6f22434db9..1a19210fd3dc 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,15 +7,15 @@
     sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr";
   };
   beta = {
-    version = "48.0.2564.48";
-    sha256 = "1qasdz9rwdqa2if8y4kkk19fspgjpk3q782c8l1p5n2cm25lkfa9";
-    sha256bin32 = "0pgc3iy4s7whmckc14r0cvgmk7pqgidd2w0xv53bfq2k504b5ykw";
-    sha256bin64 = "1lx6l8s2wdgzldbm8licpf22l6z13mvq05xlbn8ybizhn159nykj";
+    version = "49.0.2623.28";
+    sha256 = "1cpgfcw6kgw70k14wa1m5qzj4rnvkzrw1am30d34516mbwlmmqc8";
+    sha256bin32 = "0nwhjav1x325h1drqknrjl5glivn4fdpahs1nlaqfk8kbjh1q113";
+    sha256bin64 = "0wj6j0v3rngsclzbb8rc8l90wdi98j2sb60r2ypfihaxq2gd138y";
   };
   stable = {
-    version = "47.0.2526.106";
-    sha256 = "1rjqkawj7l127cd9s1wxwn4v7dfbrlahml98sam3fg8a6drm0lv4";
-    sha256bin32 = "14svd5x8lzfyyigfirxx1q9pg2bsnnb0fdwa7vvh1awq3zzfd38n";
-    sha256bin64 = "121289vwaz391b32hp2lihlpaql76y44gdpqkl9a3md0j1zk1nd9";
+    version = "48.0.2564.97";
+    sha256 = "1nsjn8zlqljizy5dmg2rxwkw4k5j4yi15ywxi9ca3acv68dbhd3p";
+    sha256bin32 = "0gdd9krsfsixw5b03msm7nf7zl7xh4chzkh9srb19c1kzygl2j2l";
+    sha256bin64 = "1wmw17gdq1j6vxfdc8s94jc8z30pza8nipk4dh590xnb7faihr52";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 566247fc0d43..7451297f8d20 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,8 +133,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "43.0.4";
-    sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
+    version = "44.0";
+    sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa";
   };
 
   firefox-esr-unwrapped = common {
diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix
deleted file mode 100644
index 8e78a0bd89cb..000000000000
--- a/pkgs/applications/networking/browsers/links/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "links-1.00pre15";
-  src = fetchurl {
-    url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz;
-    sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv";
-  };
-}
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 518a4d667dda..4ea6e619b175 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.11";
+  version = "2.12";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7";
+    sha256 = "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 4311b352ab96..8f3437644457 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.8.1";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
+    sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
       --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
-      --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY"
+      --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
   meta = with stdenv.lib; {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem ];
+    maintainers = with maintainers; [ rushmorem kamilchm ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 7773fcaf0c47..5fc770624c21 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "davmail-4.7.0";
+  name = "davmail-4.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/davmail/4.7.0/davmail-linux-x86_64-4.7.0-2408.tgz";
-    sha256 = "1kasnqnvw8icm32m5vbvkpx5im1w4sifiaafb08rw4a1zn8asxv1";
+    url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz";
+    sha256 = "c3bf1a3a94f35586a3a8d2d28cdaf8c9514a8cf904a51fd74961e93909c9d2a4";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
deleted file mode 100644
index 7368a8842147..000000000000
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
-, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
-, libtool, automake, autoconf, gstreamer
-, gtk, glib
-, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
-/*
-  arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from
-    (to use a fresher pidgin build)
-*/
-let
-  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
-in
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
-    sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
-  };
-
-  buildInputs = [gtkspell aspell
-    gstreamer startupnotification
-    libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto
-    libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python
-    autoconf libtool automake];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nss}/include/nspr"
-    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
-    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
-    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
-
-  preBuild = fullDepEntry (''
-    export echo=echo
-  '') [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
-    ++ (lib.optional externalPurple2 "postInstall")
-  ;
-
-  name = "carrier-2.5.0";
-  meta = {
-    description = "PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net;
-  };
-} // (if externalPurple2 then {
-  postInstall = fullDepEntry (''
-      mkdir -p $out/lib/purple-2
-      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
-    '') ["minInit" "defEnsureDir"]; }
-  else {})
-
-
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index ef6ce6076d94..abe9b78904f0 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "0ckh2l5fbnykzbvdrqjwd1ppalaifb79nnizh8kra2sy76xbqxjl";
+    sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7eedd997c1b4..0dc00d2f3000 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -30,23 +30,22 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.18.1";
+  version = "3.0.18.2";
 
   src = fetchurl {
     urls = [
       "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
-      "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "1bc9m2niagqmijmzlki8jmp48vhns041xdjlji9fyqay6l5mx5fw"
-                else "156dirxjys7pbximw19qs7j52my36p4kp98df3kgrsiiv8mz6v68";
+                then "1r0l0jlng1fz0cyvnfa4hqwlszfraj5kcs2lg9qnqvp03x8sqn6h"
+                else "1pgpsv1r216l76fx0grlqmldd9gha3sj84gnm44km8y98b3hj525";
   };
 
   # grab the plugin sdk for the desktop icon
   pluginsdk = fetchurl {
-    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.16.zip";
-    sha256 = "1qpqpj3r21wff3ly9ail4l6b57pcqycsh2hca926j14sdlvpv7kl";
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.18.1.zip";
+    sha256 = "108y52mfg44cnnhhipnmrr0cxh7ram5c2hnchxjkwvf5766vbaq4";
   };
 
   buildInputs = [ makeWrapper less which unzip ];
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 5b3eb2326c5a..86bf0b2e14b8 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,10 +30,9 @@
 
 with stdenv.lib;
 
-let version = "3.13.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
+  version = "3.13.2";
 
   meta = {
     description = "The user-friendly, lightweight, and fast email client";
@@ -45,7 +44,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "049av7r0xhjjjm1p93l2ns3xisvn125v3ncqar23cqjzgcichg5d";
+    sha256 = "1l8ankx0qpq1ix1an8viphcf11ksh53jsrm1xjmq8cjbh5910wva";
   };
 
   patches = [ ./mime.patch ];
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 952c763c5f4a..442240c2718f 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.17";
+    version = "1.10.18";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0svgl50w3hai31n5sm42sl0cd86c32cka0xzfy4r8gi0lyjdjxyx";
+    sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq";
   };
 
   buildInputs = with gst_all_1; [
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  patches = [ ./liferea-fix-notification-header-location.patch ];
+
   preFixup = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
new file mode 100644
index 000000000000..3cd322460b08
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c
+--- a/src/notification/libnotify.c	2016-01-28 19:33:19.000000000 +0100
++++ b/src/notification/libnotify.c	2016-02-01 19:20:39.167580131 +0100
+@@ -40,7 +40,7 @@
+ #include "ui/feed_list_view.h"
+ #include "ui/ui_tray.h"
+ 
+-#include "notification/notification.h"
++#include "../notification.h"
+ 
+ static gboolean supports_actions = FALSE;
+ static gboolean supports_append  = FALSE;
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 2523c4459ece..056d28eb3cd8 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -24,22 +24,22 @@
 
 stdenv.mkDerivation rec {
   name = "citrix-receiver-${version}";
-  version = "13.2.1";
-  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html;
+  version = "13.3.0";
+  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
 
   prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
   src = requireFile rec {
-    name = "${prefixWithBitness}-${version}.328635.tar.gz";
+    name = "${prefixWithBitness}-${version}.344519.tar.gz";
     sha256 =
       if stdenv.is64bit
-      then "3a11d663b1a11cc4ebb3e3595405d520ec279e1330462645c53edd5cc79d9ca0"
-      else "0yjw8q8mh4adns2i04m4p273vb4ifakixal7yi3hnbg43b36wfaw";
+      then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls"
+      else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz";
     message = ''
       In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
       the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
 
-      ${homepage}#ctx-dl-eula
+      ${homepage}
 
       Once you have downloaded the file, please use the following command and re-run the
       installation: