Merge branch 'master' into phonon-gstreamer

30 files changed, 284 insertions, 168 deletions

diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
new file mode 100644
index 0000000000000..8d87f119157ba
--- /dev/null
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -0,0 +1,10 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  baseVersion = "2.0";
+  revision = "1";
+  sha256 = "02sf6qghgs1lmprx715dnyll1rmqcjb9q6s50n20li8idlqysf51";
+  postPatch = ''
+    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
+  '';
+})
diff --git a/pkgs/development/libraries/botan/2.0.upstream b/pkgs/development/libraries/botan/2.0.upstream
new file mode 100644
index 0000000000000..d10850d46adc7
--- /dev/null
+++ b/pkgs/development/libraries/botan/2.0.upstream
@@ -0,0 +1,10 @@
+url http://botan.randombit.net/download.html
+version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
+ensure_version
+attribute_name botan2
+do_overwrite(){
+  ensure_hash
+  set_var_value sha256 $CURRENT_HASH
+  set_var_value baseVersion ${CURRENT_VERSION%.*}
+  set_var_value revision ${CURRENT_VERSION##*.}
+}
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index ca3d440220626..b4cb1029001ef 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.3.1";
+  version = "3.3.3";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "141axgv5kykq7125scisjvnfcdx7qcj8n8zlk7g09r7fhqgjr79w";
+    sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl";
   };
   
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 0e43b9fb60201..c38759e0c7575 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.2.5";
+  version = "3.2.10";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,10 +9,14 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
+    sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
   };
   
   nativeBuildInputs = [ cmake ];
