Merge staging into closure-size

author: Vladimír Čunát <vcunat@gmail.com> 2015-05-05 11:49:03 +0200
committer: Vladimír Čunát <vcunat@gmail.com> 2015-05-05 11:49:03 +0200
commit: 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch)
tree: 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/development/libraries
parent: 2f75c6845981b38a698cf1a9f620145877c80956 (diff)
parent: 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff)
download: nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst
nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip
174 files changed, 2462 insertions, 2373 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 6d6148e092a..1e32a598506 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, audiofile
+{ stdenv, fetchurl, pkgconfig, audiofile, libcap
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, x11 ? null, libXrandr ? null
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in stdenv.lib.optional notMingw audiofile;
+  in [ libcap ]
+    ++ (stdenv.lib.optional notMingw audiofile);
 
   nativeBuildInputs = [ pkgconfig ] ++
     stdenv.lib.optional openglSupport [ mesa ];
diff --git a/pkgs/development/libraries/accelio/cflags.patch b/pkgs/development/libraries/accelio/cflags.patch
new file mode 100644
index 00000000000..a0904519122
--- /dev/null
+++ b/pkgs/development/libraries/accelio/cflags.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 6ce6b6b..72d2e65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -110,14 +110,10 @@ AC_MSG_RESULT([$enable_debug])
+ 
+ if test "$enable_debug" = "yes"; then
+ 	AC_DEFINE([DEBUG],[],[Debug Mode])
+-	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wdeclaration-after-statement \
+-		  -Wsign-compare -Wc++-compat \
+-		   -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
++	AM_CFLAGS="$AM_CFLAGS -g -ggdb -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
+ else
+ 	AC_DEFINE([NDEBUG],[],[No-debug Mode])
+-	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wpadded -Wdeclaration-after-statement \
+-		  -Wsign-compare -Wc++-compat \
+-		  -O3 -D_REENTRANT -D_GNU_SOURCE"
++	AM_CFLAGS="$AM_CFLAGS -O3 -D_REENTRANT -D_GNU_SOURCE"
+ fi
+ 
+ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
new file mode 100644
index 00000000000..b56f2d81389
--- /dev/null
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent
+
+# Linux only deps
+, numactl, kernel ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "accelio";
+    repo = "accelio";
+    rev = "v${version}";
+    sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c";
+  };
+
+  patches = [ ./cflags.patch ];
+
+  postPatch = ''
+    # Don't build broken examples
+    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
+
+    # Allow the installation of xio kernel headers
+    sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libevent ];
+  propagatedBuildInputs = [ libibverbs librdmacm ]
+    ++ stdenv.lib.optional stdenv.isLinux numactl;
+
+  configureFlags = [
+    "--enable-rdma"
+    "--disable-raio-build"
+  ] ++ stdenv.lib.optionals (kernel != null) [
+    "--enable-kernel-module"
+    "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  INSTALL_MOD_PATH = "\${out}";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.accelio.org/;
+    description = "a high-performance asynchronous reliable messaging and RPC library optimized for hardware acceleration";
+    license = licenses.bsd3;
+    platforms = with platforms; linux ++ freebsd;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
new file mode 100644
index 00000000000..14fbcdf7342
--- /dev/null
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, glib
+, gtk_doc, autoconf, automake, libtool, libarchive, libyaml
+, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+  name = "appstream-glib-0.3.6";
+
+  src = fetchurl {
+    url = "https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_6.tar.gz";
+    sha256 = "1zdxg9dk9vxw2cs04cswd138di3dysz0hxk4918750hh19s3859c";
+  };
+
+  buildInputs = [ glib libtool pkgconfig gtk_doc gettext intltool sqlite libsoup
+                  gcab attr acl docbook_xsl
+                  libarchive libyaml gtk3 autoconf automake gobjectIntrospection ];
+
+  configureScript = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Objects and helper methods to read and write AppStream metadata";
+    homepage    = https://github.com/hughsie/appstream-glib;
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index cc0f51eb68d..3fb49c2be24 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -37,6 +37,15 @@ in {
     };
   };
 
+  da = buildDict {
+    shortName = "da-1.4.42-1";
+    fullName = "Danish";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/da/aspell5-da-1.4.42-1.tar.bz2;
+      sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp";
+    };
+  };
+
   de = buildDict {
     shortName = "de-20030222-1";
     fullName = "German";
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index d6b080050be..83f532ba15d 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
 let
-  ver_maj = "2.12";
+  ver_maj = "2.16";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
-    sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28";
+    sha256 = "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5920c691d94..677652a733b 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation {
   configureScript = "./bootstrap.sh";
   configureFlags = commonConfigureFlags ++ [
     "--with-icu=${icu}"
-    "--with-python=${python}/bin/python"
+    "--with-python=${python.interpreter}"
   ] ++ optional (toolset != null) "--with-toolset=${toolset}";
 
   buildPhase = builder nativeB2Args;
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 59778d36f85..4ab554561f7 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage    = http://www.celt-codec.org/;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ codyopel raskin ];
-    platform    = platforms.unix;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 049938e1f45..cd679183650 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://cimg.sourceforge.net/;
     license = licenses.cecill-c;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix
new file mode 100644
index 00000000000..617501130ca
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gst/3.0.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gst-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gst/3.0/${name}.tar.xz";
+    sha256 = "0ahn6m9ca78cgf7xad16sb50x4dx0fcn5ircllilkir84iri2466";
+  };
+
+  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-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix
new file mode 100644
index 00000000000..e493bab1bc7
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.4.nix
@@ -0,0 +1,26 @@
+{ 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
new file mode 100644
index 00000000000..9c4e7ae1271
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.6.nix
@@ -0,0 +1,23 @@
+{ 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/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix
new file mode 100644
index 00000000000..e303d5f0339
--- /dev/null
+++ b/pkgs/development/libraries/clutter/1.22.nix
@@ -0,0 +1,52 @@
+{ 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/default.nix b/pkgs/development/libraries/clutter/default.nix
index 67de04050af..37b2c73fe44 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    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
new file mode 100644
index 00000000000..1489f48c9b4
--- /dev/null
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -0,0 +1,57 @@
+{ 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-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+
+  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}/include/pango-1.0 -I${cairo}/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/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 506bb0d7071..e394c9db4ce 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libintlOrEmpty, zlib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.9.2";
+  name = "cracklib-2.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "1xarjwga2bc4hys4fkspcp1cph699ag8gg6gmv8rjgj43llrkj61";
+    sha256 = "0n49prh5rffl33bxy8qf46cqm6mswdlqpmm6iqi490w0p6s6da7j";
   };
 
   buildInputs = [ libintlOrEmpty zlib gettext ];
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index c326fb7fd38..cf22a775b14 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -46,10 +46,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "LD_LIBRARY_PATH=`pwd` make test";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
-    license = stdenv.lib.licenses.boost;
+    license = licenses.boost;
+    platforms = platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 2bd4f814985..5bf9832843b 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }:
+{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
 
 stdenv.mkDerivation rec {
   name = "dbus-cplusplus-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
-    name = "dbus-cplusplus.tar.gz";
+    name = "${name}.tar.gz";
     sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g";
   })];
 
-  buildInputs = [ dbus glib gtkmm pkgconfig expat ];
+  buildInputs = [ dbus glib pkgconfig expat ];
 
   configureFlags = "--disable-ecore";
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index ad836ac732d..087df1a7151 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -76,6 +76,7 @@ let
     # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
     NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
     buildInputs = [ systemdOrEmpty ];
+    meta.platforms = with stdenv.lib.platforms; allBut darwin;
   };
 
 
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index fc8ed42c640..90f50037dce 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
+    platforms = platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
     inherit version;
   };
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 2b0b027bda5..12c21693a79 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "fdk-aac-${version}";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
-    sha256 = "138c1l6c571289czihk0vlcfbla7qlac2jd5yyps5dyg08l8gjx9";
+    sha256 = "1aqmzxri23q83wfmwbbashs27mq1mapvfirz5r9i7jkphrwgw42r";
   };
 
   configureFlags = [ ]
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
new file mode 100644
index 00000000000..5a8b1f2fcbc
--- /dev/null
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gcab-0.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcab/0.6/${name}.tar.xz";
+    sha256 = "a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb";
+  };
+
+  buildInputs = [ intltool gobjectIntrospection pkgconfig ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 237b5537ba4..fe7d0869fbd 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -13,6 +13,12 @@ composableDerivation.composableDerivation {} (fixed: rec {
 
   buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
 
+  patches = [
+    # This ensures that the python package is installed into gdal's prefix,
+    # rather than trying to install into python's prefix.
+    ./python.patch
+  ];
+
   # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
   # Unset CC and CXX as they confuse libtool.
   preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
@@ -31,6 +37,18 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-geos=${geos}/bin/geos-config"# optional
   ];
 
+  # Prevent this:
+  #
+  #   Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
+  #   /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
+  #   TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
+  #   error: bad install directory or PYTHONPATH
+  preBuild = ''
+    pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
+    mkdir -p $pythonInstallDir
+    export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
+  '';
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
diff --git a/pkgs/development/libraries/gdal/python.patch b/pkgs/development/libraries/gdal/python.patch
new file mode 100644
index 00000000000..50504c62edd
--- /dev/null
+++ b/pkgs/development/libraries/gdal/python.patch
@@ -0,0 +1,17 @@
+diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile
+index b4d5e90..2160b83 100644
+--- a/swig/python/GNUmakefile
++++ b/swig/python/GNUmakefile
+@@ -67,11 +67,7 @@ egg:
+ 	
+ install:
+ 
+-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
+-else
+ 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-endif
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
+ 
+
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index c0deb2d5fca..ee7b12de502 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gecode-${version}";
-  version = "4.3.3";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "http://www.gecode.org/download/${name}.tar.gz";
-    sha256 = "1nxcv32pqmf7fsdpa8zp482i8a1nhrfppqaimymcxvxjgxzmpj1i";
+    sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
new file mode 100644
index 00000000000..575e2d562aa
--- /dev/null
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gegl-0.3.0-20140619";
+
+  src = fetchgit {
+    url = "https://git.gnome.org/browse/gegl";
+    sha256 = "1rjmv2y7z34zrnlqczmmh0bm724iszzdf6jpibszxnp3w0npwjrb";
+    rev = "0014eb1bad50244314ed09592fe57efa9322678c";
+  };
+
+  configureScript = "./autogen.sh";
+
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
+
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool
+                  autoconf automake libtool which json_glib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 15f42afd9a8..24c24fe5f12 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://launchpad.net/geis";
-    description = "GEIS is a library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism.";
+    description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 88d9837d597..88545bf732c 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
      substituteInPlace configure --replace "-Werror" ""
   '';
 
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
   propagatedBuildInputs = [ dbus dbus_glib glib ];
 
   meta = {
diff --git a/pkgs/development/libraries/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix
new file mode 100644
index 00000000000..fc6116b3916
--- /dev/null
+++ b/pkgs/development/libraries/gettext/expat.nix
@@ -0,0 +1,10 @@
+{ runCommand, gettext, expat, makeWrapper }:
+
+runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
+  mkdir $out
+  cp -rf ${gettext}/* $out/
+  chmod a+w $out/bin
+  for p in $out/bin/*; do
+    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
+  done
+''
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index ee7f39585ef..6f0394823a6 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,15 +2,15 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.42";
-  ver_min = "1";
+  ver_maj = "2.44";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0";
+    sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 8322ccefff3..066874973aa 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -36,7 +36,8 @@ in
       if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
           mkdir -p $out/lib
           cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
-          ln -s libgcc_s.so.1 $out/lib/libgcc_s.so
+          # the .so It used to be a symlink, but now it is a script
+          cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
       fi
     '';
 
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 9e06ed66412..25666066601 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 let
-  ver_maj = "2.42";
+  ver_maj = "2.44";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397";
+    sha256 = "1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 9e26d8ecf05..c663c4e68a7 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "glog-0.3.3";
+  name = "glog-${version}";
+  version = "0.3.4";
   
-  src = fetchurl {
-    url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
-    sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
+  src = fetchFromGitHub {
+    owner = "Google";
+    repo = "glog";
+    rev = "v${version}";
+    sha256 = "0ym5g15m7c8kjfr2c3zq6bz08ghin2d1r1nb6v2vnkfh1vn945x1";
   };
 
-  meta = {
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/google-glog/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     description = "Library for application-level logging";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
new file mode 100644
index 00000000000..f768e03f184
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
+    sha256 = "0mhym25ns3fhjd82p6g0aafhzbfkanryqbxvjy9mi25n2xpr1b95";
+  };
+
+  patches = [ ./install-fix.patch ];
+})
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 9c1c2e1b7d8..930713f5987 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp
+{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
 
 # Version dependent args
-, version, src
+, version, src, patches ? []
 , ...}:
 
 assert guileBindings -> guile != null;
@@ -10,42 +10,36 @@ assert guileBindings -> guile != null;
 stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
-  inherit src;
+  inherit src patches;
 
-  patches =
-    # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
-    stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
-    ;
-
-  # Note: GMP is a dependency of Nettle, whose public headers include
-  # GMP headers, hence the hack.
-  configurePhase = ''
-    ./configure --prefix="$out"                                 \
-      --disable-dependency-tracking --enable-fast-install       \
-      --without-p11-kit                                         \
-      --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
-      --with-libnettle-prefix="${nettle}"                       \
-      CPPFLAGS="-I${gmp}/include"                               \
-      ${stdenv.lib.optionalString guileBindings
-          "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
-  '';
+  configureFlags = [
+    "--disable-dependency-tracking"
+    "--enable-fast-install"
+  ] ++ stdenv.lib.optional guileBindings
+    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
   # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ zlib lzo lzip ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ];
-
-  propagatedBuildInputs = [ nettle libtasn1 ];
+  nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
+  # Fixup broken libtool and pkgconfig files
+  preFixup = ''
+    sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
+        -e 's,-lz,-L${zlib}/lib -lz,' \
+        -e 's,-lgmp,-L${gmp}/lib -lgmp,' \
+        -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
+  '';
+
   meta = with stdenv.lib; {
     description = "The GNU Transport Layer Security Library";
 
diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
deleted file mode 100644
index 1624d1f7ab9..00000000000
--- a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860
-Author: Simon Josefsson <simon@josefsson.org>
-Date:   Thu Aug 9 15:24:11 2012 +0200
-
-    Add gnulib -I's to guile-snarf command.
-
---- gnutls-3.0.22/guile/src/Makefile.in	2012-08-04 20:52:39.000000000 +0200
-+++ gnutls-3.0.22/guile/src/Makefile.in	2012-08-11 21:55:20.000000000 +0200
-@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \
- # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
- # included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
- snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	       $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
-+	       $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/pkgs/development/libraries/gnutls/install-fix.patch b/pkgs/development/libraries/gnutls/install-fix.patch
new file mode 100644
index 00000000000..48ed2da24c0
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/install-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 0dcf6e9f0d5..6975df9545e 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -5,7 +5,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.40";
+  ver_maj = "1.42";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
+    sha256 = "3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7";
   };
 
   outputs = [ "dev" "out" "doc" ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
-    maintainers = with maintainers; [ lovek323 urkud ];
+    maintainers = with maintainers; [ lovek323 urkud lethalman ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2e51f70e91d..d4913ef21f6 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.3";
+  name = "gpgme-1.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d";
+    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 581f8b1b222..706bd769219 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -1,45 +1,55 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+, staticSupport ? false # Compile statically (support for packages that look for the static object)
+}:
+
+let
+  inherit (stdenv) isDarwin;
+  inherit (stdenv.lib) optional optionalString;
+in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "gsm-${version}";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchurl {
     url = "http://www.quut.com/gsm/${name}.tar.gz";
-    sha256 = "1bcjl2h60gvr1dc5a963h3vnz9zl6n8qrfa3qmb2x3229lj1iiaj";
+    sha256 = "0b1mx69jq88wva3wk0hi6fcl5a52qhnq2f9p3f3jdh5k61ma252q";
   };
 
   patchPhase = ''
     # Fix include directory
     sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
-
-    makeFlags="$makeFlags INSTALL_ROOT=$out"
-
-    # Build shared library instead of static
-    sed -e 's,-c -O2 -DNeedFunctionPrototypes=1,-c -O2 -fPIC -DNeedFunctionPrototypes=1,' -i Makefile
-    sed -e 's,libgsm.a,libgsm.so,' -i Makefile
-    sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
-    sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
-  '';
+  '' + optionalString (!staticSupport) (
+    (if isDarwin then  ''
+      # Build dylib on Darwin
+      sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile
+      sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile
+    '' else ''
+      # Build ELF shared object by default
+      sed -e 's,libgsm.a,libgsm.so,' -i Makefile
+      sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
+    '') + ''
+      # Remove line that is unused when building shared libraries
+      sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
+    ''
+  );
 
   makeFlags = [
-    ''SHELL=${stdenv.shell}''
-  ];
+    "SHELL=${stdenv.shell}"
+    "INSTALL_ROOT=$(out)"
+  ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang";
 
-  preInstall = ''
-    mkdir -p "$out/"{bin,lib,man/man1,man/man3,include/gsm}
-  '';
+  preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
 
-  NIX_CFLAGS_COMPILE = "-fPIC";
+  NIX_CFLAGS_COMPILE = optional (!staticSupport) "-fPIC";
 
   parallelBuild = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lossy speech compression codec";
     homepage    = http://www.quut.com/gsm/;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ codyopel raskin ];
-    platforms   = platforms.all;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 96a094ca9cc..b4c962d9e54 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -5,11 +5,14 @@
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
-, mesa
+, mesa, libintlOrEmpty
 }:
 
 assert faacSupport -> faac != null;
 
+let
+  inherit (stdenv.lib) optional optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.4.5";
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
       a real live maintainer, or some actual wide use.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -39,7 +42,15 @@ stdenv.mkDerivation rec {
     faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
-    wildmidi fluidsynth libvdpau wayland
+    fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
-  ] ++ stdenv.lib.optional faacSupport faac;
+  ]
+    ++ libintlOrEmpty
+    ++ optional faacSupport faac
+    ++ optional stdenv.isLinux wayland
+    # wildmidi requires apple's OpenAL
+    # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
+    ++ optional (!stdenv.isDarwin) wildmidi;
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 61e0762826a..f959da4045e 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
 , orc, alsaLib, libXv, pango, libtheora
-, cdparanoia, libvisual
+, cdparanoia, libvisual, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     description = "Base plugins and helper libraries";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
@@ -24,12 +24,23 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    orc alsaLib libXv pango libtheora
-    cdparanoia libvisual
-  ];
+    orc libXv pango libtheora cdparanoia
+  ]
+  ++ libintlOrEmpty
+  ++ stdenv.lib.optional stdenv.isLinux alsaLib
+  ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
 
   propagatedBuildInputs = [ gstreamer ];
 
+  configureFlags = if stdenv.isDarwin then [ 
+    # Does not currently build on Darwin
+    "--disable-libvisual"
+    # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
+    "--disable-cdparanoia"
+  ] else null;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 }
 
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5e306f5500f..5dbcb1cee4b 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Open source multimedia framework";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index df7078a1365..47b09e95e6e 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Library for creation of audio/video non-linear editors";
     homepage    = "http://gstreamer.freedesktop.org";
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 05113973a9d..4b6e7957f5c 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
       applications. It introduces the concept of a timeline.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a06747ddc90..51ad836b644 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -3,9 +3,12 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio
+, libsoup, pulseaudio, libintlOrEmpty
 }:
 
+let
+  inherit (stdenv.lib) optionals optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.4.5";
 
@@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
       code, LGPL or LGPL-compatible for the supporting library).
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -31,9 +34,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc bzip2
-    libv4l libdv libavc1394 libiec61883
-    libvpx speex flac taglib
+    libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup pulseaudio
-  ];
+    libsoup
+  ]
+  ++ libintlOrEmpty
+  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index d4db4fa8de5..1db7e4dbd55 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
-, glib, gstreamer, bzip2, libsoup
+, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
   minimalDeps ? false
@@ -23,11 +23,15 @@ stdenv.mkDerivation rec {
   configureFlags = "--enable-experimental --disable-oss";
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
+    [ pkgconfig glib gstreamer gst_plugins_base ]
+    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
         taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 
   meta = {
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "`Good' plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index e4411fcefbb..99ac5a5ec54 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
   enableParallelBuilding = true;
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
new file mode 100644
index 00000000000..67dfc34434d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
@@ -0,0 +1,14 @@
+diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c
+index 60f709f..cdc7e75 100644
+--- a/gst/gstdatetime.c
++++ b/gst/gstdatetime.c
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index b608f891533..07b846f35b4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i -e 's/^   /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Applying this patch manually to avoid a rebuild on Linux. Feel free to refactor later
+    # See https://trac.macports.org/ticket/40783 for explanation of patch
+    patch -p1 < ${./darwin.patch}
   '';
 
   configureFlags = ''
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 97a4638170f..ea1c31ccab8 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gtkmm.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 4e3d7eee78b..c13beb4d5f7 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python
 , gst-plugins-base, orc
 , a52dec, libcdio, libdvdread
-, lame, libmad, libmpeg2, x264
+, lame, libmad, libmpeg2, x264, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       like. The code might be widely known to present patent problems.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc
     a52dec libcdio libdvdread
     lame libmad libmpeg2 x264
-  ];
+  ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 }
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
new file mode 100644
index 00000000000..84bea07602f
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.16.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
+, xlibs, x11, wayland, libxkbcommon, epoxy
+, xineramaSupport ? stdenv.isLinux
+, cupsSupport ? stdenv.isLinux, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+let
+  ver_maj = "3.16";
+  ver_min = "2";
+  version = "${ver_maj}.${ver_min}";
+in
+stdenv.mkDerivation rec {
+  name = "gtk+3-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
+    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
+  };
+
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+
+  buildInputs = [ libxkbcommon epoxy ];
+  propagatedBuildInputs = with xlibs; with stdenv.lib;
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
+    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
+    ++ optional stdenv.isDarwin x11
+    ++ optional xineramaSupport libXinerama
+    ++ optional cupsSupport cups;
+
+  # demos fail to install, no idea where's the problem
+  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
+
+  enableParallelBuilding = true;
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  passthru = {
+    gtkExeEnvPostBuild = ''
+      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
+      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
+    ''; # workaround for bug of nix-mode for Emacs */ '';
+  };
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+
+    longDescription = ''
+      GTK+ is a highly usable, feature rich toolkit for creating
+      graphical user interfaces which boasts cross platform
+      compatibility and an easy to use API.  GTK+ it is written in C,
+      but has bindings to many other popular programming languages
+      such as C++, Python and C# among others.  GTK+ is licensed
+      under the GNU LGPL 2.1 allowing development of both free and
+      proprietary software with GTK+ without any license fees or
+      royalties.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index b57c91c4455..52df259616b 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk ];
 
+  preConfigure = ''
+    sed '/DEPRECATED_FLAGS/d' -i configure
+    sed 's/-Wall -Werror//' -i configure
+  '';
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
new file mode 100644
index 00000000000..bc327468855
--- /dev/null
+++ b/pkgs/development/libraries/gtkmm/3.16.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
+
+let
+  ver_maj = "3.16";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "gtkmm-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
+    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 739b0ad3136..dcdef696ffd 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -5,15 +5,15 @@
 , gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
 
 let
-  ver_maj = "1.18";
-  version = "${ver_maj}.3";
+  ver_maj = "1.22";
+  version = "${ver_maj}.2";
 in
 stdenv.mkDerivation rec {
   name = "gvfs-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
-    sha256 = "0b27vidnrwh6yb2ga9a1k9qlrz6lrzsaz2hcxqbc1igivhb9g0hx";
+    sha256 = "8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libtool ];
@@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
-    description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)";
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
   };
 }
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
index 8d175398414..3fbc8c3f2b0 100644
--- a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
+++ b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
@@ -2,7 +2,7 @@
   If user need access to more haskell package for building his
   diagrams, he simply has to pass these package through the
   extra packages function as follow in `config.nix`:
