Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.

15 files changed, 106 insertions, 69 deletions

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 4046d839f7d8..193b9c1e790f 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
 , gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
 , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
-, mpg123, neon, faad2
+, mpg123, neon, faad2, gnome3
 }:
 
 let version = "3.5.2"; in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   buildInputs =
     [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
       libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio
-      libcddb ffmpeg makeWrapper mpg123 neon faad2
+      libcddb ffmpeg makeWrapper mpg123 neon faad2 gnome3.defaultIconTheme
     ];
 
   # Here we build bouth audacious and audacious-plugins in one
@@ -48,8 +48,11 @@ stdenv.mkDerivation {
       (
         source $stdenv/setup
         # gsettings schemas for file dialogues
+        # XDG_ICON_DIRS is set by hook for gnome3.defaultIconTheme
         for file in "$out/bin/"*; do
-          wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH"
+          wrapProgram "$file" \
+            --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH" \
+            --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
         done
       )
     '';
diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index d8d8945db928..d8d8945db928 100644
--- a/pkgs/applications/audio/QmidiNet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 5bec7aa6dd04..d0d37fb15a14 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -28,11 +28,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-0.8.4";
+  name = "qmmp-0.9.9";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1ld69xypyak3lzwmfvzbxsyd4fl841aaq0gmkfa7jpavbdlggydf";
+    sha256 = "1wv4kbjq50xflhrl1jjf1hm3rrw599xkd72dwm4rscm0sdvzhnc1";
   };
 
   buildInputs =
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 5ac7a69aeda5..0eba31375dc3 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
-, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, ncurses, perl
-, pkgconfig, unibilium, makeWrapper, vimUtils
+, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, man, ncurses
+, perl, pkgconfig, unibilium, makeWrapper, vimUtils
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
 , withPython3 ? true, python3Packages, extraPython3Packages ? []
@@ -98,7 +98,10 @@ let
     LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
     LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    preConfigure = ''
+      substituteInPlace runtime/autoload/man.vim \
+        --replace /usr/bin/man ${man}/bin/man
+    '' + stdenv.lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=${jemalloc}/lib
       substituteInPlace src/nvim/CMakeLists.txt --replace "    util" ""
     '';
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
new file mode 100644
index 000000000000..5bf6907744ad
--- /dev/null
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchgit, flex, bison, cmake, git, zlib}:
+
+stdenv.mkDerivation rec {
+
+  version = "2016-05-19";
+  name = "pbrt-v3-${version}";
+  src = fetchgit {
+    url = "https://github.com/mmp/pbrt-v3.git";
+    rev = "638249e5cf4596e129695c8df8525d43f11573ff";
+    sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g";
+  };
+
+  fetchSubmodules = true;
+
+  buildInputs = [ git flex bison cmake zlib ];
+
+  meta = {
+    homepage = "http://pbrt.org";
+    description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
+    platforms = stdenv.lib.platforms.linux ;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    priority = 10;
+  };
+}
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 330970b498ba..10605b8b18da 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "evtest-1.32";
+  name = "evtest-1.33";
 
   buildInputs = [ autoreconfHook pkgconfig libxml2 ];
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/evtest";
-    rev = "refs/tags/evtest-1.32";
-    sha256 = "150lb7d2gnkcqgfw1hcnb8lcvdb52fpig9j9qxjizp6irhlw2a31";
+    rev = "refs/tags/evtest-1.33";
+    sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index d5c04ba555a1..3161af33ead1 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.9";
+  version = "2.0.10";
   name = "librecad-${version}";
 
   src = fetchurl {
     url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
     name = name + ".tar.gz";
-    sha256 = "0npr2nxwmx1qil7lqhkh6yvkw7dwym0nfashxjglxspjallqjya7";
+    sha256 = "13jr0zkirnnpkbx8ysh7j6sh2psxi1dg7ncfjqzyxrcr2b270rcj";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 7895a3b252d0..fede69ff5741 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.18.1";
+  version = "3.20.1";
   sha256 =
     {
-      "x86_64-linux" = "1qdahr8xzk3zrrv89335l3aa2gfgjn1ymfixj9zgipv34grkjghm";
-      "i686-linux" = "015bjkr2dwyac410i398qm1v60rqln539wcj5f25q776haycbcji";
+      "x86_64-linux" = "170xnrxlsadl5iw96276f8l3w687l6n5j5m8z4djsfqqr3lqjxvg";
+      "i686-linux" = "0a7k56ib2qp5560wmbk7b30pqf7h9h7rjnq850993gn9lfwz81q2";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index e0c40280bced..9f11290fdb1e 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
 
 stdenv.mkDerivation rec {
-  name = "daq-2.0.5";
+  name = "daq-2.0.6";
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "mirror://sourceforge/snort/${name}.tar.gz";
-    sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
+    url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
+    sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml";
   };
 
   buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index a55b80df2b22..2904f50d6fc1 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "2.9.7.2";
+  version = "2.9.8.2";
   name = "snort-${version}";
   
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "mirror://sourceforge/snort/${name}.tar.gz";
-    sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
+    url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
+    sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0";
   };
   
   buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 0d6e6d402844..71382558d3c2 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,9 +2,9 @@
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
 , glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
-, libudev }:
+, libudev, libXScrnSaver }:
 
