Merge branch 'master' into staging

59 files changed, 400 insertions, 412 deletions

diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 745cdf746ecc..88c8a9005700 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "1.5.0";
+  version = "1.5.1";
 in
 stdenv.mkDerivation {
   name = "adns-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
       "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
       "mirror://gnu/adns/adns-${version}.tar.gz"
     ];
-    sha256 = "0hg89b5n84zjhzvbzrpvhl0hbm4s6d1z2pzllfis64ai656ypibz";
+    sha256 = "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v";
   };
 
   preConfigure =
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 81e8a8a52f9f..1829b3306ebc 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -43,11 +43,14 @@ stdenv.mkDerivation rec {
     ++ optional ldapSupport openldap
     ++ optional stdenv.isFreeBSD cyrus_sasl;
 
-  # Give apr1 access to sed for runtime invocations
   postInstall = ''
     for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do
-      substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
+      substituteInPlace $f \
+        --replace "${expat.dev}/lib" "${expat.out}/lib" \
+        --replace "${openssl.dev}/lib" "${openssl.out}/lib"
     done
+
+    # Give apr1 access to sed for runtime invocations.
     wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin"
   '';
 
diff --git a/pkgs/development/libraries/cil-aterm/default.nix b/pkgs/development/libraries/cil-aterm/default.nix
index e51bb3c2d4ef..62d69f943af9 100644
--- a/pkgs/development/libraries/cil-aterm/default.nix
+++ b/pkgs/development/libraries/cil-aterm/default.nix
@@ -9,4 +9,5 @@ stdenv.mkDerivation {
   patches = [./cil-aterm-1.3.6.patch];
   buildInputs = [ ocaml perl ];
   inherit ocaml perl;
+  meta.broken = true;
 }  
diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix
deleted file mode 100644
index c2bec3a7f1de..000000000000
--- a/pkgs/development/libraries/clutter-gst/3.0.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
-
-stdenv.mkDerivation rec {
-  major = "3.0";
-  minor = "18";
-  name = "clutter-gst-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
-    sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
-  };
-
-  propagatedBuildInputs = [ clutter gtk3 glib cogl ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "GStreamer bindings for clutter";
-
-    homepage = http://www.clutter-project.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 7cef673dbc69..c2bec3a7f1de 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,11 +1,13 @@
 { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-gst-2.0.12";
+  major = "3.0";
+  minor = "18";
+  name = "clutter-gst-${major}.${minor}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
-    sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2";
+    url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
+    sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
deleted file mode 100644
index a3cdbbf28272..000000000000
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk2 }:
-
-stdenv.mkDerivation rec {
-  name = "clutter-gtk-0.10.8";
-
-  src = fetchurl {
-    urls = [
-      "http://download.gnome.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
-      "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
-      ];
-    sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
-  };
-
-  propagatedBuildInputs = [ clutter gtk2 ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Clutter-GTK";
-
-    homepage = http://www.clutter-project.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/clutter-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix
deleted file mode 100644
index e493bab1bc75..000000000000
--- a/pkgs/development/libraries/clutter-gtk/1.4.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "clutter-gtk-1.4.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
-    sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
-  };
-
-  propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Clutter-GTK";
-
-    homepage = http://www.clutter-project.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/clutter-gtk/1.6.nix b/pkgs/development/libraries/clutter-gtk/1.6.nix
deleted file mode 100644
index 9c4e7ae12713..000000000000
--- a/pkgs/development/libraries/clutter-gtk/1.6.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "clutter-gtk-1.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz";
-    sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d";
-  };
-
-  propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Clutter-GTK";
-    homepage = http://www.clutter-project.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/clutter-gtk/1.8.nix b/pkgs/development/libraries/clutter-gtk/1.8.nix
deleted file mode 100644
index a126f7709449..000000000000
--- a/pkgs/development/libraries/clutter-gtk/1.8.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
-
-stdenv.mkDerivation rec {
-  major = "1.8";
-  minor = "0";
-  name = "clutter-gtk-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
-    sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl";
-  };
-
-  propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Clutter-GTK";
-    homepage = http://www.clutter-project.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 1d085222341a..a126f7709449 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,11 +1,13 @@
 { fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-gtk-1.4.4";
+  major = "1.8";
+  minor = "0";
+  name = "clutter-gtk-${major}.${minor}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
-    sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
+    url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
+    sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl";
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
@@ -15,12 +17,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Clutter-GTK";
-
     homepage = http://www.clutter-project.org/;
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix
deleted file mode 100644
index e303d5f03392..000000000000
--- a/pkgs/development/libraries/clutter/1.22.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
-}:
-
-let
-  ver_maj = "1.22";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "clutter-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs =
-    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
-    ];
-
-  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
-
-  #doCheck = true; # no tests possible without a display
-
-  meta = {
-    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
-
-    longDescription =
-      '' Clutter is free software library for creating fast, compelling,
-         portable, and dynamic graphical user interfaces.  It is a core part
-         of MeeGo, and is supported by the open source community.  Its
-         development is sponsored by Intel.
-
-         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
-         on mobile and embedded platforms), but wraps an easy to use,
-         efficient, flexible API around GL's complexity.
-
-         Clutter enforces no particular user interface style, but provides a
-         rich, generic foundation for higher-level toolkits tailored to
-         specific needs.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-    homepage = http://www.clutter-project.org/;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/clutter/1.24.nix b/pkgs/development/libraries/clutter/1.24.nix
deleted file mode 100644
index b9d45b6c62bb..000000000000
--- a/pkgs/development/libraries/clutter/1.24.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
-}:
-
-let
-  ver_maj = "1.24";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "clutter-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs =
-    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
-    ];
-
-  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
-
-  #doCheck = true; # no tests possible without a display
-
-  meta = {
-    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
-
-    longDescription =
-      '' Clutter is free software library for creating fast, compelling,
-         portable, and dynamic graphical user interfaces.  It is a core part
-         of MeeGo, and is supported by the open source community.  Its
-         development is sponsored by Intel.
-
-         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
-         on mobile and embedded platforms), but wraps an easy to use,
-         efficient, flexible API around GL's complexity.
-
-         Clutter enforces no particular user interface style, but provides a
-         rich, generic foundation for higher-level toolkits tailored to
-         specific needs.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-    homepage = http://www.clutter-project.org/;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
deleted file mode 100644
index ae202b093777..000000000000
--- a/pkgs/development/libraries/cogl/1.20.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection
-, gstreamerSupport ? true, gst_all_1 }:
-
-let
-  ver_maj = "1.20";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "cogl-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
-    sha256 = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-introspection"
-    "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
-
-  propagatedBuildInputs = with xorg; [
-      glib gdk_pixbuf gobjectIntrospection
-      mesa_noglu libXrandr libXfixes libXcomposite libXdamage
-    ]
-    ++ libintlOrEmpty
-    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
-                                               gst_all_1.gst-plugins-base ];
-
-  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
-
-  COGL_PANGO_DEP_CFLAGS
-    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
-  #doCheck = true; # all tests fail (no idea why)
-
-  meta = with stdenv.lib; {
-    description = "A small open source library for using 3D graphics hardware for rendering";
-    maintainers = with maintainers; [ lovek323 ];
-
-    longDescription = ''
-      Cogl is a small open source library for using 3D graphics hardware for
-      rendering. The API departs from the flat state machine style of OpenGL
-      and is designed to make it easy to write orthogonal components that can
-      render without stepping on each other's toes.
-    '';
-
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-  };
-}
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index af83068e5ad6..50f90c9d88ac 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject2, gst_python, gupnp_igd }:
+{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst_plugins_base
+, gst_python, gupnp_igd }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2;
+in stdenv.mkDerivation rec {
   name = "farsight2-0.0.31";
   
   src = fetchurl {
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 27bff62bd656..260a424038f2 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base
-, pygobject2, gst-python, gupnp_igd
+{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base
+, gst-python, gupnp_igd
 , gst-plugins-good, gst-plugins-bad, gst-libav
 }:
 
-stdenv.mkDerivation rec {
-  name = "farstream-0.2.4";
+let
+  inherit (pythonPackages) python pygobject2;
+in stdenv.mkDerivation rec {
+  name = "farstream-0.2.8";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
-    sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j";
+    sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
   };
 
   buildInputs = [ libnice python pygobject2 gupnp_igd libnice ];
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 6808ea52adff..63adb5afd1ca 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,14 +1,24 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "fcgi-2.4.0";
+  name = "fcgi-${version}";
+  version = "2.4.0";
 
   src = fetchurl {
-    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
+    url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz";
+    #    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
     sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36";
   };
 
-  patches = [ ./gcc-4.4.diff ];
+  patches = [
+    ./gcc-4.4.diff
+    (fetchpatch {
+      # Fix a stack-smashing bug:
+      # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591
+      url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch";
+      sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m";
+    })
+  ];
 
   postInstall = "ln -s . $out/include/fastcgi";
 
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
index 0bccb857d350..fee760b3ea26 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "giflib-5.1.0";
+  name = "giflib-5.1.4";
   src = fetchurl {
-    url = mirror://sourceforge/giflib/giflib-5.1.0.tar.bz2;
-    sha256 = "06wd32akyawppar9mqdvyhcw47ssdfcj39lryim2w4v83i7nkv2s";
+    url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
+    sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
   };
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 53acdfed3ba2..551d18d17f19 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -9,11 +9,11 @@ let
   gpgProgram = if useGnupg1 then "gpg" else "gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.6.0";
+  name = "gpgme-1.7.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh";
+    sha256 = "0j6capvv6lcr6p763lr2ygzkzkj5lqm7fnbfc1xaygib1znmzxbi";
   };
 
   outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index b8a18d70af97..2d588e5d231c 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
@@ -1,8 +1,9 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer
-, gst_plugins_base, pygobject2
+{ fetchurl, stdenv, pkgconfig, pythonPackages, gstreamer, gst_plugins_base
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2;
+in stdenv.mkDerivation rec {
   name = "gst-python-0.10.22";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 842dd0df0fc7..9d6fa94cf3ae 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -1,9 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, python
-, gst-plugins-base, pygobject3
+{ fetchurl, stdenv, pkgconfig, pythonPackages
+, gst-plugins-base
 , ncurses
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject3;
+in stdenv.mkDerivation rec {
   name = "gst-python-1.8.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index 1931624d08f2..b94cd88869bf 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="gtdialog";
-    version="1.2";
+    version="1.3";
     name="${baseName}-${version}";
-    hash="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
-    url="http://foicica.com/gtdialog/download/gtdialog_1.2.zip";
-    sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
+    hash="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
+    url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip";
+    sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
   };
   buildInputs = [
     cdk unzip gtk2 glib ncurses pkgconfig
diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/pkgs/development/libraries/gtdialog/default.upstream
index 843c88f55ffd..b9cbcf4c5c75 100644
--- a/pkgs/development/libraries/gtdialog/default.upstream
+++ b/pkgs/development/libraries/gtdialog/default.upstream
@@ -1,3 +1,3 @@
 url http://foicica.com/gtdialog/download
-version_link '[.]zip'
+version_link '[.]zip$'
 version '.*_([0-9.]*)[.]zip' '\1'
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index d1c41c9ea808..d22c32674468 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.2.7";
+  version = "1.3.1";
   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 = "09lh8x6qj0cd950whgaqqi3c4pqbl6z7aw9ddm73i14bw056185v";
+    sha256 = "18c9rzg4ilmhbx8hpdhcjffkzq5smcbc2lr23g6fdm8rs5nj0hm2";
   };
 
   outputs = [ "out" "dev" ];
@@ -47,7 +47,10 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "An OpenType text shaping engine";
     homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
+    downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/";
     maintainers = [ maintainers.eelco ];
     platforms = with platforms; linux ++ darwin;
+    inherit version;
+    updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 586cd9ed43f6..c9fa9b10f938 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libjpeg, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "jasper-1.900.1";
@@ -16,6 +16,30 @@ stdenv.mkDerivation rec {
     ./jasper-CVE-2014-8157.diff
     ./jasper-CVE-2014-8158.diff
     ./jasper-CVE-2014-9029.diff
+    (fetchpatch { # CVE-2016-2116
+      url = "https://github.com/mdadams/jasper/commit/142245b9bbb33274a7c620aa7a8f85bc00b2d68e.patch";
+      sha256 = "06dkplqfb3swmdfqb9i2m6r13q0ivn538xfvinxz0agandxyc9yr";
+    })
+    (fetchpatch { # CVE-2016-1577
+      url = "https://github.com/mdadams/jasper/commit/74ea22a7a4fe186e0a0124df25e19739b77c4a29.patch";
+      sha256 = "1xgvhfhv8r77z0a07ick2w3217mypnkaqjwzxbk1g1ym8lsy5r13";
+    })
+    (fetchpatch { # CVE-2015-5221
+      url = "https://github.com/mdadams/jasper/commit/df5d2867e8004e51e18b89865bc4aa69229227b3.patch";
+      sha256 = "0qsiymm59dkj843dbi43ijqdyy3rrzf193ndm9ynj3cfhqghi10l";
+    })
+    (fetchpatch { # CVE-2008-3522
+      url = "https://github.com/mdadams/jasper/commit/d678ccd27b8a062e3bfd4c80d8ce2676a8166a27.patch";
+      sha256 = "0dapf8h4s3zijbgd8vmap3blpnc78h7jqm5ydv8j0krrs5dv5672";
+    })
+    (fetchpatch { # CVE-2016-2089
+      url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch";
+      sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf";
+    })
+    (fetchpatch { # CVE-2015-5203
+      url = "https://github.com/mdadams/jasper/commit/e73bb58f99fec0bf9c5d8866e010fcf736a53b9a.patch";
+      sha256 = "1r6hxbnhpnb7q6p2kbdxc1cpph3ic851x2hy477yv5c3qmrbx9bk";
+    })
   ];
 
   # newer reconf to recognize a multiout flag
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 2bd1f0a48ac3..63ab7144c473 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk
-, gtk_doc, gtk2, python, lua, libX11, libXext, libXrender, gobjectIntrospection
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
+, gtk_doc, gtk2, pythonPackages, lua, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject3 pygtk;
+in stdenv.mkDerivation rec {
   name = "keybinder-${version}";
   version = "0.3.0";
 
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 5c8e1759a2d8..cfc8590c6390 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygtk
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
 , gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/development/libraries/lcms/cve-2013-4276.patch
new file mode 100644
index 000000000000..8f2f32297828
--- /dev/null
+++ b/pkgs/development/libraries/lcms/cve-2013-4276.patch
@@ -0,0 +1,62 @@
+diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c
+--- lcms-1.19.dfsg/samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
++++ lcms-1.19.dfsg-patched/samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
+@@ -86,6 +86,8 @@
+ static LPcmsNAMEDCOLORLIST InputColorant = NULL;
+ static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
+ 
++unsigned int Buffer_size = 4096;
++
+ 
+ // isatty replacement
+ 
+@@ -500,7 +502,7 @@
+ 
+     Prefix[0] = 0;
+     if (!lTerse)
+-        sprintf(Prefix, "%s=", C);
++        snprintf(Prefix, 20, "%s=", C);
+ 
+     if (InHexa)
+     {
+@@ -648,7 +650,9 @@
+ static
+ void GetLine(char* Buffer)
+ {    
+-    scanf("%s", Buffer);
++    char User_buffer[Buffer_size];
++    fgets(User_buffer, (Buffer_size - 1), stdin);
++    sscanf(User_buffer,"%s", Buffer);
+     
+     if (toupper(Buffer[0]) == 'Q') { // Quit?
+ 
+@@ -668,7 +672,7 @@
+ static
+ double GetAnswer(const char* Prompt, double Range)
+ {
+-    char Buffer[4096];
++    char Buffer[Buffer_size];
+     double val = 0.0;
+ 	       
+     if (Range == 0.0) {              // Range 0 means double value
+@@ -738,7 +742,7 @@
+ static
+ WORD GetIndex(void)
+ {
+-    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
++    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
+     int index, max;
+ 
+     max = cmsNamedColorCount(hTrans)-1;
+diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c
+--- lcms-1.19.dfsg/tifficc/tiffdiff.c	2009-10-30 15:57:46.000000000 +0000
++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c	2013-08-06 11:49:06.698951157 +0100
+@@ -633,7 +633,7 @@
+     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
+     
+    
+-    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
++    snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2);
+   
+     cmsIT8SetComment(hIT8, Buffer);
+ 
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index 1decde64e972..3e4f0d4265f2 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0";
   };
 
+  patches = [ ./cve-2013-4276.patch ];
+
   outputs = [ "bin" "dev" "out" "man" ];
 
   meta = {
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index f4923a4e6bd1..6fde8305da50 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lcms2-2.7";
+  name = "lcms2-2.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/lcms/${name}.tar.gz";
-    sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925";
+    sha256 = "08pvl289g0mbznzx5l6ibhaldsgx41kwvdn2c974ga9fkli2pl36";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index af5942fcd54b..2717a326f4ad 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -5,13 +5,15 @@
 , glib, dbus_glib, gtkVersion
 , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
 , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23
+, pythonPackages, gobjectIntrospection, vala_0_23
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
  }:
 
 with lib;
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2 pygtk;
+in stdenv.mkDerivation rec {
   name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
           in "libappindicator-${postfix}-${version}";
   version = "${versionMajor}.${versionMinor}";
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 2378eb915a86..ec10619ba567 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, libelf }:
 
 stdenv.mkDerivation rec {
-  name = "libdwarf-20121130";
-  
+  name = "libdwarf-20160613";
+
   src = fetchurl {
-    url = http://reality.sgiweb.org/davea/libdwarf-20121130.tar.gz;
+    url = "http://www.prevanders.net/${name}.tar.gz";
     sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0";
   };
 
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 9616461177e6..0a7a1d462ee8 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libfpx-1.3.1-4";
+  name = "libfpx-1.3.1-7";
 
   src = fetchurl {
     url = "mirror://imagemagick/delegates/${name}.tar.xz";
-    sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233";
+    sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh";
   };
 
   # Darwin gets misdetected as Windows without this
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 706e6a714c1a..e35da9e80872 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,10 +1,12 @@
 {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
   libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib,
-  libimobiledevice, python, pygobject2, mutagen,
+  libimobiledevice, pythonPackages, mutagen,
   monoSupport ? true, mono, gtk-sharp-2_0
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2;
+in stdenv.mkDerivation rec {
   name = "libgpod-0.8.3";
   src = fetchurl {
     url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 9fb22eee6b24..7094fa2534b1 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -4,13 +4,15 @@
 , pkgconfig, autoconf
 , glib, dbus_glib, libdbusmenu-glib
 , gtkVersion, gtk2 ? null, gtk3 ? null
-, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils
+, pythonPackages, gobjectIntrospection, vala_0_23, gnome_doc_utils
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
  }:
 
 with lib;
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2 pygtk;
+in stdenv.mkDerivation rec {
   name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
           in "libindicate-${postfix}-${version}";
   version = "${versionMajor}.${versionMinor}";
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 69c30b7cca4b..9e1d4b58a927 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.3.4";
+  name = "libksba-1.3.5";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn";
+    sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21";
   };
 
   outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
new file mode 100644
index 000000000000..485b24beaa34
--- /dev/null
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, cmake, eigen, boost}:
+
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "libnabo-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ethz-asl";
+    repo = "libnabo";
+    rev = version;
+    sha256 = "1pg4vjfq5n7zhjdf7rgvycd7bkk1iwr50fl2dljq43airxz6525w";
+  };
+
+  buildInputs = [cmake eigen boost];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = "
+    -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
+  ";
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A fast K Nearest Neighbor library for low-dimensional spaces";
+    license = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ cryptix ];
+  };
+}
diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix
new file mode 100644
index 000000000000..96e6dca965dc
--- /dev/null
+++ b/pkgs/development/libraries/libpointmatcher/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo}:
+
+stdenv.mkDerivation rec {
+  version = "2016-09-11";
+  name = "libpointmatcher-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ethz-asl";
+    repo = "libpointmatcher";
+    rev = "75044815d40ff934fe0bb7e05ed8bbf18c06493b";
+    sha256 = "1s7ilvg3lhr1fq8sxw05ydmbd3kl46496jnyxprhnpgvpmvqsbzl";
+  };
+
+  buildInputs = [cmake eigen boost libnabo];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = "
+    -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
+  ";
+
+  checkPhase = ''
+  export LD_LIBRARY_PATH=$PWD
+  ./utest/utest --path ../examples/data/
+  '';
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
+    license = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ cryptix ];
+  };
+}
diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index 6009a44dcd21..1c101365950a 100644
--- a/pkgs/development/libraries/libressl/2.3.nix
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.3.7";
+  version = "2.3.8";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0q08yysyalz0fvzajm3x4wg4k6gn4hhd04qsfv27r1p4kj2mv7zm";
+    sha256 = "1hjglpaw1bparlzyjczn0rak32n8hl53317izq81683x5kns8smf";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix
index 43f9244d7a80..6db9df2a59e2 100644
--- a/pkgs/development/libraries/libressl/2.4.nix
+++ b/pkgs/development/libraries/libressl/2.4.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1qyrcyzrrn6r9cqvm66ib72qyr65q4hrdyiq1vb24a6nwmwdg1sz";
+    sha256 = "03ln2ac9cv0pbz3109yjk7cr5yxqfk8ld6g61k9sgrs7wbrjcmxx";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix
new file mode 100644
index 000000000000..51925ee108e9
--- /dev/null
+++ b/pkgs/development/libraries/libressl/2.5.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libressl-${version}";
+  version = "2.5.0";
+
+  src = fetchurl {
+    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+    sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "bin" "dev" "out" "man" ];
+
+  meta = with stdenv.lib; {
+    description = "Free TLS/SSL implementation";
+    homepage    = "http://www.libressl.org";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
+  };
+}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 7a0112e15cab..d5df00a7e9ba 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -6,11 +6,11 @@
 # no introspection by default, it's too big
 
 stdenv.mkDerivation rec {
-  name = "librsvg-2.40.9";
+  name = "librsvg-2.40.16";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";
-    sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk";
+    sha256 = "0bpz6gsq8xi1pb5k9ax6vinph460v14znch3y5yz167s0dmwz2yl";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 425eef001859..8cba1a38b5ba 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -4,11 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.7.0";
+  name = "libva-${version}";
+  version = "1.7.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0py9igf4kicj7ji22bjawkpd6my013qpg0s4ir2np9l1rk5vr2d6";
+    sha256 = "04rczbnbi70y1ziy9ab59szi3glk9q35hshlws0bcj2ndbqirmjx";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 36b5759a2cc0..6bd0ec52f275 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,9 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
-, nettle, libgcrypt, python, pygobject2, gobjectIntrospection, libcap_ng, numactl
+, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
 , xen
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python pygobject2;
+in stdenv.mkDerivation rec {
   name = "libvirt-glib-0.2.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
new file mode 100644
index 000000000000..e9b08609f23c
--- /dev/null
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libxml++-${maj_ver}.${min_ver}";
+  maj_ver = "3.0";
+  min_ver = "0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
+    sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg";
+  };
+
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  buildInputs = [ glibmm ];
+
+  propagatedBuildInputs = [ libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = http://libxmlplusplus.sourceforge.net/;
+    description = "C++ wrapper for the libxml2 XML parser library, version 3";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ loskutov ];
+  };
+}
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index de8cc1e49cc2..1df9cf0492dc 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl
+{ stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python, scons, sqlite, zlib
 }:
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.10";
+  version = "3.0.12";
 
-  src = fetchurl {
-    url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "0fda6syrfb81930sf7rgw1qmpnik8k1ngrjkh43ywd3s37nbqh1n";
+  src = fetchzip {
+    # this one contains all git submodules and is cheaper than fetchgit
+    url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
+    sha256 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i";
   };
 
-  outputs = [ "out" "dev" ];
+  # a distinct dev output makes python-mapnik fail
+  outputs = [ "out" ];
 
   nativeBuildInputs = [ python scons ];
 
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 3d0c594b61bc..aae3d0f9c8ba 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
-    sha256 = "0yzwdl8mf8xdj8rif1qq0qnlq7vlk5q86r3hs2x49m5rqzgljbqy";
+    sha256 = "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl";
   };
 
   postInstall = ''
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 2147bab0a6aa..dfa5605dec8b 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,7 +1,8 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.2";
+  version = "1.5.2";
   branch = "1.5";
-  sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
+  revision = "version.1.5.2";
+  sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp";
 })
diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix
index 034942b25dde..80026af7be04 100644
--- a/pkgs/development/libraries/openjpeg/2.0.nix
+++ b/pkgs/development/libraries/openjpeg/2.0.nix
@@ -1,7 +1,8 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.0.1";
+  version = "2.0.1";
   branch = "2";
-  sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+  revision = "version.2.0.1";
+  sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw";
 })
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index f6b3ce3a9cd8..d59ceb9f7a9d 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -1,7 +1,8 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.0";
+  version = "2.1.1";
   branch = "2.1";
-  sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
+  revision = "v2.1.1";
+  sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601";
 })
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 03b6faed2679..c70bab523cb6 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , libpng, libtiff, lcms2
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
@@ -11,7 +11,7 @@
 , testsSupport ? false
 , jdk ? null
 # Inherit generics
-, branch, sha256, version, ...
+, branch, version, revision, sha256, ...
 }:
 
 assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
@@ -26,8 +26,10 @@ in
 stdenv.mkDerivation rec {
   name = "openjpeg-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "uclouvain";
+    repo = "openjpeg";
+    rev = revision;
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index f684969f9054..80f49c924829 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -111,13 +111,13 @@ in {
   };
 
   openssl_1_0_2 = common {
-    version = "1.0.2i";
-    sha256 = "0vyy038676cv3m2523fi9ll9nkjxadqdnz18zdp5nm6925yli1wj";
+    version = "1.0.2j";
+    sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7";
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0a";
-    sha256 = "0as40a1lipl9qfax7495jc1xfb049ygavkaxxk4y5kcn8birdrn2";
+    version = "1.1.0b";
+    sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4";
   };
 
 }
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 4db1cb5b5246..814158276ce4 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "5.0.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "014503kqv7z63az6lgxr5fbajlrqylm5c4kgbf8p3a0n6cva0slr";
+    sha256 = "00yznbrm9q04wgd4b831km8iwlvwvsnwv87igf79g5vj9yakr88q";
   };
   name = "libosip2-${version}";
 
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 2138e1689b39..b1d2b1fd92ec 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-1.6.19";
+  name = "libupnp-1.6.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/pupnp/${name}.tar.bz2";
-    sha256 = "0amjv4lypvclmi4vim2qdyw5xa6v4x50zjgf682vahqjc0wjn55k";
+    sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf";
   };
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 3034370e4ea5..7fc39cfd52b2 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, spice_protocol, intltool, celt_0_5_1
+{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
-, cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup
-, gtk3, enableGTK3 ? false }:
+, cyrus_sasl, pythonPackages, autoreconfHook, usbredir, libsoup
+, gtk3, epoxy }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  name = "spice-gtk-0.29";
+let
+  inherit (pythonPackages) python pygtk;
+in stdenv.mkDerivation rec {
+  name = "spice-gtk-0.32";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "0wz9sm44gnmwjpmyacwd5jyzvhfl1wlf1dn3qda20si42cky5is4";
+    sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c";
   };
 
   buildInputs = [
     spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
-    libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
-  ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk2 ]);
+    libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
+  ];
 
   nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
 
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-maintainer-mode"
-    (if enableGTK3 then "--with-gtk3" else "--with-gtk=2.0")
+    "--with-gtk3"
   ];
 
   dontDisableStatic = true; # Needed by the coroutine test