-  
+
   ~~~
   diagramBuilderWrapper.override {
     extraPackages = self : [myHaskellPackage];
@@ -10,22 +10,21 @@
   ~~~
 
   WARNING:
-  Note that this solution works well but however, as this is a 
+  Note that this solution works well but however, as this is a
   non-cabal derivation, user should be carefull to never put this
   package inside the listing passed as argument to `ghcWithPackages`
   as it will silently disregard the package. This silent disregard
   should be regarded as an issue for `ghcWithPackages`. It should
   rather raise an error instead when a non-cabal dirivation is
   directly passed to it. The alternative would have been to
-  use a fake cabal file in order to make this a cabal derivation
-  such as what `yiCustom` package did.
+  use a fake cabal file in order to make this a cabal derivation.
 */
 
-{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, 
+{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper,
   extraPackages ? (self: []) }:
 let
-  # Used same technique as for the yiCustom package.
-  w = ghcWithPackages 
+  # Used same technique such as xmonad
+  w = ghcWithPackages
     (self: [ diagramsBuilder ] ++ extraPackages self);
   wrappedGhc = w.override { ignoreCollisions = true; };
 in
@@ -50,4 +49,4 @@ stdenv.mkDerivation {
   '';
   preferLocalBuild = true;
   meta = diagramsBuilder.meta;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index fc4b2b47959..6476fb663ef 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "hiredis-${version}";
-  version = "0.12.1";
+  version = "0.13.0";
 
-  src = fetchgit {
-    url = "git://github.com/redis/hiredis";
-    rev = "37c06facda57af9bad68f50c18edfa22d6ef76f7";
-    sha256 = "1z1rzhh1659g8i5bl78k1i1imlz2prwirhzbkn6j7hvq4mxbf2yz";
+  src = fetchFromGitHub {
+    owner = "redis";
+    repo = "hiredis";
+    rev = "v${version}";
+    sha256 = "195ih8jprw0q253nvhnmfv9dsm8pss6pdf4x3c88q4mfsyw8pg76";
   };
 
   PREFIX = "\${out}";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/redis/hiredis;
     description = "Minimalistic C client for Redis >= 1.2";
-    licenses = licenses.bsd3;
+    license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix
index 7dd2b6284fa..3491b2b3970 100644
--- a/pkgs/development/libraries/javascript/jquery/default.nix
+++ b/pkgs/development/libraries/javascript/jquery/default.nix
@@ -3,17 +3,17 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "jquery-1.11.1";
+  name = "jquery-1.11.2";
 
   src = if compressed then
     fetchurl {
       url = "http://code.jquery.com/${name}.min.js";
-      sha256 = "0hgly37jhg0n5cqlx3ylmwcxkxmbkvv07f9z9pm94jyxq7gcc2sl";
+      sha256 = "1h09zz6cjm66g30wa7c41by1jswx9gjpgqgbxln0dv2v55fjkk9f";
     }
     else
     fetchurl {
       url = "http://code.jquery.com/${name}.js";
-      sha256 = "1g7nhy8dwzzai7h7m800fsig4gzw34kjxxbpqdac2y8ch9586a9h";
+      sha256 = "098gnzndmmjygpsfywxgmb0vi42b882pwpby77gqkrd2nwsp1hjq";
     };
 
   unpackPhase = "true";
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
deleted file mode 100644
index 30e8d5ffe1c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let
-
-  mkDerivation = drv:
-    let inherit (builtins.parseDrvName drv.name) version; in
-    stdenv.mkDerivation
-      (drv // {
-        setupHook = ./setup-hook.sh;
-
-        enableParallelBuilding = drv.enableParallelBuilding or true;
-        cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta =
-          {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          } // (drv.meta or {});
-      });
-
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
-    # packages pinned to this version of Qt 5
-    {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5.base;
-      Qt5Core = qt5.base;
-      Qt5DBus = qt5.base;
-      Qt5Gui = qt5.base;
-      Qt5LinguistTools = qt5.tools;
-      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
-      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
-      Qt5Script = qt5.script;
-      Qt5Svg = qt5.svg;
-      Qt5WebkitWidgets = qt5.webkit;
-      Qt5Widgets = qt5.base;
-      Qt5X11Extras = qt5.x11extras;
-      Qt5XmlPatterns = qt5.xmlpatterns;
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-    } //
-    # packages from the nixpkgs collection
-    (with pkgs;
-      {
-        Boost = boost155;
-        inherit cmake epoxy;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        NetworkManager = networkmanager;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
-      }
-    );
-
-  mirror = "mirror://kde";
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-      ];
-
-  postResolve = super:
-    super // {
-      extra-cmake-modules = {
-        inherit (super.extra-cmake-modules) name src;
-
-        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
-          ];
-        meta =
-          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
-          {
-            license = with stdenv.lib.licenses; [ bsd2 ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          };
-      };
-
-      frameworkintegration = super.frameworkintegration // {
-        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
-      };
-
-      kauth = super.kauth // {
-        buildInputs =
-          super.kauth.buildInputs
-          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
-
-      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      ktexteditor = super.ktexteditor // {
-        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-      };
-
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
-  };
-
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
deleted file mode 100644
index c4a2977b8e5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
+++ /dev/null
@@ -1,500 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  networkmanager-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
deleted file mode 100755
index 2b220244c59..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
deleted file mode 100644
index 47b8dfad180..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index c63241b..2243f94 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
deleted file mode 100644
index 3bd946cbd84..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
deleted file mode 100644
index a6ccb2085d3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
-+                  // shared libraries should be in /lib/plugins/../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
deleted file mode 100644
index 440e979c008..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index eb4a09b..f70f1a1 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
deleted file mode 100644
index e9bc418544a..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
-index 69b1427..9c37a49 100644
---- a/src/kbuildsycoca/kbuildsycoca.cpp
-+++ b/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
deleted file mode 100644
index 7e21ebfe86f..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
-index 2eb1275..e39a36f 100644
---- a/src/kbuildsycoca/vfolder_menu.cpp
-+++ b/src/kbuildsycoca/vfolder_menu.cpp
-@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+        QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
deleted file mode 100644
index c2e77a537c5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 15 Feb 2015 19:09:17 -0600
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3f02e8c..d1a865b 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--    
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
-         return anyError;
-     
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
deleted file mode 100644
index e2d215889e0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
+++ /dev/null
@@ -1,562 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qldfj7r4gfnwd9137m5x282kn9clghvc-kplotting-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kplotting-5.7.0.tar.xz";
-      sha256 = "0257ydhyq0f5r2yl0va4y8zcb7vxll1jdz6ykaskg413hm2qxkpi";
-      name = "kplotting-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/kpbcn842lgx6h7cj7rblc60h656qqv49-ktextwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktextwidgets-5.7.0.tar.xz";
-      sha256 = "0yhhm9cgn2lbj2ca64szyy11xviaqj5kil5kwivwnndzvaap9ja5";
-      name = "ktextwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/x5y7xgpn24rw7ax1xm5m3z0kd1db3k5p-ki18n-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ki18n-5.7.0.tar.xz";
-      sha256 = "16vz9hrm1j5gl5k0mbx36rxxngxbfwwlg7sznplybcghdzf5xwpc";
-      name = "ki18n-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fa5fimm0kc5yymlj05hcljz4lnyx15xz-attica-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/attica-5.7.0.tar.xz";
-      sha256 = "1xxd3062bv65npc3kxpsaw3805sg12fq76wy3qa1mqqy3074hvwh";
-      name = "attica-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/0nd3wx3gkln1bdpa956b8yjcs7k9ia4j-kdesignerplugin-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesignerplugin-5.7.0.tar.xz";
-      sha256 = "0y6yjm9zqi9plfbwqc7p8r0vsxj28drfymsdx4wvwqzfv8nby57q";
-      name = "kdesignerplugin-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/claqclndc0kz33g5nkbpa3w38mh9jqqh-kservice-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kservice-5.7.0.tar.xz";
-      sha256 = "1aziycv2r0y02lcc3hv7kzzlk9sc3c5fmh02sgm4px2wknfd12ja";
-      name = "kservice-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ww9xz56sdx2i3q8bipgf83gzdisihv0c-kbookmarks-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kbookmarks-5.7.0.tar.xz";
-      sha256 = "1vv3wirszsr5a2parbr6k4wkbp7lhcjqhbadr4fyhq62cvr7ya8l";
-      name = "kbookmarks-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qiihgxjbhx39pc1p6g5w933ifzc3gdp8-kidletime-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kidletime-5.7.0.tar.xz";
-      sha256 = "15i9rj7fs6nc40axd19a8ba21wcbzvivwlsr49h27vfbhca4h5x3";
-      name = "kidletime-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ij41pg9l8j47f42yhycv8nqh7lf2zjv8-kpty-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpty-5.7.0.tar.xz";
-      sha256 = "0sg11pzrgmdyqxbvd8rbcljmjcacnpnf6wwjqb5rj92fvrd30av0";
-      name = "kpty-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/yxxr5ldkg551dydqjwxds5fm0nsjszwp-kdesu-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesu-5.7.0.tar.xz";
-      sha256 = "0bjvkzgkmzxk4wlpk5hcxykf2nidg1c5c65mlhabddg0bns67axd";
-      name = "kdesu-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/4dx78zbckkn5hyrjmch1wh5n3vkzz8lc-kcodecs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcodecs-5.7.0.tar.xz";
-      sha256 = "0pnf435jdm8lifvq8gdy4195vq653ffqrqdw0qh36qn9242csqhj";
-      name = "kcodecs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/laps2gv18vnzirpm4il51m1kw2p7hslq-kinit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kinit-5.7.0.tar.xz";
-      sha256 = "1fzmizq877f124kal9vali5a910kv3fx6pwpza502h6rdhslpsx2";
-      name = "kinit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/b4c3rpfikpk4bl9y87862h2fvfv22nvx-kwindowsystem-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwindowsystem-5.7.0.tar.xz";
-      sha256 = "1h3snqhlri98645nyc2p5jbz0s98yrppn3ipd7nyklnwk220prkk";
-      name = "kwindowsystem-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sb8f1fy08m738adnajy1dd0xz5ipmwkr-kxmlgui-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kxmlgui-5.7.0.tar.xz";
-      sha256 = "1zpwih2v8416r3pn4rklr6xzhcn1jf3zlj4sd75xbnx6y5fbm1q6";
-      name = "kxmlgui-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/an7xgl36n79n038b9i9dg7r1ngg0vncg-knotifyconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifyconfig-5.7.0.tar.xz";
-      sha256 = "0psv2k6p7d04s3icjw10hxi7676a9kphqcd2pzmcxg4wk50ikqns";
-      name = "knotifyconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/161vcj6bf51i82rmpd9xws4h72xbcypg-kunitconversion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kunitconversion-5.7.0.tar.xz";
-      sha256 = "1fhh2db23q0d6g9rqsbgv5wbzyzj72x9pjda5vqa549sx8yq04is";
-      name = "kunitconversion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lq4kzjg64c30yrinbgmkp5w596bg2121-kdbusaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdbusaddons-5.7.0.tar.xz";
-      sha256 = "1bn5ayywnhak0933y11lzkw39rkrmrm9m73knvgb46l7x1cchr3v";
-      name = "kdbusaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/9gnqmwvy7pm5sjpfhqqk8grz1mjb2701-threadweaver-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/threadweaver-5.7.0.tar.xz";
-      sha256 = "1ab208awll2gnrs37p7k9nwp44sc30swibw75x9jh1w16nklpapa";
-      name = "threadweaver-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/xjiy5yxbmd4g4l61qyrbdrakzxgsrhlb-kparts-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kparts-5.7.0.tar.xz";
-      sha256 = "0ws8mk1q0sd36b3ac39s4xyzhlbh897s0hkw9kyp8yk0779g09sg";
-      name = "kparts-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/zz72jdhabwv1wj8mr910lfl17w11ap3i-sonnet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/sonnet-5.7.0.tar.xz";
-      sha256 = "11q0zfpcmvjs994cdcp5rg49lzibi7jaz0jb8h7s5kf27nc96w0r";
-      name = "sonnet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vyjpw6zsscf23xq0c4dgbldn3vizh4pj-kdewebkit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdewebkit-5.7.0.tar.xz";
-      sha256 = "04zb2a6dj89inxppf081hzkzwlyxcsrb3j4x2y6jz8zfpsnnhkxz";
-      name = "kdewebkit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1gns8ry1kiiww0lfs8m5yc8ki2sh550c-kguiaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kguiaddons-5.7.0.tar.xz";
-      sha256 = "0f63vn1f5wafzxhc50lr59qd31jav512nwh7y37jl95mrc5yjjrb";
-      name = "kguiaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/mmwxm2jyi8lyir7g6ws8hjhzcmxkkb08-plasma-framework-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/plasma-framework-5.7.0.tar.xz";
-      sha256 = "0r5kks3a0b4cl599r2qlsigdr83psbgjw5xki480xs6caznmqd1m";
-      name = "plasma-framework-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d1vx0maspgndbczfshwh3498qxwk9ca5-kdoctools-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdoctools-5.7.0.tar.xz";
-      sha256 = "01lshra3jjqklbvld004pnj4pic8yrrpgbsy1yxfdfsccnrdf9di";
-      name = "kdoctools-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/r9q0s6cpwbhjkgrji86gylmj4mfwvikl-kjobwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kjobwidgets-5.7.0.tar.xz";
-      sha256 = "033y6cmdc8gzckqmxmasmpirfzsg0ga58hf88crrp8y21a03hary";
-      name = "kjobwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/12105y95jb4xyf4c1z8ya6d81k7z5bji-kcrash-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcrash-5.7.0.tar.xz";
-      sha256 = "0jq4rqicrvzmj8fra1zhk9b76b0x043z1ny5hf3ikyy9k4axay8z";
-      name = "kcrash-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/2wrbbn9rr9xwqkiagiccpmr7v37c6icd-kitemviews-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemviews-5.7.0.tar.xz";
-      sha256 = "1ib6hlj7nv84all4j7p6k5ai5n4yslf2i2h2gwyiff2h55p2a686";
-      name = "kitemviews-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fv1l1v4ld92shbih8cjlxyab272aygmq-kio-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kio-5.7.0.tar.xz";
-      sha256 = "0xf43ff41rgrqhici0mw2y2n4h97gkbgdngfngyzgm1vs3xq8wpl";
-      name = "kio-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/difsiryniivbnlh4j2jwssywv2ijb03s-kwidgetsaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwidgetsaddons-5.7.0.tar.xz";
-      sha256 = "19z5wr5dyq4kmry6iss85zpvjhh9a3pa6vmhbcag61sdid0nfsqx";
-      name = "kwidgetsaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d7f0aaamjvv67g9p5dhw98zwqg5sdl3q-kapidox-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kapidox-5.7.0.tar.xz";
-      sha256 = "1zv91a68lzh1rb12if7c67y0gy2004kh3jlcvfy270cd9rxmkywd";
-      name = "kapidox-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/09c46cmhryzqnn32kxwfjblmf5fnm7pm-kimageformats-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kimageformats-5.7.0.tar.xz";
-      sha256 = "00gga2yhpdrc9y73zhs3r6vpqb5blc9r7by72i0cap5ac040a4la";
-      name = "kimageformats-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ylm05pqs3izryr45qqa37r82r76l1h3l-kdeclarative-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdeclarative-5.7.0.tar.xz";
-      sha256 = "13m1pf92508sk4rl54v2pwic99snj2r0sjvmxvzv11cfrddjkr5g";
-      name = "kdeclarative-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/msbryhpxvbp8165gyf4cp27f2fjrk09z-kemoticons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kemoticons-5.7.0.tar.xz";
-      sha256 = "1k5436xc0fv4xx66lzpy2kx7qgzbdv6n56xif1jl85x66gfvfvdv";
-      name = "kemoticons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pnvb112ryqxy1q2yrrz72jak5lhm374p-kcompletion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcompletion-5.7.0.tar.xz";
-      sha256 = "1d8q2b8rdk7dmmhnjnkg16dc6bgnq2ahss2n1z2l6fcm305zvyfh";
-      name = "kcompletion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cq1lbqzf4ihy8jnk2jab31wb3dljmpdz-kconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfig-5.7.0.tar.xz";
-      sha256 = "0mvdz5vxzqb1vxiy7llgnyi1yyl5jmdyq35v1sf55gb84gyghrgh";
-      name = "kconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ph932zwlra3rsjxh37rx0i1pshk08icc-kpackage-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpackage-5.7.0.tar.xz";
-      sha256 = "0w6ljqs2knm9jvy3hkyk0iiy295mc0dpifvxyqcq4fqj9yvkrxgq";
-      name = "kpackage-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6ppkdiwvy2y3wwxrja117pinmc4lv92a-knotifications-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifications-5.7.0.tar.xz";
-      sha256 = "0z9bs21mn9i5jya0dh1sr0vvn362bz64nhbwnwkb5vgy0sl2n923";
-      name = "knotifications-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/63phhh1pcqlsqiqs9399vqfz7c7yw6ry-kcoreaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcoreaddons-5.7.0.tar.xz";
-      sha256 = "00byxkbwm3gvlharmqvn94jw7l1c1yjv4naczqgqcppl97h0zqyb";
-      name = "kcoreaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cgxjl2p9p0qmmn6vsb357pvn01zyblr2-kitemmodels-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemmodels-5.7.0.tar.xz";
-      sha256 = "0y3zis7rh40nrv135zb3lvl4ix4bqqvby6kcy3b1llxcmhvaglph";
-      name = "kitemmodels-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/icy79l7w5vqwmwmg21zji3y8sqpzwcq2-kded-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kded-5.7.0.tar.xz";
-      sha256 = "0146ldipacy43xypl5zshbf751bfi2mkaa5m8hcva4ygmps0xzp3";
-      name = "kded-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lz8kkfgzz18myibj3wcijai5qs0jw03p-kconfigwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfigwidgets-5.7.0.tar.xz";
-      sha256 = "073rv7i04p21ifwfbhikib555067iivzybnrxw6mgb5hxgph8ggv";
-      name = "kconfigwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/3p606b334sbng7a1ppc9wc9gjw4v0y59-kdelibs4support-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kdelibs4support-5.7.0.tar.xz";
-      sha256 = "1vl6s0bd0ykzbbnd6fq7vfxg7aly0k04wr15wlikkapgx3v0h9b5";
-      name = "kdelibs4support-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vrdx48h2r0fvjc7h2xzsjihs57gnny38-khtml-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/khtml-5.7.0.tar.xz";
-      sha256 = "0flr8qz6nws5h52ghxrzxzmn9y85mlms4n0wzh1kski1sszv62i6";
-      name = "khtml-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sipm1kyl3lwy2fw7lcjn2n2s8qpxhag7-kjs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjs-5.7.0.tar.xz";
-      sha256 = "1wjhl4j5y8q55bcgzlq3m0w1kafkivfgcdvi96f9rqyr7ij5ry9h";
-      name = "kjs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vid0xggxw5liig84p5jgwf3mafkyk7n5-krunner-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/krunner-5.7.0.tar.xz";
-      sha256 = "113bxzzvjw1xxkq54nizb4g4rvbbaj58zfwcz6x0pvz5jfz65b7c";
-      name = "krunner-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/629r99dj85wah0cqvpljy45n3zniqys3-kmediaplayer-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kmediaplayer-5.7.0.tar.xz";
-      sha256 = "1bdws01m37bbip4j897nwi49jakwl9j4hp3xxls15r2h5q4wylc3";
-      name = "kmediaplayer-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/8m4vp5riqrj4b1n2wvydvlz43902f01y-kross-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kross-5.7.0.tar.xz";
-      sha256 = "1larhjl2mi5v5a9a5m216idnyvxkbb9ln1czfvsg18nizai9b0bj";
-      name = "kross-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vcmsl5zz6lv1p92vw1k30wlzp0cr43f0-kjsembed-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjsembed-5.7.0.tar.xz";
-      sha256 = "1717d4q4wf182s8rlf76wj7pgzmrh6j1na9myg2pqpa9564nmald";
-      name = "kjsembed-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rnixw65cmqlkkxmcn21rc73zwk4b0zg2-networkmanager-qt-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/networkmanager-qt-5.7.0.tar.xz";
-      sha256 = "1lx1vjsp25hfrg8pvpw3k17sxr9y57m4mgzikaxkh704z826npjk";
-      name = "networkmanager-qt-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/m5spysm05hv2ncy392msym59jxd056qi-ktexteditor-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktexteditor-5.7.0.tar.xz";
-      sha256 = "0ii2aw2kzvxqwlm3cjil8shkr1yfmfcwr3hvrvk99zv6mw0j8kq3";
-      name = "ktexteditor-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pabbzdlfgyl58llh6m0l1j5w3r4anpv7-kdnssd-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdnssd-5.7.0.tar.xz";
-      sha256 = "120rclq82fnjz5z8q3rn9jbmql3fqpr64yspggl6ccv0f2v513dy";
-      name = "kdnssd-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/z31cgnvxh50m6m7xcpv087zmpdn1la8q-karchive-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/karchive-5.7.0.tar.xz";
-      sha256 = "0ppq4ml77bf9n9q216dcsmw9ipmqqaazbaaxxvqn5hmqx9j63mmq";
-      name = "karchive-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6axbcm8958m691k3jsk3ci41h97aymq3-kauth-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kauth-5.7.0.tar.xz";
-      sha256 = "1254rbagpcp3dpdfjcxr7b07n5dqc0iw93xgpafkhxzn0h687hg2";
-      name = "kauth-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/7p63gkx0brvnwhzsg2laqnbrq7lgdggr-kwallet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwallet-5.7.0.tar.xz";
-      sha256 = "19bmdc7hdvr6bxwrmlhnkclqn6dzlrdg7k870y6p4rhyrj3nvc1h";
-      name = "kwallet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/h02fsp21lh2dbd3yvpavqh1vgwc6m87v-kiconthemes-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kiconthemes-5.7.0.tar.xz";
-      sha256 = "111rdj347sf1g09zdnss4cq68ks71jxw0b22hnczqq9p60qcj1jg";
-      name = "kiconthemes-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/khjj7d173y5qlqqi2z6sc7zmkv5cx5lc-frameworkintegration-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/frameworkintegration-5.7.0.tar.xz";
-      sha256 = "0d0s03y99nk8cqnsz4w5v1d06bq5dl5395wgkcrchzcwqspk7z72";
-      name = "frameworkintegration-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.7.0.tar.xz" ".tar";
-    store = "/nix/store/ga7k0viqdz58drznxba2mjjq4qf0gnj1-extra-cmake-modules-1.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/extra-cmake-modules-1.7.0.tar.xz";
-      sha256 = "1lgx13y00b9mv2p10p7bbzx12aav65i4ggcnyaqmp7pv867y33f8";
-      name = "extra-cmake-modules-1.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rl9gv6hcsxalys9mnm00x34grsclnzh2-solid-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/solid-5.7.0.tar.xz";
-      sha256 = "0adzqbcwnqg0f2jbrsy4sqv0p94ikijm6id1yrd89nvn0iiiip14";
-      name = "solid-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/dql6c4ljy6jkr7zsksrq5wpmqhxsgz37-kcmutils-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcmutils-5.7.0.tar.xz";
-      sha256 = "1b0rzydyhbv7jk9amj45iryl4r2iy5k2zh8g7qwbwig8jywfhwqs";
-      name = "kcmutils-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/jwckk8a1mpy4mp785mbssy0mkn3zc6b6-knewstuff-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knewstuff-5.7.0.tar.xz";
-      sha256 = "0wg3fg2kyq2j8n2qmahw30binm9pxaqvvydsxpcj97fl0wcaffgl";
-      name = "knewstuff-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1s1bl23mrah31k3vqw40vfs6f79b0wnp-kactivities-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kactivities-5.7.0.tar.xz";
-      sha256 = "1d42i0a015qsr4d4rhr574xixfw1w0dgl4qag6slsj6fm5asny19";
-      name = "kactivities-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/i6ja196cyzixsxbyg6bdivizs75y8pvb-kglobalaccel-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz";
-      sha256 = "0jlknk3g07x9y4vl4n82hy4msfaavqy51fpj1yffya8zbb59c29y";
-      name = "kglobalaccel-5.7.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
deleted file mode 100755
index fef8b701d01..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.7/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
deleted file mode 100644
index 9a22c0bdbcd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
-index 07b3c90..84417e3 100644
---- a/src/plasma/package.cpp
-+++ b/src/plasma/package.cpp
-@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
-       servicePrefix("plasma-applet-"),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix b/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
deleted file mode 100644
index 58ade4e62ac..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
index 0f5504fe057..397eec61a78 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
@@ -195,6 +195,10 @@ let
         patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
       };
 