-let version = "0.0.3"; in
+let version = "0.0.8"; in
 
 stdenv.mkDerivation {
 
@@ -12,14 +12,14 @@ stdenv.mkDerivation {
 
     src = fetchurl {
         url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        sha256 = "1k1mnfkcx7183qbdc4qx1anngddqim969cribg9gzc7mixvj17ca";
+        sha256 = "1g48jxiswpfvbgjs4dyywmzj9kncvrgpajhixk3acizdmfmsyqkk";
     };
 
     libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
         gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite
         libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
-        libXtst nspr nss pango libudev.out
+        libXtst nspr nss pango libudev.out libXScrnSaver
      ];
 
     installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index a87f89fc9649..78e1b2bb62b9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats
 , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
 , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
-, libunity, dee, libdbusmenu-glib, libva, qmakeHook
+, libwebp, libunity, dee, libdbusmenu-glib, libva
 
 , pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms
 , libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16
@@ -12,14 +12,14 @@ let
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "0.9.44";
+  version = "0.9.48";
   qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version;
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "0ydd5yhy2nq4n6x59ajb6c4d0blyj6gm7hkx4hfrx2a88iksc5rm";
+    sha256 = "1i1f7a9mikq8n08cnwcyywxj7sh1jc6yfj0zd3n7fgfhl0srzvlb";
   };
 
   tgaur = fetchgit {
@@ -31,11 +31,11 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
     gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
-    dee libdbusmenu-glib libva qtbase qmakeHook
+    dee libdbusmenu-glib libva
     # Qt dependencies
     libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
     libpng libjpeg freetype harfbuzz pcre16 xproto libX11
-    inputproto sqlite dbus
+    inputproto sqlite dbus libwebp
   ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -61,44 +61,27 @@ in stdenv.mkDerivation rec {
     "INCLUDEPATH+=${breakpad}/include/breakpad"
     "LIBS+=-lcrypto"
     "LIBS+=-lssl"
-    "LIBS+=-lz"
-    "LIBS+=-lgobject-2.0"
-    "LIBS+=-lxkbcommon"
-    "LIBS+=-lX11"
-    "LIBS+=${breakpad}/lib/libbreakpad_client.a"
-    "LIBS+=./../../../Libraries/QtStatic/qtbase/plugins/platforms/libqxcb.a"
-    "LIBS+=./../../../Libraries/QtStatic/qtimageformats/plugins/imageformats/libqwebp.a"
   ];
 
   qtSrcs = qtbase.srcs ++ [ qtimageformats.src ];
   qtPatches = qtbase.patches;
 
-  dontUseQmakeConfigure = true;
-
   buildCommand = ''
     unpackPhase
     cd "$sourceRoot"
+
     patchPhase
     sed -i 'Telegram/Telegram.pro' \
-      -e 's/CUSTOM_API_ID//g' \
+      -e 's,CUSTOM_API_ID,,g' \
+      -e "s,/usr/local/tdesktop/Qt-[^/]*,$PWD/../qt,g" \
       -e 's,/usr,/does-not-exist,g' \
       -e '/LIBS += .*libxkbcommon.a/d' \
-      -e '/LIBS += .*libz.a/d' \
-      -e '/LIBS += .*libbreakpad_client.a/d' \
-      -e 's,-flto ,,g'
-    echo "Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)" >> Telegram/SourceFiles/stdafx.cpp
-
-    ( mkdir -p Linux/DebugIntermediateStyle
-      cd Linux/DebugIntermediateStyle
-      qmake CONFIG+=debug ../../Telegram/MetaStyle.pro
-      buildPhase
-    )
-    ( mkdir -p Linux/DebugIntermediateLang
-      cd Linux/DebugIntermediateLang
-      qmake CONFIG+=debug ../../Telegram/MetaLang.pro
-      buildPhase
-    )
+      -e 's,LIBS += .*libz.a,LIBS += -lz,' \
+      -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \
+      -e 's, -flto,,g' \
+      -e 's, -static-libstdc++,,g'
 
+    export QMAKE=$PWD/../qt/bin/qmake
     ( mkdir -p ../Libraries
       cd ../Libraries
       for i in $qtSrcs; do
@@ -108,37 +91,56 @@ in stdenv.mkDerivation rec {
       mv qtbase-opensource-src-* ./QtStatic/qtbase
       mv qtimageformats-opensource-src-* ./QtStatic/qtimageformats
       cd QtStatic/qtbase
-      patch -p1 < ../../../$sourceRoot/Telegram/_qtbase_${qtVersion}_patch.diff
+      patch -p1 < ../../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff
       cd ..
       for i in $qtPatches; do
         patch -p1 < $i
       done
       ${qtbase.postPatch}
 
-      export configureFlags="-prefix "../../qt" -release -opensource -confirm-license -system-zlib \
+      export configureFlags="-prefix "$PWD/../../qt" -release -opensource -confirm-license -system-zlib \
         -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
         -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \
         -openssl-linked -dbus-linked -system-sqlite -verbose \
         ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \
         -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"
       export dontAddPrefix=1
-      export buildFlags="module-qtbase module-qtimageformats"
-      export installFlags="module-qtbase-install_subtargets module-qtimageformats-install_subtargets"
+      export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-      ( export MAKEFLAGS=-j$NIX_BUILD_CORES
+      ( cd qtbase
         configurePhase
+        buildPhase
+        make install
+      )
+
+      ( cd qtimageformats
+        $QMAKE
+        buildPhase
+        make install
       )
+    )
+
+    ( mkdir -p Linux/obj/codegen_style/Debug
+      cd Linux/obj/codegen_style/Debug
+      $QMAKE CONFIG+=debug ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro
+      buildPhase
+    )
+    ( mkdir -p Linux/obj/codegen_numbers/Debug
+      cd Linux/obj/codegen_numbers/Debug
+      $QMAKE CONFIG+=debug ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro
+      buildPhase
+    )
+    ( mkdir -p Linux/DebugIntermediateLang
+      cd Linux/DebugIntermediateLang
+      $QMAKE CONFIG+=debug ../../Telegram/MetaLang.pro
       buildPhase
-      installPhase
     )
 
     ( mkdir -p Linux/ReleaseIntermediate
       cd Linux/ReleaseIntermediate
-      qmake $qmakeFlags ../../Telegram/Telegram.pro
+      $QMAKE $qmakeFlags ../../Telegram/Telegram.pro
       pattern="^PRE_TARGETDEPS +="
       grep "$pattern" "../../Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make
-
-      qmake $qmakeFlags ../../Telegram/Telegram.pro
       buildPhase
     )
 
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index c49a9805b6a1..8fd653534e2a 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "GrayHatter";
     repo = "uTox";
     rev = "v${version}";
-    sha256 = "1md8fw6zqd3giskd89i56dgrsl83vn27xwr8k22263wkj1fxxw4c";
+    sha256 = "12l2821m4r8p3vmsqhqhfj60yhkl4w4xfy73cvy73qqw6xf2yam1";
   };
 
   buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 59ded4b3b9a4..0febee720967 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "2.0.2";
+  version = "2.0.3";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1hdrnsllkfbvfwsvlqvvky0z91q63mbbnjcri56nb9c5403zn8g9";
+    sha256 = "1z358k65frp9m0l07cppwxhvbcp1w9ya5sml87pzs8gyfmp3g5p1";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 0a5b2c0d74b8..e0c7030a762f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -37,6 +37,10 @@ let
 
     patches = [ ./apr-1.patch ];
 
+    # SVN build seems broken on gcc5:
+    # https://gcc.gnu.org/gcc-5/porting_to.html
+    CPPFLAGS = "-P";
+
     configureFlags = ''
       ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
       ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"}