@@ -41,9 +43,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "A GTK+2 and GTK+3 SPICE widget";
+    description = "A GTK+3 SPICE widget";
     longDescription = ''
-      spice-gtk is a GTK+2 and GTK+3 SPICE widget. It features glib-based
+      spice-gtk is a GTK+3 SPICE widget. It features glib-based
       objects for SPICE protocol parsing and a gtk widget for embedding
       the SPICE display into other applications such as virt-manager.
       Python bindings are available too.
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 0f9b1288cc49..bd56d880f94a 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.10";
+  name = "spice-protocol-0.12.12";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "1yrfacqgnabmx2q768mim892ga2wnlp5cavkf51v3idyjmqhv3vq";
+    sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp";
   };
 
   postInstall = ''
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 8e1227e46ff9..c0145f4f7769 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.6";
+  name = "spice-0.12.8";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "1dk9hp78ldqb0a52kdlqq0scnk3drnhj7rsw8r7hmy2v2cqflj7i";
+    sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr";
   };
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index f970a63ff12e..a115c93c90e3 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "usbredir-${version}";
-  version = "0.7";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "http://spice-space.org/download/usbredir/${name}.tar.bz2";
-    sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa";
+    sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0";
   };
 
   buildInputs = [ pkgconfig libusb ];
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
new file mode 100644
index 000000000000..4c6d95e67c0f
--- /dev/null
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
+}:
+
+# Require the optional to be enabled until upstream fixes or removes the configure flag
+assert expat != null;
+
+stdenv.mkDerivation rec {
+  name = "wayland-${version}";
+  version = "1.9.0";
+
+  src = fetchurl {
+    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
+  };
+
+  configureFlags = "--with-scanner --disable-documentation";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
+
+  meta = {
+    description = "Reference implementation of the wayland protocol";
+    homepage    = http://wayland.freedesktop.org/;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ codyopel wkennington ];
+  };
+
+  passthru.version = version;
+}
diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix
index 3de8a9420824..38d8b7ac75a7 100644
--- a/pkgs/development/libraries/webkitgtk/2.12.nix
+++ b/pkgs/development/libraries/webkitgtk/2.12.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.12.4";
+  version = "2.12.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0xwsc2lpb4q55vdgmwljx43219l0sa6r5mqs3bmw3fwsb5vk2ka2";
+    sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];