+      networkmanager-qt = super.networkmanager-qt // {
+        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
+      };
+
     };
 
   kf5 = generateCollection ./. {
diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
new file mode 100644
index 00000000000..49edbf63a54
--- /dev/null
+++ b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
@@ -0,0 +1,224 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8217cba..a6c1d70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ else(APPLE)
+   endif(${BUILD_FOR_ARM})
+ endif(APPLE)
+ 
+-set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
++set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
+ 
+ set(TEST_BINARY "kinetic_client_test")
+ set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY})
+@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated)
+ set(PREFIX "${CMAKE_BINARY_DIR}/vendor")
+ set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor")
+ 
+-include(ExternalProject)
+-
+-set(KINETIC_PROTO_VERSION "3.0.0")
+-set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934")
+-
+-ExternalProject_add(
+-    kinetic-proto
+-    PREFIX ${PREFIX}
+-    DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND ""
+-)
+-
+-ExternalProject_add(
+-    gflags
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz"
+-    URL_MD5 "9084829124e02a7e6be0f0f824523423"
+-    CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-)
+-
+-ExternalProject_add(
+-    glog
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz"
+-    URL_MD5 "a6fd2c22f8996846e34c763422717c18"
+-    PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR}
+-    CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-    DEPENDS gflags
+-)
+-
+-ExternalProject_add(
+-    gtest
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip"
+-    URL_MD5 "4577b49f2973c90bf9ba69aa8166b786"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a
+-    INSTALL_COMMAND ""
+-)
+-
+-ExternalProject_add(
+-    gmock
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip"
+-    URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a
+-    INSTALL_COMMAND ""
+-    DEPENDS gtest
+-)
+-
+-ExternalProject_add(
+-    openssl
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz"
+-    URL_MD5 "de62b43dfcd858e66a74bee1c834e959"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG}
+-    BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc
+-    INSTALL_COMMAND make install_sw
+-)
+-
+-# The protobuf build requires the existence of a protoc binary that can be
+-# executed on the host machine. To handle cross compilation, we always build
+-# protobuf once for the host so that we have a suitable copy of protoc.
+-ExternalProject_add(
+-    protoc
+-    PREFIX ${EXTERNAL_PREFIX}/host
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
+-    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
+-    CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static
+-)
+-
+ # Protobuf code generation rules
+-set(PROTOC_PATH "${PREFIX}/host/bin/protoc")
+-set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto")
++set(PROTOC_PATH "protoc")
++set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto")
+ set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto")
+ set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto")
+-ExternalProject_add(
+-    protobuf
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
+-    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
+-    CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-    DEPENDS protoc
+-)
+ 
+ add_custom_command(
+     COMMENT "Compiling protobuf"
+     OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc
+     COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH}
+-    DEPENDS kinetic-proto protoc protobuf
+ )
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH})
+ 
+@@ -157,21 +70,10 @@ include_directories(
+ 
+     src/test/mock
+     src/test
+-
+-    ${EXTERNAL_PREFIX}/include
+-    ${EXTERNAL_PREFIX}/src/gmock/include
+-    ${EXTERNAL_PREFIX}/src/gtest/include
+ )
+ 
+ set(LIBRARY_DEPENDENCIES
+     kinetic_client
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a
+-    ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a
+-    ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a
+     ${CMAKE_THREAD_LIBS_INIT}
+     dl
+ )
+@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES
+ # Otherwise glog uses the standard glibc unwinder and there is no dependency.
+ find_library(LIBUNWIND "unwind")
+ if(LIBUNWIND)
+-    set(LIBRARY_DEPENDENCIES 
+-        ${LIBRARY_DEPENDENCIES} 
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
+         ${LIBUNWIND}
+     )
+ endif()
+ 
++find_library(LIBSSL "ssl")
++if(LIBSSL)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBSSL}
++    )
++endif()
++
++find_library(LIBCRYPTO "crypto")
++if(LIBCRYPTO)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBCRYPTO}
++    )
++endif()
++
++find_library(LIBPROTOBUF "protobuf")
++if(LIBPROTOBUF)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBPROTOBUF}
++    )
++endif()
++
++find_library(LIBGLOG "glog")
++if(LIBGLOG)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGLOG}
++    )
++endif()
++
++find_library(LIBGFLAGS "gflags")
++if(LIBGFLAGS)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGFLAGS}
++    )
++endif()
++
++find_library(LIBGMOCK "gmock")
++if(LIBGMOCK)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGMOCK}
++    )
++endif()
++
++find_library(LIBGTEST "gtest")
++if(LIBGTEST)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGTEST}
++    )
++endif()
++
+ add_library(kinetic_client
+     src/main/generated/kinetic_client.pb.cc
+     src/main/hmac_provider.cc
+diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc
+index 2079fab..c5004a2 100644
+--- a/src/test/kinetic_cpp_client_test.cc
++++ b/src/test/kinetic_cpp_client_test.cc
+@@ -22,6 +22,7 @@
+ 
+ #include <iostream>
+ 
++#include "gflags/gflags.h"
+ #include "gtest/gtest.h"
+ #include "glog/logging.h"
+ 
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
new file mode 100644
index 00000000000..9a11c85bd76
--- /dev/null
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog
+, google-gflags, gmock, gtest
+}:
+
+let
+  protoTar = fetchurl {
+    url = "http://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz";
+    sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "kinetic-cpp-client-2015-04-14";
+
+  src = fetchgit {
+    url = "git://github.com/Seagate/kinetic-cpp-client.git";
+    rev = "015085a5c89db0398f80923053f36b9e0611e107";
+    sha256 = "15iwlfjwnyswiwssdjg6qiflhddh66nv07xji4yhz1s4vqhk3nrx";
+  };
+
+  patches = [ ./build-fix.patch ];
+
+  postPatch = ''
+    mkdir -p build/kinetic-proto
+    tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar}
+  '';
+
+  nativeBuildInputs = [ cmake protobuf ];
+  buildInputs = [ libunwind glog google-gflags gmock gtest ];
+
+  # The headers and library include from these and there is no provided pc file
+  propagatedBuildInputs = [ protobuf openssl ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=true"
+  ];
+
+  preCheck = ''
+    # The checks cannot find libkinetic_client.so otherwise
+    export LD_LIBRARY_PATH="$(pwd)"
+  '';
+
+  installPhase = ''
+    # There is no included install script so do our best
+    mkdir -p $out/lib
+    cp libkinetic_client.so $out/lib
+    cp -r ../include $out
+    cp ../src/main/generated/kinetic_client.pb.h $out/include
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Seagate/kinetic-cpp-client;
+    description = "code for producing C and C++ kinetic clients";
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 44e800b6f1e..72b364bb364 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
+{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig ] ++
+    [ pkgconfig libcap ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
 
   meta = {
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix
new file mode 100644
index 00000000000..bc21237e238
--- /dev/null
+++ b/pkgs/development/libraries/libasyncns/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libasyncns-0.8";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/libasyncns/${name}.tar.gz";
+    sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://0pointer.de/lennart/projects/libasyncns/;
+    description = "a C library for Linux/Unix for executing name service queries asynchronously";
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 73ca029a631..51f62b9bd5f 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = http://sourceforge.net/projects/libavc1394/;
-    license = [ "GPL" "LGPL" ];
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index e69cd4ed2ac..0d9474e585e 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
+{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
 , alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
 
 stdenv.mkDerivation rec {
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
   };
 
-  buildInputs = # ToDo: gstreamer not found (why?), add (g)udev?
-    [ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ];
+  buildInputs = [
+    pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap
+    /*gstreamer gst_plugins_base*/      # ToDo: gstreamer not found (why?), add (g)udev?
+  ];
 
   configureFlags = "--disable-oss";
 
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 9cdf9d411cc..1a3c33eb80a 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -2,11 +2,11 @@
 , clutter_gtk, libsoup /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
-  name = "libchamplain-0.12.2";
+  name = "libchamplain-0.12.10";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.2.tar.xz;
-    sha256 = "0bkyzm378gh6qs7grr2vgzrl4z1pi99yysy8iwzdqzs0bs3rfgyj";
+    url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz";
+    sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
new file mode 100644
index 00000000000..5d5a9e49381
--- /dev/null
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, }:
+
+stdenv.mkDerivation rec {
+  name = "libclthreads-${version}";
+  version = "2.4.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
+    sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
+  };
+
+  configurePhase = ''
+    sed -e "s@/usr/local@$out@" -i Makefile
+    sed -e "s@/usr/bin/install@install@" -i Makefile
+    sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile
+    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
+  '';
+
+  meta = {
+    description = "zita thread library";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
new file mode 100644
index 00000000000..7d0e4596dd0
--- /dev/null
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "libclxclient-${version}";
+  version = "3.9.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
+    sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
+  };
+
+  buildInputs = [
+    libclthreads libXft libX11 xlibs.xproto
+  ];
+
+  configurePhase = ''
+    cpp -v
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include"
+    echo $NIX_CFLAGS_COMPILE
+    sed -e "s@/usr/local@$out@" -i Makefile
+    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i clxclient.h
+    sed -e "s@ldconfig@@" -i Makefile
+    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
+  '';
+
+  fixupPhase = ''
+    ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
+  '';
+
+  meta = {
+    description = "zita X11 library";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 841edd3dff6..bcc9e9f673f 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
 
   meta = {
-    description = "C client library for Couchbase.";
+    description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 8836b0bffa2..ccc0a199654 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, mysql ? null, sqlite ? null, postgresql ? null
+, libmysql ? null, sqlite ? null, postgresql ? null
 }:
 
 with stdenv.lib;
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ]
-    ++ optional (mysql != null) mysql.lib;
+  buildInputs = [ libdbi libmysql sqlite postgresql ];
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (mysql != null) [
+  ] ++ optionals (libmysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${mysql.lib}/include/mysql"
-    "--with-mysql-libdir=${mysql.lib}/lib/mysql"
+    "--with-mysql-incdir=${libmysql}/include/mysql"
+    "--with-mysql-libdir=${libmysql}/lib/mysql"
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 3213c0634ba..e8c374297d3 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,28 +1,31 @@
-{ composableDerivation, fetchurl }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-
-  flags = { }
-    # TODO! implement flags
-    # I want to get kino and cinelerra working. That's why I don't spend more time on this now
-    // edf { name = "libtool_lock"; } #avoid locking (might break parallel builds)
-    // edf { name ="asm"; } #disable use of architecture specific assembly code
-    // edf { name ="sdl"; } #enable use of SDL for display
-    // edf { name ="gtk"; } #disable use of gtk for display
-    // edf { name ="xv"; } #disable use of XVideo extension for display
-    // edf { name ="gprof"; }; #enable compiler options for gprof profiling
+{ stdenv, fetchurl, popt }:
 
+stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
+    url = "mirror://sourceforge/libdv/${name}.tar.gz";
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
-  meta = {
+  # This fixes an undefined symbol: _sched_setscheduler error on compile.
+  # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
+  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+
+  configureFlags = [
+    "--disable-asm"
+    "--disable-sdl"
+    "--disable-gtk"
+    "--disable-xv"
+    "--disable-gprof"
+  ];
+
+  buildInputs = [ popt ];
+
+  meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 9eee0d40654..61bb15dde7d 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation rec {
-  name = "libedit-20140620-3.1";
+  name = "libedit-20150325-3.1";
 
   src = fetchurl {
     url = "http://www.thrysoee.dk/editline/${name}.tar.gz";
-    sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2";
+    sha256 = "1if8zi9h52m80ck796an28rrqfljk2n8cn25m3fl0prwz155x2n8";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
     license = licenses.bsd3; 
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index fd16866ccee..9a003de80f1 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.3.1";
+  name = "libevdev-1.4.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "0hr6xjp7vcnr7lnr1il03235rcslqb95yv7j88qh51q0bwcpcz2b";
+    sha256 = "11dfiz7pkb2jbavr1ba8phn86qavvgf1xwlxmfs69mqxlz4x6yai";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 57cf1738342..74524164dd0 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchFromGitHub, autoreconfHook, python }:
 
-let version = "2.0.21"; in
+let version = "2.0.22"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992";
+  src = fetchFromGitHub {
+    owner = "libevent";
+    repo = "libevent";
+    rev = "release-${version}-stable";
+    sha256 = "1x2437af9j870i7l37dav1i2g9z93lbz406kyimx4nq5qcx5463p";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ python ];
+
   patchPhase = ''
-    substituteInPlace event_rpcgen.py \
-      --replace "/usr/bin/env python2" "${python}/bin/python"
+    patchShebangs event_rpcgen.py
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Event notification library";
 
     longDescription =
@@ -29,7 +33,8 @@ stdenv.mkDerivation {
          the event loop.
       '';
 
-    license = "mBSD";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 0be604c6246..530b04e8b42 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,38 +1,28 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchcvs }:
 
-  version = a.lib.attrByPath ["version"] "2009-05-27" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  src = a.fetchcvs {
+stdenv.mkDerivation rec {
+  name = "libffcall-${version}";
+  version = "2009-05-27";
+  src = fetchcvs {
     cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall";
     module = "ffcall";
     date = version;
-    sha256 = "91bcb5a20c85a9ccab45886aae8fdbbcf1f20f995ef898e8bdd2964448daf724";
+    sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  doConfigure = a.fullDepEntry (''
+  configurePhase = ''
     for i in ./configure */configure; do
       cwd="$PWD"
-      cd "$(dirname "$i")"; 
+      cd "$(dirname "$i")";
       ( test -f Makefile && make distclean ) || true
       ./configure --prefix=$out
       cd "$cwd"
     done
-  '') a.doConfigure.deps;
+  '';
 
-  name = "libffcall-" + version;
   meta = {
     description = "Foreign function call library";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 586d48a8daa..23ccfc69df4 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.18";
+  name = "libgpg-error-1.19";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz";
+    sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix
index 38f94e7992d..5ce1e5cbdf6 100644
--- a/pkgs/development/libraries/libibverbs/default.nix
+++ b/pkgs/development/libraries/libibverbs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.openfabrics.org/;
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ freebsd;
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 5aea194e39d..44aa546fe00 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.29";
+  name = "libidn-1.30";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c";
+    sha256 = "0lxh5r1z8gsk4jxx3rv8aasjv8p53j4y04kvfn2w30a0syagrf9r";
   };
 
   doCheck = ! stdenv.isDarwin;
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index d1337604260..2cba1b0dd3c 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  
+
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     homepage = http://www.linux1394.org;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index a05d176554e..c1519ca5b83 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
-  libtasn1, libplist, readline }:
+{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, libgcrypt,
+  libtasn1, libplist, readline, libusbmuxd, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libimobiledevice-1.0.7";
+  name = "libimobiledevice-1.2.0";
 
   nativeBuildInputs = [ python libplist.swig pkgconfig ];
   buildInputs = [ readline ];
-  propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
+  propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
   patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.bz2";
-    sha256 = "15jznqc52yfwkbw19hgv3r1qd4gcymakbfkyizmr6v4n0sn27n0f";
+    sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 80ad7879e10..0c55353c30c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.13.0";
+  name = "libinput-0.14.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c";
+    sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 1293c2245ac..26aa974a7ee 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.2";
+  name = "libksba-1.3.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb";
+    sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 100f91d966f..54862e0482b 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
-    sha256 = "1ndfag9a7yl8j1iwxgd2d8slwzc0ifmzg9zf8lg7fsqsa9c3s7m6";
+    sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 3e95f944caf..2146562c5cb 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, texinfo }:
+{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "libmikmod-3.3.7";
-
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mikmod/libmikmod/3.3.7/libmikmod-3.3.7.tar.gz";
+    url = "mirror://sourceforge/mikmod/${name}.tar.gz";
     sha256 = "18nrkf5l50hfg0y50yxr7bvik9f002lhn8c00nbcp6dgm5011x2c";
   };
 
-  buildInputs = [ texinfo ];
+  buildInputs = [ texinfo ]
+    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ];
+  propagatedBuildInputs =
+    stdenv.lib.optional stdenv.isLinux pulseaudio;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
 
   meta = with stdenv.lib; {
     description = "A library for playing tracker music module files";
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index c1fb0033aa9..600d7faace2 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ raskin ];
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index 197892897f3..97319840975 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure.";
+    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure";
     longDescription = ''
       libnetfilter_cthelper is the userspace library that provides the programming interface
       to the user-space helper infrastructure available since Linux kernel 3.6. With this
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index 0626e91b8ba..2920cbd9785 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure.";
+    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure";
     longDescription = ''
       libnetfilter_cttimeout is the userspace library that provides the programming
       interface to the fine-grain connection tracking timeout infrastructure.
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 557e448e2d4..460aaa2b0ec 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? false }:
+{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }:
 
 let
   version = "1.1";
@@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open, royalty-free, highly versatile audio codec";
     license = stdenv.lib.licenses.bsd3;
     homepage = http://www.opus-codec.org/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
index 6ff5d816776..334748d668c 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/pkgs/development/libraries/libosmpbf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/scrosby/OSM-binary;
-    description = "C library to read and write OpenStreetMap PBF files.";
+    description = "C library to read and write OpenStreetMap PBF files";
     license = stdenv.lib.licenses.lgpl3;
   };
 }
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 95da6dfb749..0b9b7bd2f54 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
+{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libplist-1.3";
+  name = "libplist-1.12";
 
-  nativeBuildInputs = [ cmake swig2 ];
+  nativeBuildInputs = [ pkgconfig swig2 ];
 
-  patches = [ ./swig.patch ];
+  #patches = [ ./swig.patch ];
 
   propagatedBuildInputs = [ libxml2 glib python ];
 
   passthru.swig = swig2;
 
   src = fetchurl {
-    url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
-    sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 81cac5be709..bd6cbc3682c 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
-    license = ["GPL" "LGPL"];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix
index 843ff62530b..498463b2aea 100644
--- a/pkgs/development/libraries/librdmacm/default.nix
+++ b/pkgs/development/libraries/librdmacm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.openfabrics.org/;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ freebsd;
     license = licenses.bsd2;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 2abe01decb7..314508cc5c2 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -1,18 +1,17 @@
-
-	{ stdenv, fetchgit
+{ stdenv, fetchurl
 , pkgconfig, autoreconfHook
 , readline, texinfo
 , gdbm, gmp, libffi }:
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
 
-  name = "librep-git-2015-02-15";
+stdenv.mkDerivation rec {
+  name = "librep-${version}";
+  version = "0.92.5";
 
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/librep.git";
-    rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf";
-    sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
+    sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
   };
 
   buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
@@ -25,15 +24,12 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "Lisp system for Sawfish";
+    description = "Fast, lightweight, and versatile Lisp environment";
     longDescription = ''
-      This is librep, a Lisp system for UNIX, needed by Sawfish window manager.
-      It contains a Lisp interpreter, byte-code compiler and virtual machine.
-      Applications may use the Lisp interpreter as an extension language,
-      or it may be used for stand-alone scripts.
-
-      The Lisp dialect was originally inspired by Emacs Lisp, but with the worst
-      features removed. It also borrows many ideas from Scheme.
+      librep is a Lisp system for UNIX, comprising an
+      interpreter, a byte-code compiler, and a virtual
+      machine. It can serve as an application extension language
+      but is also suitable for standalone scripts.
     '';
     homepage = http://sawfish.wikia.com;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix
new file mode 100644
index 00000000000..76daf7d748b
--- /dev/null
+++ b/pkgs/development/libraries/librsync/0.9.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "librsync-0.9.7";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz;
+    sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6";
+  };
+
+  configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
+
+  crossAttrs = {
+    dontStrip = true;
+  };
+
+  meta = {
+    homepage = http://librsync.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl2Plus;
+    description = "Implementation of the rsync remote-delta algorithm";
+  };
+}
diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
new file mode 100644
index 00000000000..3d8699918e1
--- /dev/null
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, curl, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "libs3-2015-01-09";
+
+  src = fetchFromGitHub {
+    owner = "bji";
+    repo = "libs3";
+    rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
+    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
+  };
+
+  buildInputs = [ curl libxml2 ];
+
+  DESTDIR = "\${out}";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bji/libs3;
+    description = "a library for interfacing with amazon s3";
+    licenses = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index c4bdc23f937..b9aa9522564 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage    = http://www.mega-nerd.com/libsndfile/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
-    platfomrs   = platforms.unix;
+    platforms   = platforms.unix;
 
     longDescription = ''
       Libsndfile is a C library for reading and writing files containing
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
new file mode 100644
index 00000000000..edc3d3df9cb
--- /dev/null
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libplist }:
+
+stdenv.mkDerivation rec {
+  name = "libusbmuxd-1.0.10";
+  src = fetchurl {
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libplist ];
+
+  meta = {
+    homepage = "http://www.libimobiledevice.org";
+  };
+}
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 4da60397444..a6da96dc863 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
-
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index a7c80077e79..6a475667078 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,149 +1,148 @@
-{stdenv, fetchurl, bash, perl, yasm
-, vp8Support ? true # VP8
+{stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
-, vp9Support ? true # VP9
 , vp9DecoderSupport ? true # VP9 decoder
 , vp9EncoderSupport ? true # VP9 encoder
 , extraWarningsSupport ? false # emit non-fatal warnings
 , werrorSupport ? false # treat warnings as errors (not available with all compilers)
-, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
-, installLibsSupport ? true # install libraries
-, installSrcsSupport ? false # install sources
 , debugSupport ? false # debug mode
 , gprofSupport ? false # gprof profiling instrumentation
 , gcovSupport ? false # gcov coverage instrumentation
+, sizeLimitSupport ? true # limit max size to allow in the decoder
 , optimizationsSupport ? true # compiler optimization flags
 , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
 , thumbSupport ? false # build arm assembly in thumb mode
-, libsSupport ? true # build librares
 , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
 , fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
-, codecSrcsSupport ? false # codec library source code
 , debugLibsSupport ? false # include debug version of each library
-, md5Support ? true # support for output of checksum data
 , postprocSupport ? true # postprocessing
-, vp9PostprocSupport ? true # VP9 specific postprocessing
 , multithreadSupport ? true # multithreaded decoding & encoding
 , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
 , memTrackerSupport ? false # track memory usage
+, spatialResamplingSupport ? true # spatial sampling (scaling)
 , realtimeOnlySupport ? false # build for real-time encoding
 , ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
 , errorConcealmentSupport ? false # decoder conceals losses
 , smallSupport ? false # favor smaller binary over speed
 , postprocVisualizerSupport ? false # macro block/block level visualizers
 , unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
+, webmIOSupport ? true # input from and output to webm container
+, libyuvSupport ? true # libyuv
+, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
+, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
 , multiResEncodingSupport ? false # multiple-resolution encoding
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
-, decryptSupport ? false
+, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
+, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
 , experimentalSupport ? false # experimental features
 # Experimental features
-, experimentalMultipleArfSupport ? false
-, experimentalNon420Support ? false
-, experimentalAlphaSupport ? false
+, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
+, experimentalFpMbStatsSupport ? false
+, experimentalEmulateHardwareSupport ? false
 }:
 
-assert (vp8Support || vp9Support);
-assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
-assert vp8DecoderSupport -> vp8Support;
-assert vp8EncoderSupport -> vp8Support;
-assert vp9DecoderSupport -> vp9Support;
-assert vp9EncoderSupport -> vp9Support;
-assert installLibsSupport -> libsSupport;
-# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
-assert installBinsSupport -> examplesSupport;
-assert examplesSupport -> md5Support;
-assert vp9PostprocSupport -> (vp9Support && postprocSupport);
-assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
-assert postprocVisualizerSupport -> postprocSupport;
-assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
-assert unitTestsSupport -> ((curl != null) && (coreutils != null));
-assert (experimentalMultipleArfSupport || experimentalNon420Support || experimentalAlphaSupport) -> experimentalSupport;
-assert stdenv.isCygwin -> unitTestsSupport;
-
 let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv.lib) enableFeature optional optionals;
 in
 
-with stdenv.lib;
+assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+
+assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
+assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
+/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
+   Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
+   but is only executed if spatialResamplingSupport is enabled */
+assert spatialResamplingSupport;
+assert postprocVisualizerSupport -> postprocSupport;
+assert unitTestsSupport -> curl != null && coreutils != null;
+assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
+assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
+
 stdenv.mkDerivation rec {
   name = "libvpx-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
-  src = fetchurl {
-    url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2";
-    sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc";
+  src = fetchFromGitHub {
+    owner = "webmproject";
+    repo = "libvpx";
+    rev = "v${version}";
+    sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s";
   };
 
-  patchPhase = ''
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [ bash perl yasm ];
-
-  buildInputs = [ ]
-    ++ optional unitTestsSupport coreutils
-    ++ optional unitTestsSupport curl;
+  patchPhase = ''patchShebangs .'';
 
   configureFlags = [
-    (mkFlag vp8Support "vp8")
-    (mkFlag vp8EncoderSupport "vp8-encoder")
-    (mkFlag vp8DecoderSupport "vp8-decoder")
-    (mkFlag vp9Support "vp9")
-    (mkFlag vp9EncoderSupport "vp9-encoder")
-    (mkFlag vp9DecoderSupport "vp9-decoder")
-    (mkFlag extraWarningsSupport "extra-warnings")
-    (mkFlag werrorSupport "werror")
+    (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
+    (enableFeature vp8EncoderSupport "vp8-encoder")
+    (enableFeature vp8DecoderSupport "vp8-decoder")
+    (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
+    (enableFeature vp9EncoderSupport "vp9-encoder")
+    (enableFeature vp9DecoderSupport "vp9-decoder")
+    (enableFeature extraWarningsSupport "extra-warnings")
+    (enableFeature werrorSupport "werror")
     "--disable-install-docs"
-    (mkFlag installBinsSupport "install-bins")
-    (mkFlag installLibsSupport "install-libs")
-    (mkFlag installSrcsSupport "install-srcs")
-    (mkFlag debugSupport "debug")
-    (mkFlag gprofSupport "gprof")
-    (mkFlag gcovSupport "gcov")
+    (enableFeature examplesSupport "install-bins")
+    "--enable-install-libs"
+    "--disable-install-srcs"
+    (enableFeature debugSupport "debug")
+    (enableFeature gprofSupport "gprof")
+    (enableFeature gcovSupport "gcov")
     # Required to build shared libraries
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
-    (mkFlag (stdenv.isx86_64 || !stdenv.isDarwin || stdenv.isCygwin) "use-x86inc")
-    (mkFlag optimizationsSupport "optimizations")
-    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
-    (mkFlag thumbSupport "thumb")
-    (mkFlag libsSupport "libs")
-    (mkFlag examplesSupport "examples")
+    (enableFeature (!isCygwin) "pic")
+    (enableFeature (isi686 || isx86_64) "use-x86inc")
+    (enableFeature optimizationsSupport "optimizations")
+    (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
+    (enableFeature thumbSupport "thumb")
+    "--enable-libs"
+    (enableFeature examplesSupport "examples")
     "--disable-docs"
     "--as=yasm"
-    (mkFlag fastUnalignedSupport "fast-unaligned")
-    (mkFlag codecSrcsSupport "codec-srcs")
-    (mkFlag debugLibsSupport "debug-libs")
-    (mkFlag md5Support "md5")
-    (mkFlag stdenv.isMips "dequant-tokens")
-    (mkFlag stdenv.isMips "dc-recon")
-    (mkFlag postprocSupport "postproc")
-    (mkFlag vp9PostprocSupport "vp9-postproc")
-    (mkFlag multithreadSupport "multithread")
-    (mkFlag internalStatsSupport "internal-stats")
-    (mkFlag memTrackerSupport "mem-tracker")
-    /* If --enable-spatial-resampling not enabled, build will fail with undeclared variable errors.
-       Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
-       but is only executed if --enable-spatial-resampling is enabled */
-    "--enable-spatial-resampling"
-    (mkFlag realtimeOnlySupport "realtime-only")
-    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
-    (mkFlag errorConcealmentSupport "error-concealment")
+    # Limit default decoder max to WHXGA
+    (if sizeLimitSupport then "--size-limit=5120x3200" else null)
+    (enableFeature fastUnalignedSupport "fast-unaligned")
+    "--disable-codec-srcs"
+    (enableFeature debugLibsSupport "debug-libs")
+    (enableFeature isMips "dequant-tokens")
+    (enableFeature isMips "dc-recon")
+    (enableFeature postprocSupport "postproc")
+    (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
+    (enableFeature multithreadSupport "multithread")
+    (enableFeature internalStatsSupport "internal-stats")
+    (enableFeature memTrackerSupport "mem-tracker")
+    (enableFeature spatialResamplingSupport "spatial-resampling")
+    (enableFeature realtimeOnlySupport "realtime-only")
+    (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
+    (enableFeature errorConcealmentSupport "error-concealment")
     # Shared libraries are only supported on ELF platforms
-    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
-    (mkFlag smallSupport "small")
-    (mkFlag postprocVisualizerSupport "postproc-visualizer")
-    (mkFlag unitTestsSupport "unit-tests")
-    (mkFlag multiResEncodingSupport "multi-res-encoding")
-    (mkFlag temporalDenoisingSupport "temporal-denoising")
-    (mkFlag decryptSupport "decrypt")
-    (mkFlag experimentalSupport "experimental")
+    (if isDarwin || isCygwin then
+       "--enable-static --disable-shared"
+     else
+       "--disable-static --enable-shared")
+    (enableFeature smallSupport "small")
+    (enableFeature postprocVisualizerSupport "postproc-visualizer")
+    (enableFeature unitTestsSupport "unit-tests")
+    (enableFeature webmIOSupport "webm-io")
+    (enableFeature libyuvSupport "libyuv")
+    (enableFeature decodePerfTestsSupport "decode-perf-tests")
+    (enableFeature encodePerfTestsSupport "encode-perf-tests")
+    (enableFeature multiResEncodingSupport "multi-res-encoding")
+    (enableFeature temporalDenoisingSupport "temporal-denoising")
+    (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
+    (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
+    (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
+    (enableFeature (experimentalSpatialSvcSupport ||
+                    experimentalFpMbStatsSupport ||
+                    experimentalEmulateHardwareSupport) "experimental")
     # Experimental features
-    (mkFlag experimentalMultipleArfSupport "multiple-arf")
-    (mkFlag experimentalNon420Support "non420")
-    (mkFlag experimentalAlphaSupport "alpha")
-  ];
+  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optionals unitTestsSupport [ coreutils curl ];
 
   enableParallelBuilding = true;
 
@@ -163,7 +162,8 @@ stdenv.mkDerivation rec {
       # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
       "--force-target=${stdenv.cross.config}${(
               if isDarwin then (
-                if stdenv.cross.osxMinVersion == "10.9"  then "13"
+                if      stdenv.cross.osxMinVersion == "10.10" then "14"
+                else if stdenv.cross.osxMinVersion == "10.9"  then "13"
                 else if stdenv.cross.osxMinVersion == "10.8"  then "12"
                 else if stdenv.cross.osxMinVersion == "10.7"  then "11"
                 else if stdenv.cross.osxMinVersion == "10.6"  then "10"
@@ -174,11 +174,11 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = http://www.webmproject.org/;
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ codyopel lovek323 ];
+    maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index fd7f9150e1d..31b1c197e9f 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -1,15 +1,10 @@
 {stdenv, fetchgit, perl, yasm
-, vp8Support ? true # VP8
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
-, vp9Support ? true # VP9
 , vp9DecoderSupport ? true # VP9 decoder
 , vp9EncoderSupport ? true # VP9 encoder
 , extraWarningsSupport ? false # emit non-fatal warnings
 , werrorSupport ? false # treat warnings as errors (not available with all compilers)
-, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
-, installLibsSupport ? true # install libraries
-, installSrcsSupport ? false # install sources
 , debugSupport ? false # debug mode
 , gprofSupport ? false # gprof profiling instrumentation
 , gcovSupport ? false # gcov coverage instrumentation
@@ -17,13 +12,10 @@
 , optimizationsSupport ? true # compiler optimization flags
 , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
 , thumbSupport ? false # build arm assembly in thumb mode
-, libsSupport ? true # build librares
 , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
 , fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
-, codecSrcsSupport ? false # codec library source code
 , debugLibsSupport ? false # include debug version of each library
 , postprocSupport ? true # postprocessing
-, vp9PostprocSupport ? true # VP9 specific postprocessing
 , multithreadSupport ? true # multithreaded decoding & encoding
 , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
 , memTrackerSupport ? false # track memory usage
@@ -40,7 +32,6 @@
 , encodePerfTestsSupport ? false # build encoder perf tests with unit tests
 , multiResEncodingSupport ? false # multiple-resolution encoding
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
-, vp9TemporalDenoisingSupport ? true # VP9 specific temporal denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
 , experimentalSupport ? false # experimental features
@@ -50,118 +41,109 @@
 , experimentalEmulateHardwareSupport ? false
 }:
 
-assert (vp8Support || vp9Support);
-assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
-assert vp8DecoderSupport -> vp8Support;
-assert vp8EncoderSupport -> vp8Support;
-assert vp9DecoderSupport -> vp9Support;
-assert vp9EncoderSupport -> vp9Support;
-assert installLibsSupport -> libsSupport;
-# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
-assert installBinsSupport -> examplesSupport;
-assert vp9PostprocSupport -> (vp9Support && postprocSupport);
-assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
+let
+  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv.lib) enableFeature optional optionals;
+in
+
+assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+
+assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
+assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
 /* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
    Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
    but is only executed if spatialResamplingSupport is enabled */
 assert spatialResamplingSupport;
 assert postprocVisualizerSupport -> postprocSupport;
-assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
-assert unitTestsSupport -> ((curl != null) && (coreutils != null));
-assert vp9TemporalDenoisingSupport -> (vp9Support && temporalDenoisingSupport);
-assert vp9HighbitdepthSupport -> vp9Support;
-assert (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) -> experimentalSupport;
-assert stdenv.isCygwin -> (unitTestsSupport && webmIOSupport && libyuvSupport);
+assert unitTestsSupport -> curl != null && coreutils != null;
+assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
+assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libvpx-git";
+  name = "libvpx-git-${version}";
+  version = "2015-2-12";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/webm/libvpx";
   /* DO NOT under any circumstance ever just bump the git commit without
      confirming changes have not been made to the configure system */
-    rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; # 2015-2-12
+    rev = "f4c29ae9ea16c502c980a81ca9683327d5051929";
     sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x";
   };
 
-  patchPhase = ''
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [ perl yasm ];
-
-  buildInputs = [ ]
-    ++ optional unitTestsSupport coreutils
-    ++ optional unitTestsSupport curl;
+  patchPhase = ''patchShebangs .'';
 
   configureFlags = [
-    (mkFlag vp8Support "vp8")
-    (mkFlag vp8EncoderSupport "vp8-encoder")
-    (mkFlag vp8DecoderSupport "vp8-decoder")
-    (mkFlag vp9Support "vp9")
-    (mkFlag vp9EncoderSupport "vp9-encoder")
-    (mkFlag vp9DecoderSupport "vp9-decoder")
-    (mkFlag extraWarningsSupport "extra-warnings")
-    (mkFlag werrorSupport "werror")
+    (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
+    (enableFeature vp8EncoderSupport "vp8-encoder")
+    (enableFeature vp8DecoderSupport "vp8-decoder")
+    (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
+    (enableFeature vp9EncoderSupport "vp9-encoder")
+    (enableFeature vp9DecoderSupport "vp9-decoder")
+    (enableFeature extraWarningsSupport "extra-warnings")
+    (enableFeature werrorSupport "werror")
     "--disable-install-docs"
-    (mkFlag installBinsSupport "install-bins")
-    (mkFlag installLibsSupport "install-libs")
-    (mkFlag installSrcsSupport "install-srcs")
-    (mkFlag debugSupport "debug")
-    (mkFlag gprofSupport "gprof")
-    (mkFlag gcovSupport "gcov")
+    (enableFeature examplesSupport "install-bins")
+    "--enable-install-libs"
+    "--disable-install-srcs"
+    (enableFeature debugSupport "debug")
+    (enableFeature gprofSupport "gprof")
+    (enableFeature gcovSupport "gcov")
     # Required to build shared libraries
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
-    (mkFlag (stdenv.isi686 || stdenv.isx86_64) "use-x86inc")
-    (mkFlag optimizationsSupport "optimizations")
-    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
-    (mkFlag thumbSupport "thumb")
-    (mkFlag libsSupport "libs")
-    (mkFlag examplesSupport "examples")
+    (enableFeature (!isCygwin) "pic")
+    (enableFeature (isi686 || isx86_64) "use-x86inc")
+    (enableFeature optimizationsSupport "optimizations")
+    (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
+    (enableFeature thumbSupport "thumb")
+    "--enable-libs"
+    (enableFeature examplesSupport "examples")
     "--disable-docs"
     "--as=yasm"
     # Limit default decoder max to WHXGA
-    (if sizeLimitSupport then "--size-limit=5120x3200" else "")
-    (mkFlag fastUnalignedSupport "fast-unaligned")
-    (mkFlag codecSrcsSupport "codec-srcs")
-    (mkFlag debugLibsSupport "debug-libs")
-    (mkFlag stdenv.isMips "dequant-tokens")
-    (mkFlag stdenv.isMips "dc-recon")
-    (mkFlag postprocSupport "postproc")
-    (mkFlag vp9PostprocSupport "vp9-postproc")
-    (mkFlag multithreadSupport "multithread")
-    (mkFlag internalStatsSupport "internal-stats")
-    (mkFlag memTrackerSupport "mem-tracker")
-    (mkFlag spatialResamplingSupport "spatial-resampling")
-    (mkFlag realtimeOnlySupport "realtime-only")
-    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
-    (mkFlag errorConcealmentSupport "error-concealment")
+    (if sizeLimitSupport then "--size-limit=5120x3200" else null)
+    (enableFeature fastUnalignedSupport "fast-unaligned")
+    "--disable-codec-srcs"
+    (enableFeature debugLibsSupport "debug-libs")
+    (enableFeature isMips "dequant-tokens")
+    (enableFeature isMips "dc-recon")
+    (enableFeature postprocSupport "postproc")
+    (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
+    (enableFeature multithreadSupport "multithread")
+    (enableFeature internalStatsSupport "internal-stats")
+    (enableFeature memTrackerSupport "mem-tracker")
+    (enableFeature spatialResamplingSupport "spatial-resampling")
+    (enableFeature realtimeOnlySupport "realtime-only")
+    (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
+    (enableFeature errorConcealmentSupport "error-concealment")
     # Shared libraries are only supported on ELF platforms
-    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
-    (mkFlag smallSupport "small")
-    (mkFlag postprocVisualizerSupport "postproc-visualizer")
-    (mkFlag unitTestsSupport "unit-tests")
-    (mkFlag webmIOSupport "webm-io")
-    (mkFlag libyuvSupport "libyuv")
-    (mkFlag decodePerfTestsSupport "decode-perf-tests")
-    (mkFlag encodePerfTestsSupport "encode-perf-tests")
-    (mkFlag multiResEncodingSupport "multi-res-encoding")
-    (mkFlag temporalDenoisingSupport "temporal-denoising")
-    (mkFlag vp9TemporalDenoisingSupport "vp9-temporal-denoising")
-    (mkFlag coefficientRangeCheckingSupport "coefficient-range-checking")
-    (mkFlag (vp9HighbitdepthSupport && !stdenv.isi686) "vp9-highbitdepth")
-    (mkFlag experimentalSupport "experimental")
+    (if isDarwin || isCygwin then
+       "--enable-static --disable-shared"
+     else
+       "--disable-static --enable-shared")
+    (enableFeature smallSupport "small")
+    (enableFeature postprocVisualizerSupport "postproc-visualizer")
+    (enableFeature unitTestsSupport "unit-tests")
+    (enableFeature webmIOSupport "webm-io")
+    (enableFeature libyuvSupport "libyuv")
+    (enableFeature decodePerfTestsSupport "decode-perf-tests")
+    (enableFeature encodePerfTestsSupport "encode-perf-tests")
+    (enableFeature multiResEncodingSupport "multi-res-encoding")
+    (enableFeature temporalDenoisingSupport "temporal-denoising")
+    (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
+    (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
+    (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
+    (enableFeature (experimentalSpatialSvcSupport ||
+                    experimentalFpMbStatsSupport ||
+                    experimentalEmulateHardwareSupport) "experimental")
     # Experimental features
-    (mkFlag experimentalSpatialSvcSupport "spatial-svc")
-    (mkFlag experimentalFpMbStatsSupport "fp-mb-stats")
-    (mkFlag experimentalEmulateHardwareSupport "emulate-hardware")
-  ];
+  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optionals unitTestsSupport [ coreutils curl ];
 
   enableParallelBuilding = true;
 
@@ -193,7 +175,7 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = http://www.webmproject.org/;
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index e5682219dba..8abacf6f1c8 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.4.2";
+  name = "libxkbcommon-0.4.3";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50";
+    sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6";
   };
 
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 153096ee45c..0d70a6502fe 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,49 +1,63 @@
-{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
+{ stdenv, fetchurl, findXMLCatalogs
 
-assert pythonSupport -> python != null;
+# Optional Dependencies
+, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null
+}:
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
 let
-  version = "2.9.2";
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optIcu = shouldUsePkg icu;
+  optPython = shouldUsePkg python;
+  optReadline = shouldUsePkg readline;
+  optZlib = shouldUsePkg zlib;
+  optXz = shouldUsePkg xz;
+
+  sitePackages = if optPython == null then null else
+    "\${out}/lib/${python.libPrefix}/site-packages";
 in
-
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libxml2-${version}";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
-  buildInputs = stdenv.lib.optional pythonSupport python
-    # Libxml2 has an optional dependency on liblzma.  However, on impure
-    # platforms, it may end up using that from /usr/lib, and thus lack a
-    # RUNPATH for that, leading to undefined references for its users.
-    ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
-
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+  buildInputs = [ optIcu optPython optReadline optZlib optXz ];
+  propagatedBuildInputs = [ findXMLCatalogs ];
 
-  passthru = { inherit pythonSupport version; };
+  configureFlags = [
+    (mkWith (optIcu != null)      "icu"                optIcu)
+    (mkWith (optPython != null)   "python"             optPython)
+    (mkWith (optPython != null)   "python-install-dir" sitePackages)
+    (mkWith (optReadline != null) "readline"           optReadline)
+    (mkWith (optZlib != null)     "zlib"               optZlib)
+    (mkWith (optXz != null)       "lzma"               optXz)
+  ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ eelco wkennington ];
   };
 
-} // stdenv.lib.optionalAttrs pythonSupport {
-  configureFlags = "--with-python=${python}";
-
-  # this is a pair of ugly hacks to make python stuff install into the right place
-  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"'';
-  installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"'';
-
-} // stdenv.lib.optionalAttrs (!pythonSupport) {
-  configureFlags = "--with-python=no"; # otherwise build impurity bites us
-})
-
+  passthru = {
+    inherit version;
+    pythonSupport = python != null;
+  };
+}
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 785ed0db7d7..81e836aa46d 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl
-, pkgconfig, libxml2, glibmm, perl }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
+
 stdenv.mkDerivation rec {
-  name = "libxml++-2.37.2";
+  name = "libxml++-2.38.0";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz";
-    sha256 = "0fvpm95iapi5qrz6sil6vnqqdrsd7f9a16c415hzr44f2ji10gmv";
+    url = "mirror://gnome/sources/libxml++/2.38/${name}.tar.xz";
+    sha256 = "0ihk7fprpshs0gp38x2m5jhvrph3iwr0wy1h1qqvh3rjblzv162n";
   };
 
-  buildInputs = [ pkgconfig glibmm perl ];
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  buildInputs = [ glibmm ];
 
   propagatedBuildInputs = [ libxml2 ];
 
   configureFlags = "--disable-documentation"; #doesn't build without this for some reason
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libxmlplusplus.sourceforge.net/;
     description = "C++ wrapper for the libxml2 XML parser library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.phreedom ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ phreedom wkennington ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 7b4d3d6287a..4bc9e8ed1c4 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.2.7";
+  name = "libxmp-4.3.8";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536";
+    sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny";
   };
 }
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 2fdeee7b5dc..11b77ae0815 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }:
 
-let version = "0.4.30"; in
+let version = "0.4.31"; in
 
 stdenv.mkDerivation {
   name = "libzen-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64";
+    sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig ];
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index d84e0219294..9654dea3725 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -18,12 +18,18 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-driver=devinput"
-    "--sysconfdir=$(out)/etc"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--enable-sandboxed"
   ];
 
   makeFlags = [ "m4dir=$(out)/m4" ];
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
   meta = with stdenv.lib; {
     description = "Allows to receive and send infrared signals";
     homepage = http://www.lirc.org/;
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index edb914123e1..e03535ba979 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/luabind/luabind;
-    description = "Luabind is a library that helps you create bindings between C++ and Lua.";
+    description = "A library that helps you create bindings between C++ and Lua";
     license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index a2891f9207d..8cf0744a0d1 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "mailcore2-${version}";
 
-  version = "0.5";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner  = "MailCore";
     repo   = "mailcore2";
     rev    = version;
-    sha256 = "1f2kpw8ha4j43jlimw0my9b7x1gbik7yyg1m87q6nhbbsci78qly";
+    sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1fe3bef6481..0b602c687bf 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 with { inherit (stdenv.lib) optional optionalString; };
 
 let
-  version = "10.5.3";
+  version = "10.5.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "18ibj4c8zmg738md8phmq3va40ycsjdilg76ylw35h7mwhdyw0c7";
+    sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
   };
 
   prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index a6aae14e5c3..6d5e36d726c 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn";
+    sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z";
   };
 })
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 76629c80b96..6044f978402 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cryptographic library";
 
     longDescription = ''
@@ -48,12 +48,12 @@ stdenv.mkDerivation (rec {
         I/O.
      '';
 
-     license = stdenv.lib.licenses.gpl2Plus;
+     license = licenses.gpl2Plus;
 
      homepage = http://www.lysator.liu.se/~nisse/nettle/;
 
-     maintainers = [ ];
-     platforms = stdenv.lib.platforms.all;
+     maintainers = with maintainers; [ wkennington ];
+     platforms = platforms.all;
   };
 }
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d86a55b78bd..d91a905f7ba 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.18";
+  version = "3.18.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz";
-    sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz";
+    sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 4eab7a683af..a81d95e6b98 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "nss_wrapper-1.0.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/nss_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 14d88e381b3..7fe57af5710 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
     ;
   meta = {
-    homePage = http://www.open-mpi.org/;
+    homepage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";
     longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
     maintainers = [ stdenv.lib.maintainers.mornfall ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 0ecbc109d39..eefed304134 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,22 +1,27 @@
 { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.20.2";
+  name = "p11-kit-0.23.1";
 
   src = fetchurl {
     url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84";
+    sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
   };
 
-  postInstall = "rm -frv $out/share/gtk-doc";
+  buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
 
-  configureFlags = "--without-libtasn1";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--without-trust-paths"
+  ];
 
-  buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
+  installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://p11-glue.freedesktop.org/;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ urkud wkennington ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
new file mode 100644
index 00000000000..4b8cedd90c7
--- /dev/null
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchzip }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "0.94";
+  name = "pcg-c-${version}";
+
+  src = fetchzip {
+    url = "http://www.pcg-random.org/downloads/${name}.zip";
+    sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
+  };
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./prefix-variable.patch
+    ];
+
+  preInstall = ''
+    sed -i s,/usr/local,$out, Makefile
+    mkdir -p $out/lib $out/include
+  '';
+
+  meta = {
+    description = "A family of better random number generators";
+    homepage = "http://www.pcg-random.org/";
+    license = stdenv.lib.licenses.asl20;
+    longDescription = ''
+      PCG is a family of simple fast space-efficient statistically good
+      algorithms for random number generation. Unlike many general-purpose RNGs,
+      they are also hard to predict.
+    '';
+    platforms = platforms.unix;
+    maintainers = [ maintainers.linus ];
+    repositories.git = git://github.com/imneme/pcg-c.git;
+  };
+}
diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/development/libraries/pcg-c/prefix-variable.patch
new file mode 100644
index 00000000000..bfdcdfa7b17
--- /dev/null
+++ b/pkgs/development/libraries/pcg-c/prefix-variable.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index dddea44..fdb9401 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,8 @@ all:
+ PREFIX = /usr/local
+ 
+ install: all
+-	install src/libpcg_random.a $PREFIX/lib
+-	install -m 0644 include/pcg_variants.h $PREFIX/include
++	install src/libpcg_random.a ${PREFIX}/lib
++	install -m 0644 include/pcg_variants.h ${PREFIX}/include
+ 
+ test:   all
+ 	cd test-low; $(MAKE) test
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 9c7659efcec..a1be2afcd6c 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "This project is a QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
-    licenses = with stdenv.lib.licenses; [ gpl2 ];
+    license = with stdenv.lib.licenses; [ gpl2 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 63ba58f2343..e9d506f58fe 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://qpdf.sourceforge.net/; 
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
-    licenses = licenses.artistic2;
+    license = licenses.artistic2;
     maintainers = maintainers.abbradar;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 8c91db74f95..8c7301e3c40 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.8.4";
+  version = "2.9";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
-    sha256 = "03z8mc7wpk0hyza9b45pyf523gdk0qsqaywkprmp6ffc81s2sywv";
+    sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
   };
 
   buildInputs = [ qt ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 06ff3fe66d4..a65cbeed3fd 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -180,6 +180,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license     = licenses.lgpl21Plus; # or gpl3
     maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
new file mode 100644
index 00000000000..63066658f0f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
@@ -0,0 +1,42 @@
+diff --git a/qsettings.cpp b/qsettings.cpp
+index 35b3ed4..210dfeb 100644
+--- a/qsettings.cpp
++++ b/qtbase/src/corelib/io/qsettings.cpp
+@@ -1174,6 +1174,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
+     if (!application.isEmpty())
+         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
++
++#if !defined(Q_OS_WIN)
++    // Add directories specified in $XDG_CONFIG_DIRS
++    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
++    if (!pathEnv.isEmpty()) {
++        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
++        if (!pathEntries.isEmpty()) {
++            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
++            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
++                const QString& path = pathEntries.at(k);
++                if (!application.isEmpty())
++                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
++                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
++            }
++        }
++    }
++#endif
++
+ #else
+     QString confName = getPath(format, QSettings::UserScope) + org;
+     if (!application.isEmpty())
+diff --git a/qsettings_p.h b/qsettings_p.h
+index a28b583..b2a240d 100644
+--- a/qsettings_p.h
++++ b/qtbase/src/corelib/io/qsettings_p.h
+@@ -244,7 +244,7 @@ public:
+         F_Organization = 0x1,
+         F_User = 0x0,
+         F_System = 0x2,
+-        NumConfFiles = 4
++        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
+ #else
+         SandboxConfFile = 0,
+         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index bc342f605bc..746889f279d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; })
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
+      ./0013-xdg_config_dirs.patch
     ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index 71ec5e77a73..0cb62914b7f 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, qt4, libX11, coreutils, bluez, perl }:
+{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
 # possible additional dependencies: pulseaudio udev networkmanager immerson qmf
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
   name = "qt-mobility-${version}";
-  download = "qt-mobility-opensource-src-${version}";
-  src = fetchurl {
-    url =  "http://get.qt.nokia.com/qt/add-ons/${download}.tar.gz";
-    sha256 = "ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44";
+  src = fetchFromGitHub {
+    owner = "qtproject";
+    repo = "qt-mobility";
+    rev = "v${version}";
+    sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i";
   };
 
   NIX_CFLAGS_COMPILE="-fpermissive";
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do
       substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/"
+    done
   '';
 
   # Features files (*.prf) are not installed on nixos
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
new file mode 100644
index 00000000000..98619854c1e
--- /dev/null
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, which, coreutils, fetchzip, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qxt-${version}";
+  version = "0.6.2";
+  
+  src = fetchzip {
+    url = "http://dev.libqxt.org/libqxt/get/v${version}.tar.gz";
+    sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";
+  };
+
+  buildInputs = [ qt4 which ];
+
+  patchPhase = ''
+    patchShebangs configure
+    substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
+  '';
+
+  prefixKey = "-prefix ";
+
+  meta = {
+    homepage = http://libqxt.org;
+    description = "An extension library for Qt";
+    longDescription = ''
+      An extension library for Qt providing a suite of cross-platform utility
+      classes to add functionality not readily available in the Qt toolkit by Qt
+      Development Frameworks, Nokia.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ forkk ];
+  };
+}
diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix
new file mode 100644
index 00000000000..84a7a9b4ccf
--- /dev/null
+++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, openssl, popt, xmlto }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  name = "rabbitmq-c-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93";
+  };
+
+  buildInputs = [ cmake openssl popt xmlto ];
+
+  meta = {
+    description = "RabbitMQ C AMQP client library";
+    homepage = https://github.com/alanxz/rabbitmq-c;
+    license = with stdenv.lib.licenses; mit;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 3ca7cab6c38..f5e7f23c108 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source library to extract valid data from within an Open Street Map input file";
     homepage = https://www.gaia-gis.it/fossil/readosm;
-    license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ];
-    licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
   };
 }
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 070baf7ae79..888a81a390e 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "rep-gtk-git-2015-02-15";
+  name = "rep-gtk-${version}";
+  version = "0.90.8.2";
 
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/rep-gtk.git";
-    rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d";
-    sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz";
+    sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r";
   };
 
   buildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