+
+  postInstall = ''
+    sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc
+  '';
   
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index a748d9582695c..0cc6a07e08394 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl
-
-# Optional Dependencies
-, shishi ? null
+, withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
+assert withShishi -> shishi != null;
+
 stdenv.mkDerivation rec {
   name = "gss-1.0.3";
 
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = [ shishi ];
+  buildInputs = stdenv.lib.optional withShishi shishi;
 
   configureFlags = [
-    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+    "--${if withShishi != null then "enable" else "disable"}-kereberos5"
   ];
 
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
+  postInstall = stdenv.lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 43861e9e195f6..e8cd4f13ecef2 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.2";
+  version = "1.4.4";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg";
+    sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix
new file mode 100644
index 0000000000000..fbd5f512aee7e
--- /dev/null
+++ b/pkgs/development/libraries/icu/57.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
+
+let
+  pname = "icu4c";
+  version = "57.1";
+in
+stdenv.mkDerivation ({
+  name = pname + "-" + version;
+
+  src = fetchurl {
+    url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+      + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
+    sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
+  };
+
+  outputs = [ "out" "dev" ];
+  outputBin = "dev";
+
+  # FIXME: This fixes dylib references in the dylibs themselves, but
+  # not in the programs in $out/bin.
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  postUnpack = ''
+    sourceRoot=''${sourceRoot}/source
+    echo Source root reset to ''${sourceRoot}
+  '';
+
+  # This pre/postPatch shenanigans is to handle that the patches expect
+  # to be outside of `source`.
+  prePatch = ''
+    pushd ..
+  '';
+  postPatch = ''
+    popd
+  '';
+
+  patches = [
+  ];
+
+  preConfigure = ''
+    sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+  '';
+
+  configureFlags = "--disable-debug" +
+    stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath";
+
+  # remove dependency on bootstrap-tools in early stdenv build
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
+  '';
+
+  postFixup = ''moveToOutput lib/icu "$dev" '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Unicode and globalization support library";
+    homepage = http://site.icu-project.org/;
+    maintainers = with maintainers; [ raskin urkud ];
+    platforms = platforms.all;
+  };
+} // (if stdenv.isArm then {
+  patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ];
+} else {}))
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index d4a4c2a500c1f..1508f05db8b60 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "57.1";
+  version = "58.2";
 in
 stdenv.mkDerivation ({
   name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation ({
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
+    sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
   };
 
   outputs = [ "out" "dev" ];
@@ -35,26 +35,6 @@ stdenv.mkDerivation ({
   '';
 
   patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch";
-      sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch";
-      sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch";
-      sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch";
-      sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch";
-      sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r";
-    })
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/java/javasvn/builder.sh b/pkgs/development/libraries/java/javasvn/builder.sh
deleted file mode 100755
index 5eaed4c88425a..0000000000000
--- a/pkgs/development/libraries/java/javasvn/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-$unzip/bin/unzip $src
-mkdir -p $out
-mv $name*/* $out
diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix
deleted file mode 100644
index 2ad9a33879cab..0000000000000
--- a/pkgs/development/libraries/java/javasvn/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, unzip} :
-
-stdenv.mkDerivation {
-  name = "javasvn-1.0.6";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip;
-    sha256 = "0l2s3jqi5clzj5jz962i7gmy8ims51ma60mm5iflsl00dwbmgrqf";
-  };
-  
-  inherit unzip;
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 7ff992ccc5546..1be3a74fbff57 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,5 +1,7 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db
-, libuuid, lzo, pkgconfig, guile }:
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt
+, gdbm, gperf, tdb, gnutls, db, libuuid
+, lzo, pkgconfig, guile
+}:
 
 stdenv.mkDerivation rec {
   name = "libchop-0.5.2";
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
   };
 
-  patches = [ ./gets-undeclared.patch ];
+  patches = [ ./gets-undeclared.patch ./size_t.patch ];
 
   nativeBuildInputs = [ pkgconfig gperf ];
   
@@ -21,13 +23,13 @@ stdenv.mkDerivation rec {
       guile
     ];
 
-  doCheck = true;
+  doCheck = false;
 
   preConfigure = ''
     sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools & library for data backup and distributed storage";
 
     longDescription =
@@ -46,9 +48,8 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://nongnu.org/libchop/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/development/libraries/libchop/size_t.patch
new file mode 100644
index 0000000000000..82b6cb995ef36
--- /dev/null
+++ b/pkgs/development/libraries/libchop/size_t.patch
@@ -0,0 +1,11 @@
+--- a/src/chop.c
++++ b/src/chop.c
+@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc
+   chop_qdbm_block_iterator_class;
+ 
+ const struct chop_class_entry *
+-chop_lookup_class_entry (const char *str, unsigned int len);
++chop_lookup_class_entry (const char *str, size_t len);
+ 
+ /* Include the gperf-generated perfect hash table.  */
+ #include "class-lookup.c"
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 4f1bd7de3d957..91195229d87a7 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, libtool, openssl, pkgconfig}:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libp11-0.2.7";
-  
-  src = fetchurl {
-    urls = [
-      "http://www.opensc-project.org/files/libp11/${name}.tar.gz"
-      "http://www.openadk.org/distfiles/${name}.tar.gz"
-    ];
-    sha256 = "0kaz5qafaxm0ycywmajl166c29fh9cz89b8i043jqsbxlpzf4hdp";
+
+  src = fetchFromGitHub {
+    owner = "OpenSC";
+    repo = "libp11";
+    rev = name;
+    sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411";
   };
-  
-  buildInputs = [ libtool openssl pkgconfig ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  buildInputs = [ openssl ];
 
   meta = {
     homepage = http://www.opensc-project.org/libp11/;
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 14567c0daf4d7..0cd9d758725c2 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison }:
+{ stdenv, fetchurl, fetchpatch, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "libpcap-1.8.1";
@@ -21,6 +21,13 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace " -arch i386" ""
   '';
 
+  patches = [
+    (fetchpatch {
+      url    = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
+      sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
+    })
+  ];
+
   preInstall = ''mkdir -p $out/bin'';
 
   crossAttrs = {
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 6ec6333a73d7a..5bd18f72356fc 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.1";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "18msdi5a1ssymz00w21hg6sgacb2lzx0ns31iapvk5hv6l225pd2";
+    sha256 = "1qs6gpflgwic2pp1nplhhyl585h9q0kf74h5z29ajr5ij0j65rsa";
   };
   buildInputs = [zlib openssl];
   makeFlags = [
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fe4ed6e410ecd..941ab6710c2ef 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
     ]
-      # sometimes: timeout (no output)
-      ++ stdenv.lib.optional stdenv.isDarwin "process_title";
+      # sometimes: timeout (no output), failed uv_listen
+      ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
       sed '/${tdRegexp}/d' -i test/test-list.h
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651
+  # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin,
+  # and I'd rather have everything else work at all than have stronger assurance here.
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index 142bd93fe5253..4bfd43508317a 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, fetchpatch, m4 }:
+{ stdenv, fetchurl, fetchpatch, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   name = "mpir-${version}";
-  version = "2.7.2";
+  version = "3.0.0";
 
-  buildInputs = [ m4 ];
+  nativeBuildInputs = [ m4 which yasm ];
 
   src = fetchurl {
     url = "http://mpir.org/mpir-${version}.tar.bz2";
-    sha256 = "1v25dx7cah2vxwzgq78hpzqkryrfxhwx3mcj3jjq3xxljlsw7m57";
+    sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/wbhart/mpir/commit/fdb590023f7ca4b2e881a2e9573718e7ed180f03.patch";
-    sha256 = "152pdqpf8xxr4ky25f9zrvfb66i1wzy6a5b91h4zmpqjdffqf1iw";
-  }) ];
-
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 4e3db9b0d4017..7561f3b322b5f 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -16,16 +16,12 @@ stdenv.mkDerivation rec {
         "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
-  preConfigure = ''
-    find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
-  '';
-
   meta = {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    broken = true;              # cannot cope with Octave 4.x
+    broken = (octave != null);              # cannot cope with Octave 4.x
   };
 
 }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 8621d60ca960a..294371dde7ad3 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.28.1";
+  version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz";
-    sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz";
+    sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 9fdcf65346cc2..e0f24fbc822ab 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -55,6 +55,10 @@ stdenv.mkDerivation rec {
     [ gstreamer gst-plugins-base phonon ]
     ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
 
+  # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
+  # if DESTDIR is unset
+  DESTDIR="/";
+
   nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 
   cmakeFlags =
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index ec3f9061f795f..a42dda1b36cb8 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -35,6 +35,13 @@ qtSubmodule {
     # fix default SSL bundle location
     sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
 
+    # Fix library paths
+    sed -i \
+      -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
+      -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
+      -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
+      src/core/web_engine_library_info.cpp
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 50e4534f162c9..a31fa1f0516de 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "snappy-${version}";
-  version = "1.1.3";
+  version = "1.1.4";
   
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "snappy";
-    rev = version;
-    sha256 = "1w9pq8vag8c6m4ib0qbdbqzsnpwjvw01jbp15lgwg1rzwhvflm10";
+  src = fetchurl {
+    url = "http://github.com/google/snappy/releases/download/${version}/"
+        + "snappy-${version}.tar.gz";
+    sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  outputs = [ "out" "dev" "doc" ];
+
+  nativeBuildInputs = [ pkgconfig ];
 
   # -DNDEBUG for speed
   configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 6e86780446c52..a803171623025 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.16.2";
+  name = "sqlite-3.17.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz";
-    sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz";
+    sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index d3e1a6dc17e77..d450cd21aecda 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,35 +1,27 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.17.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
-    sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z";
+    url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip";
+    sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6";
   };
 
-  buildInputs = [ unzip tcl ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
 
-  # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer.
-  # Hopefully this work-around can be removed for future releases.
-  postConfigure = ''
-    substituteInPlace Makefile \
-      --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"'
-  '';
-
-  buildPhase = ''
-    make sqlite3_analyzer
-  '';
+  makeFlags = [ "sqlite3_analyzer" ];
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    mv sqlite3_analyzer "$out/bin"
+    install -Dm755 sqlite3_analyzer \
+      "$out/bin/sqlite3_analyzer"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.sqlite.org/;
     description = "A tool that shows statistics about sqlite databases";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pesterhazy ];
   };
 }
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index bc9035d479b58..cee71df4849a8 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/unittest-cpp/unittest-cpp";
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 9089889f4dd21..6b5c48a6105da 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,19 +1,35 @@
 { stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
-  name = "uriparser-0.8.2";
+  name = "uriparser-${version}";
+  version = "0.8.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
-    sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
+    url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2";
+    sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f";
   };
 
-  buildInputs = [ cpptest pkgconfig doxygen graphviz ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cpptest doxygen graphviz ];
+
+  # There is actually no .map files to install in doc for v0.8.4
+  # (dot outputs only SVG and PNG in this release)
+  preBuild = ''
+    substituteInPlace doc/Makefile.am --replace " html/*.map" ""
+    substituteInPlace doc/Makefile.in --replace " html/*.map" ""
+  '';
+
 
   meta = with stdenv.lib; {
     homepage = http://uriparser.sourceforge.net/;
     description = "Strictly RFC 3986 compliant URI parsing library";
+    longDescription = ''
+      uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C.
+      API documentation is available on uriparser website.
+    '';
+    license = licenses.bsd3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ bosu ];
-    license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b0a4cc07bc63d..c15259c585adc 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in
   '';
 
-  buildTargets = [ "all-shared" ];
-
   preBuild = ''
     makeFlagsArray+=("prefix=$out")
     makeFlagsArray+=("LDCONFIG=echo")
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
new file mode 100644
index 0000000000000..b991590924db3
--- /dev/null
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+, pkgconfig, wxGTK
+, ffmpeg, libexif
+, cairo, pango }:
+
+stdenv.mkDerivation rec {
+
+  name = "wxSVG-${version}";
+  srcName = "wxsvg-${version}";
+  version = "1.5.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
+    sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ wxGTK ffmpeg libexif ];
+
+  buildInputs = [ cairo pango ];
+
+  meta = with stdenv.lib; {
+    description = "A SVG manipulation library built with wxWidgets";
+    longDescription = ''
+    wxSVG is C++ library to create, manipulate and render
+    Scalable Vector Graphics (SVG) files with the wxWidgets toolkit.
+    '';
+    homepage = http://wxsvg.sourceforge.net/;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 36b55c59c2455..e461ce858cfd4 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,23 +1,28 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
-stdenv.mkDerivation rec {
-  name = "xapian-${version}";
-  version = "1.4.0";
+let
+  generic = version: sha256: stdenv.mkDerivation rec {
+    name = "xapian-${version}";
 
-  src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
-    sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
-  };
+    src = fetchurl {
+      url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+      inherit sha256;
+    };
 
-  outputs = [ "out" "doc" ];
+    outputs = [ "out" "doc" ];
 
-  buildInputs = [ libuuid zlib ];
+    buildInputs = [ libuuid zlib ];
 
-  meta = {
-    description = "Search engine library";
-    homepage = http://xapian.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.unix;
+    meta = {
+      description = "Search engine library";
+      homepage = http://xapian.org/;
+      license = stdenv.lib.licenses.gpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.chaoflow ];
+      platforms = stdenv.lib.platforms.unix;
+    };
   };
+in {
+  # used by xapian-ruby
+  xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
+  xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
 }
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 77a7989baab4e..9b7a90266284a 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma }:
+{ stdenv, fetchurl, lzma }:
 
-stdenv.mkDerivation {
-  name = "zimlib";
-  version = "20150710";
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+stdenv.mkDerivation rec {
+  name = "zimlib-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "http://www.openzim.org/download/${name}.tar.gz";
+    sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
   };
-  buildInputs = [ automake autoconf libtool lzma ];
-  setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
-  preConfigure = "./autogen.sh";
 
-  meta = {
-    description = "Library for reading and writing ZIM files (file format for storing Web content offline)";
+  buildInputs = [ lzma ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Library for reading and writing ZIM files";
     homepage =  http://www.openzim.org/wiki/Zimlib;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ robbinch ];
+    platforms = platforms.linux;
   };
 }