new file mode 100644
index 00000000000..88d94ec0f2c
--- /dev/null
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub
+
+# Optional Arguments
+, snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
+, numactl ? null
+
+# Malloc implementation
+, jemalloc ? null, gperftools ? null
+}:
+
+let
+  malloc = if jemalloc != null then jemalloc else gperftools;
+in
+stdenv.mkDerivation rec {
+  name = "rocksdb-${version}";
+  version = "3.10";
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "rocksdb";
+    rev = "v${version}";
+    sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0";
+  };
+
+  buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];
+
+  postPatch = ''
+    # Hack to fix typos
+    sed -i 's,#inlcude,#include,g' build_tools/build_detect_platform
+  '';
+
+  # Environment vars used for building certain configurations
+  PORTABLE = "1";
+  USE_SSE = "1";
+  JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
+
+  buildFlags = [
+    "static_lib"
+    "shared_lib"
+  ];
+
+  installFlags = [
+    "INSTALL_PATH=\${out}"
+  ];
+
+  postInstall = ''
+    # Might eventually remove this when we are confident in the build process
+    echo "BUILD CONFIGURATION FOR SANITY CHECKING"
+    cat make_config.mk
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://rocksdb.org;
+    description = "A library that provides an embeddable, persistent key-value store for fast storage";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 06411c1f22a..0dc9c1afd2b 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, libsndfile, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.1";
+  name = "sbc-1.3";
 
   src = fetchurl {
     url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
+    sha256 = "02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476";
   };
 
-  buildInputs = [ pkgconfig libsndfile ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsndfile ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SubBand Codec Library";
-
     homepage = http://www.bluez.org/;
-
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 296c5f6b920..01bb3371f5e 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
-      problems.
+      problems
     '';
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 8dc2b542be7..e779957a6fb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,47 +1,45 @@
 { stdenv, fetchurl, gfortran, perl, liblapack, config }:
 
-# Minimum CPU requirements:
-# x86: Pentium 4 (Prescott, circa 2004)
-# x86_64: Opteron (circa 2003)
-# These are the settings used for the generic builds. Performance will
-# be poor on modern systems. The goal of the Hydra builds is simply to
-# support as many systems as possible. OpenBLAS may support older
-# CPU architectures, but you will need to set 'config.openblas.target'
-# and 'config.openblas.preferLocalBuild', which will build it on your
-# local machine.
+with stdenv.lib;
 
 let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
+    binary =
+      {
+        i686-linux = "32";
+        x86_64-linux = "64";
+      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    genericFlags =
+      [
+        "DYNAMIC_ARCH=1"
+        "NUM_THREADS=64"
+        "BINARY=${binary}"
+      ];
+    localFlags = config.openblas.flags or
+      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
 in
 stdenv.mkDerivation rec {
-  version = "0.2.13";
+  version = "0.2.14";
 
   name = "openblas-${version}";
   src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "1asg5mix13ipxgj5h2yj2p0r8km1di5jbcjkn5gmhb37nx7qfv6k";
+    sha256 = "0av3pd96j8rx5i65f652xv9wqfkaqn0w4ma1gvbyz73i6j2hi9db";
     name = "openblas-${version}.tar.gz";
   };
 
   preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
 
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "PRESCOTT" else
-    if cpu == "x86_64" then "OPTERON" else
-     # allow autodetect
-      "";
-
-  makeFlags = [
-    "${if target != "" then "TARGET=" else ""}${target}"
-    "FC=gfortran"
-    "CC=gcc"
-    ''PREFIX="''$(out)"''
-    "INTERFACE64=1"
-  ];
+  nativeBuildInputs = [gfortran perl];
+
+  makeFlags =
+    (if local then localFlags else genericFlags)
+    ++
+    [
+      "FC=gfortran"
+      "CC=gcc"
+      ''PREFIX="''$(out)"''
+      "INTERFACE64=1"
+    ];
 
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 844505cb359..7d4ce161620 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchgit, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile
-, glew, libXrandr, libXrender
+{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, libsndfile
+, glew, libXrandr, libXrender, udev
 }:
 stdenv.mkDerivation rec {
-  name = "sfml-git-20110428";
-  src = fetchgit {
-    url = "http://github.com/LaurentGomila/SFML.git";
-    rev = "6eac4256f3be353f51ee";
-    sha256 = "1b4f1901e0e482dbc0ad60e2821af766fb8ce093de51d678918ac2a0fb6e8587";
+  name = "sfml-2.2";
+  src = fetchurl {
+    url = "https://github.com/LaurentGomila/SFML/archive/2.2.tar.gz";
+    sha256 = "1xbpzkqwgbsjdda7n3c2z5m16bhppz1z9rbhmhb8r1im7s95hd2l";
   };
-  buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
-                  libXrandr libXrender
+  buildInputs = [ cmake libX11 freetype libjpeg openal libsndfile glew
+                  libXrandr libXrender udev
                 ];
-  patchPhase = "
-    substituteInPlace CMakeLists.txt --replace '\${CMAKE_ROOT}/Modules' 'share/cmake-2.8/Modules'
-  ";
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
     description = "Simple and fast multimedia library";
     longDescription = ''
-      SFML provides a simple interface to the various components of your PC, to
-      ease the development of games and multimedia applications. It is composed
-      of five modules: system, window, graphics, audio and network.
+      SFML is a simple, fast, cross-platform and object-oriented multimedia API.
+      It provides access to windowing, graphics, audio and network.
+      It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
     '';
     license = licenses.zlib;
     maintainers = [ maintainers.astsmtl ];
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 4804adc82e9..8ddd6114efd 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "socket_wrapper-1.1.3";
 
-  src = fetchgit {
-    url = "git://git.samba.org/socket_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix
index 9ac8a7d56f4..94c3687e2d4 100644
--- a/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/pkgs/development/libraries/spatialite-tools/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A complete sqlite3-compatible CLI front-end for libspatialite";
     homepage = https://www.gaia-gis.it/fossil/spatialite-tools;
-    licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
   };
 }
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 6aceef78eea..8e3cf899e40 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,19 +1,34 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
 
 stdenv.mkDerivation rec {
-  name = "speex-1.2rc1";
+  name = "speex-1.2rc2";
 
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-    sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
+    sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
   };
 
-  buildInputs = [ libogg ];
+  postPatch = ''
+    sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac
+  '';
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
-  meta = {
-    homepage = http://www.speex.org/;
-    description = "A audio compression codec designed for speech";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fftw speexdsp ];
+
+  # TODO: Remove this will help with immediate backward compatability
+  propagatedBuildInputs = [ speexdsp ];
+
+  configureFlags = [
+    "--with-fft=gpl-fftw3"
+  ];
+
+  meta = with stdenv.lib; {
+    hompage = http://www.speex.org/;
+    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/speexdsp/build-fix.patch b/pkgs/development/libraries/speexdsp/build-fix.patch
new file mode 100644
index 00000000000..13cd5e7d21a
--- /dev/null
+++ b/pkgs/development/libraries/speexdsp/build-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/libspeexdsp/Makefile.am b/libspeexdsp/Makefile.am
+index d0499b9..42e8d50 100644
+--- a/libspeexdsp/Makefile.am
++++ b/libspeexdsp/Makefile.am
+@@ -29,7 +29,7 @@ noinst_HEADERS = 	arch.h 	bfin.h \
+ 	pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h
+ 
+ libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@
+-libspeexdsp_la_LIBADD = $(LIBM)
++libspeexdsp_la_LIBADD = @FFT_LIBS@ $(LIBM)
+ 
+ if BUILD_EXAMPLES
+ noinst_PROGRAMS = testdenoise testecho testjitter testresample
+diff --git a/speexdsp.pc.in b/speexdsp.pc.in
+index 6c6d26f..d40d856 100644
+--- a/speexdsp.pc.in
++++ b/speexdsp.pc.in
+@@ -11,5 +11,5 @@ Version: @PACKAGE_VERSION@
+ Requires: @FFT_PKGCONFIG@
+ Conflicts:
+ Libs: -L${libdir} -lspeexdsp
+-Libs.private: @LIBM@
++Libs.private: @FFT_LIBS@ @LIBM@
+ Cflags: -I${includedir}
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
new file mode 100644
index 00000000000..1a9a6d486f3
--- /dev/null
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }:
+
+stdenv.mkDerivation rec {
+  name = "speexdsp-1.2rc3";
+  
+  src = fetchurl {
+    url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
+    sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja";
+  };
+
+  patches = [ ./build-fix.patch ];
+  
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fftw ];
+
+  configureFlags = [
+    "--with-fft=gpl-fftw3"
+  ];
+
+  meta = with stdenv.lib; {
+    hompage = http://www.speex.org/;
+    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 98a71993253..d161fab31b6 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.8.8.3";
+  name = "sqlite-3.8.9";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz";
-    sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz";
+    sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index b387c59efa1..23590f17ca8 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/stxxl/stxxl;
-    description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations.";
+    description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     license = stdenv.lib.licenses.boost;
   };
 }
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index db863d951a6..baa7e288178 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "an event system based on the talloc memory management library.";
+    description = "An event system based on the talloc memory management library";
     homepage = http://tevent.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index e44514d5abf..5f07befcfa5 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
 
 stdenv.mkDerivation {
-  name = "tk-8.6.4";
+  name = "tk-${tcl.version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz";
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
     sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
   };
 
@@ -25,8 +25,10 @@ stdenv.mkDerivation {
 
   inherit tcl;
 
-  passthru = {
-    libPrefix = "tk8.6";
+  passthru = rec {
+    inherit (tcl) release version;
+    libPrefix = "tk${tcl.release}";
+    libdir = "lib/${libPrefix}";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 6d6aaed79a0..2dfe41869a2 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "uid_wrapper-1.1.0";
 
-  src = fetchgit {
-    url = "git://git.samba.org/uid_wrapper.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/webkitgtk/2.4.6.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index b4645f50818..5c868838c99 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.6.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
+{ stdenv, fetchurl, autoreconfHook, perl, python, ruby, bison, gperf, flex
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.4.6";
+  version = "2.4.8";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
+    sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8";
   };
 
-  patches = [ ./webcore-svg-libxml-cflags.patch ];
+  patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ];
 
   CC = "cc";
 
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     patchShebangs Tools/gtk
   '';
 
+  # patch *.in between autoreconf and configure
+  postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
+
   configureFlags = with stdenv.lib; [
     "--disable-geolocation"
     (optionalString enableIntrospection "--enable-introspection")
@@ -43,7 +46,7 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   nativeBuildInputs = [
-    perl python ruby bison gperf flex
+    autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex
     pkgconfig which gettext gobjectIntrospection
   ];
 
@@ -58,5 +61,8 @@ stdenv.mkDerivation rec {
     (if withGtk2 then gtk2 else gtk3)
   ];
 
-  #enableParallelBuilding = true; # build problems on Hydra
+  # Probably OK now, see:
+  # https://bugs.webkit.org/show_bug.cgi?id=79498
+  enableParallelBuilding = true;
 }
+
diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch
new file mode 100644
index 00000000000..8d8c1bae0be
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/bug140241.patch
@@ -0,0 +1,59 @@
+@@ -, +, @@ 
+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=140241
+        Reviewed by NOBODY (OOPS!).
+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
+        just when WebKit2 is enabled and we are not building for X11.
+        * GNUmakefile.list.am:
+---
+ Source/WebCore/ChangeLog           | 12 ++++++++++++
+ Source/WebCore/GNUmakefile.list.am |  8 ++++++++
+ 2 files changed, 20 insertions(+)
+--- a/Source/WebCore/ChangeLog	
++++ a/Source/WebCore/ChangeLog	
+@@ -1,3 +1,15 @@ 
++2015-01-16  Tomas Popela  <tpopela@redhat.com>
++
++        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
++        https://bugs.webkit.org/show_bug.cgi?id=140241
++
++        Reviewed by NOBODY (OOPS!).
++
++        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
++        just when WebKit2 is enabled and we are not building for X11.
++
++        * GNUmakefile.list.am:
++
+ 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+ 
+         Crash in WebCore::Node::getFlag
+--- a/Source/WebCore/GNUmakefile.list.am	
++++ a/Source/WebCore/GNUmakefile.list.am	
+@@ -6254,9 +6254,13 @@ endif # END USE_GLX
+ endif # END TARGET_X11
+ 
+ if TARGET_WAYLAND
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_WAYLAND
+ 
+ if TARGET_X11_OR_WAYLAND
+@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
+ endif # END TARGET_WIN32
+ 
+ if TARGET_QUARTZ
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index f67e3f2468b..54502610887 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.6.5";
+  version = "2.8.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "14vmqq6hr3jzphay49984kj22vlqhpsjmwh1krdm9k57rqbq0rdi";
+    sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
@@ -47,5 +47,5 @@ stdenv.mkDerivation rec {
     libsoup gtk3
   ];
 
-  # enableParallelBuilding = true; # build problems on Hydra
+  enableParallelBuilding = true; # build problems on Hydra
 }
diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
new file mode 100644
index 00000000000..1acfb87bfbc
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
@@ -0,0 +1,276 @@
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-04-13 18:39:20.763864030 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-04-13 18:43:29.756164227 +0200
+@@ -118,7 +118,7 @@
+     WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     GstBuffer* buffer = priv->buffer;
+     priv->buffer = 0;
+     priv->timeoutId = 0;
+@@ -140,7 +140,7 @@
+     WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->unlocked)
+         return GST_FLOW_OK;
+@@ -279,7 +279,7 @@
+ 
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->buffer) {
+         gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+     {
+-        GMutexLocker lock(priv->bufferMutex);
++        WebCore::GMutexLocker lock(priv->bufferMutex);
+         priv->unlocked = false;
+     }
+ 
+@@ -330,7 +330,7 @@
+ {
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     priv->unlocked = false;
+     return TRUE;
+ }
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-04-13 18:36:44.258046776 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-04-13 18:44:10.004374397 +0200
+@@ -316,7 +316,7 @@
+ #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+ PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
+ {
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return nullptr;
+ 
+@@ -366,7 +366,7 @@
+     g_return_if_fail(GST_IS_BUFFER(buffer));
+ 
+     {
+-        GMutexLocker lock(m_bufferMutex);
++        WebCore::GMutexLocker lock(m_bufferMutex);
+         gst_buffer_replace(&m_buffer, buffer);
+     }
+ 
+@@ -398,7 +398,7 @@
+     if (!m_player->visible())
+         return;
+ 
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return;
+ 
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-04-13 18:37:20.083233858 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-04-13 18:44:37.753519299 +0200
+@@ -346,7 +346,7 @@
+ 
+     switch (propID) {
+     case PROP_IRADIO_MODE: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         priv->iradioMode = g_value_get_boolean(value);
+         break;
+     }
+@@ -364,7 +364,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (propID) {
+     case PROP_IRADIO_MODE:
+         g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     bool seeking = priv->seekID;
+ 
+@@ -476,7 +476,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->startID = 0;
+     priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@
+         return ret;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_PAUSED:
+         GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@
+         gst_query_parse_duration(query, &format, NULL);
+ 
+         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
+             gst_query_set_duration(query, format, src->priv->size);
+             result = TRUE;
+@@ -612,7 +612,7 @@
+         break;
+     }
+     case GST_QUERY_URI: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         gst_query_set_uri(query, src->priv->uri);
+         result = TRUE;
+         break;
+@@ -653,7 +653,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+     gchar* ret;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     ret = g_strdup(src->priv->uri);
+     return ret;
+ }
+@@ -668,7 +668,7 @@
+         return FALSE;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     g_free(priv->uri);
+     priv->uri = 0;
+@@ -704,7 +704,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->needDataID)
+         return FALSE;
+@@ -725,7 +725,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->needDataID || !priv->paused) {
+         return;
+     }
+@@ -739,7 +739,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->enoughDataID)
+         return FALSE;
+@@ -760,7 +760,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have enough data");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->enoughDataID || priv->paused) {
+         return;
+     }
+@@ -774,7 +774,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->seekID)
+         return FALSE;
+@@ -792,7 +792,7 @@
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (offset == priv->offset && priv->requestedOffset == priv->offset)
+         return TRUE;
+ 
+@@ -811,7 +811,7 @@
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+     ASSERT(player);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     src->priv->player = player;
+ }
+ 
+@@ -841,7 +841,7 @@
+ 
+     mapGstBuffer(buffer);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     priv->buffer = adoptGRef(buffer);
+     locker.unlock();
+ 
+@@ -867,7 +867,7 @@
+         return;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->corsAccessCheck = corsAccessCheck;
+ 
+@@ -966,7 +966,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
+ 
+@@ -1035,7 +1035,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have EOS");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (!priv->seekID) {
+         locker.unlock();
+         gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Request was blocked");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
+@@ -1208,7 +1208,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Cannot show URL");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
new file mode 100644
index 00000000000..803c552b487
--- /dev/null
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "webrtc-audio-processing-0.1";
+
+  src = fetchurl {
+    url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz";
+    sha256 = "1p7yg8n39wwdfr52br2dq3bh8iypfx9md99mh1i9g2v8qbwm4jzd";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing;
+    description = "a more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 7c9829af771..395a4040153 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = http://wiredtiger.com/;
     description = "";
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = intersectLists platforms.unix platforms.x86_64;
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 30fbdcd1e8d..a2af56cbca6 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,7 +1,56 @@
-{ callPackage, ... } @ args:
+{ stdenv, fetchurl, cmake, yasm
+, debugSupport ? false # Run-time sanity checks (debugging)
+, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
+, werrorSupport ? false # Warnings as errors
+, ppaSupport ? false # PPA profiling instrumentation
+, vtuneSupport ? false # Vtune profiling instrumentation
+, custatsSupport ? false # Internal profiling of encoder work
+, cliSupport ? true # Build standalone CLI application
+, unittestsSupport ? false # Unit tests
+}:
 
-callPackage ./generic.nix (args // {
-  version = "1.5";
-  rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4";
-  sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7";
-})
\ No newline at end of file
+let
+  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+  inherit (stdenv) is64bit;
+in
+
+stdenv.mkDerivation rec {
+  name = "x265-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
+    sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w";
+  };
+
+  patchPhase = ''
+    sed -i 's/unknown/${version}/g' source/cmake/version.cmake
+  '';
+
+  cmakeFlags = [
+    (mkFlag debugSupport "CHECKED_BUILD")
+    "-DSTATIC_LINK_CRT=OFF"
+    (mkFlag (highbitdepthSupport && is64bit) "HIGH_BIT_DEPTH")
+    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
+    (mkFlag ppaSupport "ENABLE_PPA")
+    (mkFlag vtuneSupport "ENABLE_VTUNE")
+    (mkFlag custatsSupport "DETAILED_CU_STATS")
+    "-DENABLE_SHARED=ON"
+    (mkFlag cliSupport "ENABLE_CLI")
+    (mkFlag unittestsSupport "ENABLE_TESTS")
+  ];
+
+  preConfigure = ''
+    cd source
+  '';
+
+  nativeBuildInputs = [ cmake yasm ];
+
+  meta = with stdenv.lib; {
+    description = "Library for encoding h.265/HEVC video streams";
+    homepage    = http://x265.org;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/x265/generic.nix b/pkgs/development/libraries/x265/generic.nix
deleted file mode 100644
index 2779b581143..00000000000
--- a/pkgs/development/libraries/x265/generic.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchhg, cmake, yasm
-, rev , sha256, version
-, debugSupport ? false # Run-time sanity checks (debugging)
-, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
-, werrorSupport ? false # Warnings as errors
-, ppaSupport ? false # PPA profiling instrumentation
-, vtuneSupport ? false # Vtune profiling instrumentation
-, custatsSupport ? false # Internal profiling of encoder work
-, cliSupport ? true # Build standalone CLI application
-, unittestsSupport ? false # Unit tests
-, ...
-}:
-
-let
-  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
-in
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "x265-${version}";
-
-  src = fetchhg {
-    url = "https://bitbucket.org/multicoreware/x265/src";
-    inherit rev;
-    inherit sha256;
-  };
-
-  patchPhase = ''
-    sed -i 's/unknown/${version}/g' source/cmake/version.cmake
-  '';
-
-  cmakeFlags = with stdenv.lib; [
-    (mkFlag debugSupport "CHECKED_BUILD")
-    "-DSTATIC_LINK_CRT=OFF"
-    (mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH")
-    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-    (mkFlag ppaSupport "ENABLE_PPA")
-    "-DENABLE_SHARED=ON"
-    (mkFlag cliSupport "ENABLE_CLI")
-    (mkFlag unittestsSupport "ENABLE_TESTS")
-  ];
-
-  preConfigure = ''
-    cd source
-  '';
-
-  nativeBuildInputs = [ cmake yasm ];
-
-  meta = {
-    description = "Library for encoding h.265/HEVC video streams";
-    homepage    = http://x265.org;
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ codyopel ];
-    platforms   = platforms.all;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/x265/hg.nix b/pkgs/development/libraries/x265/hg.nix
deleted file mode 100644
index d26df82b3e3..00000000000
--- a/pkgs/development/libraries/x265/hg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2015-2-11"; # Date of commit used Y-M-D
-  rev = "9ab104096834f51bd799ea1cf1160092f8182944";
-  sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6";
-})
\ No newline at end of file
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index f3b91f442de..56bcba8297d 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, curl }:
+{ stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.25.30";
+  name = "xmlrpc-c-1.33.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
-    sha256 = "161gj237baagy5jaa08m54zfyvilb19gql0i5c9ysl3xqm7fvrla";
+    sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah";
   };
 
-  buildInputs = [ curl ];
+  buildInputs = [ curl libxml2 ];
+
+  configureFlags = [
+    "--enable-libxml2-backend"
+  ];
 
   # Build and install the "xmlrpc" tool (like the Debian package)
   postInstall = ''
diff --git a/pkgs/development/libraries/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/zita-alsa-pcmi/default.nix
new file mode 100644
index 00000000000..2f5b9183f66
--- /dev/null
+++ b/pkgs/development/libraries/zita-alsa-pcmi/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl , alsaLib, }:
+
+stdenv.mkDerivation rec {
+  name = "zita-alsa-pcmi-${version}";
+  version = "0.2.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9";
+  };
+
+  buildInputs = [ alsaLib ];
+
+  buildPhase = ''
+    cd libs
+    make PREFIX="$out"
+
+    # create lib link for building apps
+    ln -s libzita-alsa-pcmi.so.$version libzita-alsa-pcmi.so
+
+    # apps
+    cd ../apps
+    CXXFLAGS+=" -I../libs" \
+    LDFLAGS+=" -L../libs" \
+    make PREFIX="$out"
+  '';
+
+  installPhase = ''
+    mkdir "$out"
+    mkdir "$out/lib"
+    mkdir "$out/include"
+    mkdir "$out/bin"
+
+    cd ../libs
+
+    # libs
+    install -Dm755 libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so.$version"
+
+    # link
+    ln -s libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so"
+    ln -s libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so.0"
+
+    # header
+    install -Dm644 zita-alsa-pcmi.h \
+      "$out/include/zita-alsa-pcmi.h"
+
+    # apps
+    install -Dm755 ../apps/alsa_delay \
+      "$out/bin/alsa_delay"
+    install -Dm755 ../apps/alsa_loopback \
+      "$out/bin/alsa_delay"
+  '';
+
+  meta = {
+    description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 706c74b6ce6..e19d8cdfcb2 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation (rec {
   meta = with stdenv.lib; {
     description = "Lossless data-compression library";
     license = licenses.zlib;
+    platforms = platforms.all;
   };
 } // (if stdenv.isDarwin then {
   postInstall = ''
author	Vladimír Čunát <vcunat@gmail.com>	2015-05-05 11:49:03 +0200
committer	Vladimír Čunát <vcunat@gmail.com>	2015-05-05 11:49:03 +0200
commit	375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch)
tree	6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/development/libraries
parent	2f75c6845981b38a698cf1a9f620145877c80956 (diff)
parent	7f9ccc628403ed88844a4436da3b2944be5560a4 (diff)
download	nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip