Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

2266 files changed, 23123 insertions, 34006 deletions

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 505aab78242..a903d5e4678 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.5";
+  version = "4.6.1";
 
   name = "cgal-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/34139/CGAL-${version}.tar.xz";
-    sha256 = "00shds5yph4s09lqdrb6n60wnw9kpiwa25ghg9mbsgq3fnr8p7kr";
+    url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
+    sha256 = "05vk4l62d7g6cz19q36h1an5krxdbgq1fbs5hi0x2l7blsja1z6g";
   };
 
+  # note: optional component libCGAL_ImageIO would need zlib and opengl;
+  #   there are also libCGAL_Qt{3,4} omitted ATM
   buildInputs = [ cmake boost gmp mpfr ];
 
   doCheck = false;
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
new file mode 100644
index 00000000000..e819078f786
--- /dev/null
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "CoinMP-${version}";
+  version = "1.7.6";
+
+  src = fetchurl {
+    url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+    sha256 = "0gqi2vqkg35gazzzv8asnhihchnbjcd6bzjfzqhmj7wy1dw9iiw6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://projects.coin-or.org/CoinMP/;
+    description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL";
+    platforms = platforms.linux;
+    license = licenses.epl10;
+  };
+}
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 1e32a598506..ac895b5113e 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig, audiofile, libcap
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
-, x11Support ? true, x11 ? null, libXrandr ? null
-, pulseaudioSupport ? true, pulseaudio ? null
+, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
+, pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
@@ -10,10 +10,13 @@
 assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
 
 assert openglSupport -> (mesa != null && x11Support);
-assert x11Support -> (x11 != null && libXrandr != null);
+assert x11Support -> (xlibsWrapper != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
-assert pulseaudioSupport -> pulseaudio != null;
+assert pulseaudioSupport -> libpulseaudio != null;
 
+let
+  inherit (stdenv.lib) optional optionals;
+in
 stdenv.mkDerivation rec {
   version = "1.2.15";
   name    = "SDL-${version}";
@@ -23,19 +26,21 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
+  outputs = [ "out" "man" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedNativeBuildInputs =
-    stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
-    stdenv.lib.optional alsaSupport alsaLib ++
-    stdenv.lib.optional pulseaudioSupport pulseaudio;
+  propagatedBuildInputs =
+    optionals x11Support [ xlibsWrapper libXrandr ] ++
+    optional alsaSupport alsaLib ++
+    optional stdenv.isLinux libcap ++
+    optional openglSupport mesa ++
+    optional pulseaudioSupport libpulseaudio;
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in [ libcap ]
-    ++ (stdenv.lib.optional notMingw audiofile);
-
-  nativeBuildInputs = [ pkgconfig ] ++
-    stdenv.lib.optional openglSupport [ mesa ];
+  in optional notMingw audiofile;
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 68f40cad259..7573d1e1cd2 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig, audiofile
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
-, x11Support ? true, x11 ? null, libXrandr ? null
-, pulseaudioSupport ? true, pulseaudio ? null
+, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
+, pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
@@ -10,15 +10,16 @@
 assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 
 assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
-assert x11Support -> (x11 != null && libXrandr != null);
+assert x11Support -> (xlibsWrapper != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
-assert pulseaudioSupport -> pulseaudio != null;
+assert pulseaudioSupport -> libpulseaudio != null;
 
 let
   configureFlagsFun = attrs: ''
         --disable-oss --disable-x11-shared
         --disable-pulseaudio-shared --disable-alsa-shared
         ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
+        ${if (!x11Support) then "--without-x" else ""}
       '';
 in
 stdenv.mkDerivation rec {
@@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
   };
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
-    stdenv.lib.optional pulseaudioSupport pulseaudio;
+  propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++
+    stdenv.lib.optional pulseaudioSupport libpulseaudio;
 
   buildInputs = [ pkgconfig audiofile ] ++
-    stdenv.lib.optional openglSupport [ mesa ] ++
+    stdenv.lib.optional openglSupport mesa ++
     stdenv.lib.optional alsaSupport alsaLib;
 
   # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index bc4b1a778fc..66913fc0159 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 73b5ba8d929..55b465226d8 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "SDL image library";
     homepage = "http://www.libsdl.org/projects/SDL_image/";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 3a7fa707284..7bff348b754 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 454c4e882f5..6084e7074fe 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
+{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
 
 stdenv.mkDerivation {
   name = "Xaw3d-1.5E";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
     md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
   };
   patches = [./config.patch ./laylex.patch];
-  buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];
-  propagatedBuildInputs = [x11 libXmu];
+  buildInputs = [imake gccmakedep libXpm libXp bison flex];
+  propagatedBuildInputs = [xlibsWrapper libXmu];
 
   meta = {
     description = "3D widget set based on the Athena Widget set";
diff --git a/pkgs/development/libraries/accelio/cflags.patch b/pkgs/development/libraries/accelio/cflags.patch
deleted file mode 100644
index a0904519122..00000000000
--- a/pkgs/development/libraries/accelio/cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
index b56f2d81389..a8fddad2d88 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -6,23 +6,27 @@
 
 stdenv.mkDerivation rec {
   name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "1.3";
+  version = "2015-08-30";
 
   src = fetchFromGitHub {
     owner = "accelio";
     repo = "accelio";
-    rev = "v${version}";
-    sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c";
+    rev = "3d1f2b2d311aa70de9856832fd02647266624e82";
+    sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
   };
 
-  patches = [ ./cflags.patch ];
+  patches = [ ./fix-printfs.patch ];
 
   postPatch = ''
     # Don't build broken examples
-    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
+    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
+
+    # Don't install ldconfig entries
+    sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am
+    sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
   '';
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch
new file mode 100644
index 00000000000..23b2f40e42f
--- /dev/null
+++ b/pkgs/development/libraries/accelio/fix-printfs.patch
@@ -0,0 +1,615 @@
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:59:13.258697472 -0400
+@@ -246,7 +246,7 @@ static void *worker_thread(void *data)
+ 		} else {
+ 			vmsg_sglist_set_nents(&msg->out, 0);
+ 		}
+-		msg->user_context = (void *)get_cycles();
++		msg->user_context = (void *)(intptr_t)get_cycles();
+ 		/* send first message */
+ 		if (xio_send_request(tdata->conn, msg) == -1) {
+ 			if (xio_errno() != EAGAIN)
+@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio
+ {
+ 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
+ 
+-	cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context);
++	cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context);
+ 
+ 	if (tdata->do_stat) {
+ 		if (rtt > tdata->stat.max_rtt)
+@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio
+ 	msg->in.header.iov_len = 0;
+ 	vmsg_sglist_set_nents(&msg->in, 0);
+ 
+-	msg->user_context = (void *)get_cycles();
++	msg->user_context = (void *)(intptr_t)get_cycles();
+ 	if (xio_send_request(tdata->conn, msg) == -1) {
+ 		if (xio_errno() != EAGAIN)
+ 			printf("**** [%p] Error - xio_send_request " \
+@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete
+ 		       sess_data.min_lat_us,
+ 		       sess_data.max_lat_us);
+ 		if (fd)
+-			fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n",
++			fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n",
+ 				data_len,
+ 				threads_iter,
+ 				sess_data.tps,
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:57:30.856215123 -0400
+@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb;
+ /* The format of the results */
+ #define RESULT_FMT		" #bytes     #threads   #TPS       BW average[MBps]   Latency average[usecs]   Latency low[usecs]   Latency peak[usecs]\n"
+ /* Result print format */
+-#define REPORT_FMT		" %-7lu     %-2d         %-9.2lu	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
++#define REPORT_FMT		" %-7" PRIu64 "     %-2d         %-9.2" PRIu64 "	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
+ 
+ 
+ struct perf_parameters {
+diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c
+--- accelio/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:42:19.983984370 -0400
+@@ -224,7 +224,7 @@ static void process_response(struct sess
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (rsp->request->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -236,7 +236,7 @@ static void process_response(struct sess
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%zd] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ 				       (rsp->request->sn + 1), i, sglist[i].iov_len, str);
+ 				str[len] = tmp;
+ 			}
+diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c
+--- accelio/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:43:07.353204184 -0400
+@@ -203,7 +203,7 @@ static void process_request(struct serve
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (req->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -215,7 +215,7 @@ static void process_request(struct serve
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%zd] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ 				       (req->sn + 1), i, sglist[i].iov_len, str);
+ 				str[len] = tmp;
+ 			}
+@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct server_data *sdata = (struct server_data *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c
+--- accelio/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:43:32.748322028 -0400
+@@ -87,7 +87,7 @@ static void process_response(struct sess
+ {
+ 	if (++session_data->cnt == PRINT_COUNTER) {
+ 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+-		printf("message: [%lu] - %s\n",
++		printf("message: [%" PRIu64 "] - %s\n",
+ 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+ 		session_data->cnt = 0;
+ 	}
+diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c
+--- accelio/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:43:50.556404665 -0400
+@@ -82,7 +82,7 @@ static void process_request(struct serve
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (req->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -94,7 +94,7 @@ static void process_request(struct serve
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%d] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%d] - %s\n",
+ 				       (req->sn + 1), i, len, str);
+ 				str[len] = tmp;
+ 			}
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:41:13.493675827 -0400
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <inttypes.h>
+ #include <sched.h>
++#include <inttypes.h>
+ 
+ #include "libxio.h"
+ 
+@@ -133,7 +134,7 @@ static void process_response(struct thre
+ {
+ 	if (++tdata->cnt == PRINT_COUNTER) {
+ 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+-		printf("thread [%d] - tid:%p  - message: [%lu] - %s\n",
++		printf("thread [%d] - tid:%p  - message: [%" PRIu64 "] - %s\n",
+ 		       tdata->affinity,
+ 		      (void *)pthread_self(),
+ 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:41:31.730760455 -0400
+@@ -104,7 +104,7 @@ static void process_request(struct threa
+ 			    struct xio_msg *req)
+ {
+ 	if (++tdata->cnt == PRINT_COUNTER) {
+-		printf("thread [%d] tid:%p - message: [%lu] - %s\n",
++		printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n",
+ 		       tdata->affinity,
+ 		       (void *)pthread_self(),
+ 		       (req->sn + 1), (char *)req->in.header.iov_base);
+diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c
+--- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 20:00:15.169989095 -0400
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct thread_data	*tdata		= conn_entry->tdata;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		DEBUG("**** [%p] message %lu failed. reason: %s\n",
++		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, req->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(req);
+-		DEBUG("**** [%p] message %lu failed. reason: %s\n",
++		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, req->request->sn, xio_strerror(error));
+ 	}
+ 	obj_pool_put(tdata->req_pool, req);
+diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c
+--- accelio/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:40:06.398364476 -0400
+@@ -43,6 +43,7 @@
+ #include <net/if.h>
+ #include <stdio.h>
+ #include <numa.h>
++#include <inttypes.h>
+ 
+ #define cpusmask_test_bit(nr, addr)	(*(addr) & (1ULL << (nr)))
+ #define cpusmask_set_bit(nr, addr)	(*(addr) |=  (1ULL << (nr)))
+@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
+ 		}
+ 		intf_cpusmask_str(cpusmask, cpusnum, cpus_str);
+ 
+-		printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n",
++		printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n",
+ 		       ifa->ifa_name, host, flags, numa_node, cpusmask,
+ 		       "cpus",  cpusnum, cpus_str);
+ 	}
+diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c
+--- accelio/src/tools/usr/xio_mem_usage.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_mem_usage.c	2015-09-03 19:38:57.596044838 -0400
+@@ -73,7 +73,7 @@
+ 	while (i++ < 48) { \
+ 		printf("."); \
+ 	} \
+-	printf(" %6lu\n", sizeof(type)); \
++	printf(" %zu\n", sizeof(type)); \
+ }
+ 
+ int main(int argc, char **argv)
+diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c
+--- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:56:25.521908028 -0400
+@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio
+ 	 * this flag must be on */
+ 	rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP;
+ 
+-	rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr;
++	rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr;
+ 	rdma_test_buf.length = rdma_reg_mem.length;
+ 	rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp);
+ 
+diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c
+--- accelio/tests/usr/hello_test/xio_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_client.c	2015-09-03 19:45:43.055926711 -0400
+@@ -181,13 +181,13 @@ static void process_response(struct test
+ 
+ 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB);
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw,
+ 		       test_params->stat.txlen, test_params->stat.rxlen);
+ 		get_time(timeb, 40);
+ 
+-		printf("**** [%s] - message [%zd] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s
+ 
+ 	switch (event_data->event) {
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("nsent:%lu, nrecv:%lu, " \
+-		       "delta:%lu\n",
++		printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \
++		       "delta:%" PRIu64 "\n",
+ 		       test_params->nsent, test_params->nrecv,
+ 		       test_params->nsent-test_params->nrecv);
+ 
+@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c
+--- accelio/tests/usr/hello_test/xio_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_server.c	2015-09-03 19:46:35.777171360 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+ 		if (event_data->reason != XIO_E_SESSION_REJECTED) {
+-			printf("last sent:%lu, last comp:%lu, " \
+-			       "delta:%lu\n",
++			printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \
++			       "delta:%" PRIu64 "\n",
+ 			       test_params->nsent,  test_params->ncomp,
+ 			       test_params->nsent-test_params->ncomp);
+ 			test_params->connection = NULL;
+@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:49:10.164887785 -0400
+@@ -114,7 +114,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == print_counter) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+ 
+-		printf("**** request [%lu] %s - %s\n",
++		printf("**** request [%" PRIu64 "] %s - %s\n",
+ 		       (req->sn+1),
+ 		       (char *)req->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -171,11 +171,11 @@ static void process_response(struct xio_
+ 		double txbw = (1.0*pps*txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - response [%lu] %s - %s\n",
++		printf("**** [%s] - response [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	switch (msg->type) {
+ 	case XIO_MSG_TYPE_REQ:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 		msg_pool_put(pool, msg);
+ 		switch (error) {
+@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi
+ 		};
+ 		break;
+ 	case XIO_MSG_TYPE_RSP:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 		/* message is no longer needed */
+ 		switch (error) {
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:49:52.860085909 -0400
+@@ -143,11 +143,11 @@ static void process_response(struct xio_
+ 		double txbw = (1.0*pps*txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - response complete [%lu] %s - %s\n",
++		printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -171,7 +171,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == print_counter) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+ 
+-		printf("**** request complete [%lu] %s - %s [%zd]\n",
++		printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n",
+ 		       (req->sn+1),
+ 		       (char *)req->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base,
+@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	switch (msg->type) {
+ 	case XIO_MSG_TYPE_REQ:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 		msg_pool_put(pool, msg);
+ 		switch (error) {
+@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi
+ 		};
+ 		break;
+ 	case XIO_MSG_TYPE_RSP:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 		/* message is no longer needed */
+ 		switch (error) {
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:50:51.111356220 -0400
+@@ -139,7 +139,7 @@ static void process_response(struct xio_
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 		double lat = (1000000.0/pps);
+ 
+-		printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, lat, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:51:16.803475442 -0400
+@@ -103,7 +103,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:47:39.218465755 -0400
+@@ -179,12 +179,12 @@ static void process_response(struct thre
+ 		double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \
+ 		       "RX: %zd B\n",
+ 		       pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen);
+ 		get_time(timeb, 40);
+-		printf("[%s] thread [%d] - tid:%p  - message [%lu] " \
++		printf("[%s] thread [%d] - tid:%p  - message [%" PRIu64 "] " \
+ 		       "%s - %s\n",
+ 		       timeb,
+ 		       tdata->affinity,
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:48:02.876575538 -0400
+@@ -171,7 +171,7 @@ static void process_request(struct threa
+ 	if (++tdata->stat.cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("thread [%d] - message [%lu] %s - %s\n",
++		printf("thread [%d] - message [%" PRIu64 "] %s - %s\n",
+ 		       tdata->affinity,
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct thread_data	*tdata = (struct thread_data *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(tdata->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:54:18.142316932 -0400
+@@ -150,11 +150,11 @@ static void process_rx_message(struct ow
+ 
+ 		double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "RX: %.2f MB/s, RX: %zd B\n",
+ 		       pps, rxbw, ow_params->rx_stat.xlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - message [%lu] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (msg->sn + 1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -202,11 +202,11 @@ static void process_tx_message(struct ow
+ 
+ 		double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s,length: TX: %zd B\n",
+ 		       pps, txbw, ow_params->tx_stat.xlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - message [%lu] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (msg->sn + 1),
+ 		       (char *)msg->out.header.iov_base,
+ 		       (char *)(onents > 0 ? osglist[0].iov_base : NULL));
+@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi
+ 	struct ow_test_params *ow_params =
+ 				(struct ow_test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:54:32.797384938 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi
+ 	struct ow_test_params *ow_params =
+ 				(struct ow_test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:52:24.905791466 -0400
+@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++)
+ 
+ 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, length: TX: %zd B\n",
+ 		       pps, txbw,
+ 		       test_params->stat.txlen);
+@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s
+ 		test_params->closed = 1;
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("nsent:%lu, ncomp:%lu, " \
+-		       "delta:%lu\n",
++		printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \
++		       "delta:%" PRIu64 "\n",
+ 		       test_params->nsent, test_params->ncomp,
+ 		       test_params->nsent-test_params->ncomp);
+ 
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:52:57.947944796 -0400
+@@ -110,7 +110,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s
+ 		xio_disconnect(event_data->conn);
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("last recv:%lu\n",
++		printf("last recv:%" PRIu64 "\n",
+ 		       test_params->nrecv);
+ 
+ 		xio_connection_destroy(event_data->conn);
+@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	return 0;
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
new file mode 100644
index 00000000000..315aab074e5
--- /dev/null
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }:
+
+let version = "1.13"; in
+stdenv.mkDerivation {
+  name = "accounts-qt-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
+    rev = version;
+    repo = "libaccounts-qt";
+    owner = "accounts-sso";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Qt library for accessing the online accounts database";
+    homepage = "http://code.google.com/p/accounts-sso/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ glib libaccounts-glib qtbase ];
+  nativeBuildInputs = [ doxygen pkgconfig ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
+  '';
+}
diff --git a/pkgs/development/libraries/accounts-qt/old.nix b/pkgs/development/libraries/accounts-qt/old.nix
new file mode 100644
index 00000000000..26a04362090
--- /dev/null
+++ b/pkgs/development/libraries/accounts-qt/old.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
+
+let version = "1.13"; in
+stdenv.mkDerivation {
+  name = "accounts-qt-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
+    rev = version;
+    repo = "libaccounts-qt";
+    owner = "accounts-sso";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Qt library for accessing the online accounts database";
+    homepage = "http://code.google.com/p/accounts-sso/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ glib libaccounts-glib qt5.base ];
+  nativeBuildInputs = [ doxygen pkgconfig ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
+  '';
+}
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index 2c76c2f4350..cda2cd9bb05 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -22,5 +22,7 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 8f3d298306b..2a75b1fb700 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -6,8 +6,8 @@ agda.mkDerivation (self: rec {
 
   src = fetchgit {
     url = "git://github.com/agda/agda-stdlib";
-    rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
-    sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
+    rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf";
+    sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
index 1a860496a4d..cce73904619 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -19,5 +19,6 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    broken = true; # doesn't work due to new agdastdlib, see #9471
   };
 })
diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index 72589ad1065..dd0df768a68 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -16,7 +16,7 @@ let
   sourceInfo = rec {
     baseName="allegro";
     folderSuffix = "-unstable";
-    version = "5.1.9";
+    version = "5.1.11";
     name="${baseName}-${version}";
     project="alleg";
     url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,7 +26,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "0jn1x2l1kz0vi2fvabpk5sbn1cx4k6hwncmf2j8wnrhk8pm5af5h";
+    sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
   };
 
   inherit (sourceInfo) name version;
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index c5514acd1d4..bfb72be24fe 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://ftp.penguin.cz/pub/users/utx/amr/amrnb-11.0.0.0.tar.bz2;
+    url = http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2;
     sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q";
   };
 
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 2b5da8de423..e1c729050d4 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://ftp.penguin.cz/pub/users/utx/amr/amrwb-7.0.0.3.tar.bz2;
+    url = http://www.penguin.cz/~utx/ftp/amr/amrwb-7.0.0.3.tar.bz2;
     sha256 = "0nn94i3gw3d5fgks43wdhshdlhpd4rcrzj46f2vsby0viwkxxp8z";
   };
 
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e504aab0848..a1d63274ddf 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
 , bdbSupport ? false, db
-, ldapSupport ? true, openldap
+, ldapSupport ? !stdenv.isCygwin, openldap
 , libiconv
 }:
 
@@ -9,9 +9,7 @@ assert sslSupport -> openssl != null;
 assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
-let
-  optional = stdenv.lib.optional;
-in
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "apr-util-1.5.4";
@@ -23,10 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
-    --with-crypto
+    ${optionalString (!stdenv.isCygwin) "--with-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
+    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
+      optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
   '';
 
   buildInputs = stdenv.lib.optional sslSupport openssl;
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 2bf39f0eb26..74994223e0f 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.5.1";
+  name = "apr-1.5.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
+    sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 226f792c45a..9d4761c3da8 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aqbanking-5.4.0beta";
+  name = "aqbanking-5.5.1";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=${name}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh";
+    sha256 = "1pxd5xv2xls1hyizr1vbknzgb66babhlp72777rcxq46gp91g3r3";
   };
 
   buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 229db910ffd..70447d9f885 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [ unzip cmake boost ];
 
   meta = with stdenv.lib; {
-    description = "Open Asset Import Library is a library to import various 3D model formats";
+    description = "A library to import various 3D model formats";
     homepage = http://assimp.sourceforge.net/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ emery ];
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index b562a2e5d3d..f5d806ff67a 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi
+{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
 , intltool, dbus_glib, at_spi2_core, libSM }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.12";
-  versionMinor = "1";
+  versionMajor = "2.18";
+  versionMinor = "0";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336";
+    sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa";
   };
 
-  buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
+  buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
                   intltool dbus_glib at_spi2_core libSM ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 7128e4d3f2b..b49d1ddb804 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -2,16 +2,18 @@
 , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.12";
+  versionMajor = "2.18";
   versionMinor = "0";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
+    sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib
     libX11 xextproto libSM libICE libXtst libXi
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 83f532ba15d..fbfb5765996 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.16";
+  ver_maj = "2.18";
   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 = "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9";
+    sha256 = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 7a5351da10e..472a2ad9807 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate
+{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
 , libsndfile, pkgconfig, python
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
+    alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python
   ];
 
   configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
new file mode 100644
index 00000000000..0b02774bc17
--- /dev/null
+++ b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord-svn, sratom }:
+
+stdenv.mkDerivation rec {
+  name = "lilv-svn-${rev}";
+  rev = "5675";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/lilv";
+    rev = rev;
+    sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
+  };
+
+  buildInputs = [ lv2 pkgconfig python serd sord-svn sratom ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/lilv;
+    description = "A C library to make the use of LV2 plugins";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index f03f6b3d371..cda126218ba 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
+    sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 6e2b9a31b30..401743ac517 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -9,10 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
   };
 
-  buildInputs = [ boost gtkmm lv2 pkgconfig python ];
+  nativeBuildInputs = [ pkgconfig python ];
+  buildInputs = [ boost gtkmm lv2 ];
+
+  # Fix including the boost libraries during linking
+  postPatch = ''
+    sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
+  '';
 
   configurePhase = ''
-    python waf configure --prefix=$out --boost-includes="${boost.dev}/include"
+    python waf configure --prefix=$out \
+      --boost-includes="${boost.dev}/include" \
+      --boost-libs="${boost.lib}/lib"
   '';
 
   buildPhase = "python waf";
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
new file mode 100644
index 00000000000..af98592e06d
--- /dev/null
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "ntk-${version}";
+  version = "2014-10-18";
+  src = fetchgit {
+    url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
+    rev = "5719b0044d9f267de5391fab006370cc7f4e70bd";
+    sha256 = "7ecedb049e00cc9a1bb0e0e2f02e5a734c873653b68551e6573474c04abe1821";
+  };
+
+  buildInputs = [
+    cairo libjpeg libXft pkgconfig python2
+  ];
+
+  buildPhase = ''
+    python waf configure --prefix=$out
+    python waf
+  '';
+
+  installPhase = ''
+    python waf install
+  '';
+
+  meta = {
+    description = "Fork of FLTK 1.3.0 with additional functionality";
+    version = "${version}";
+    homepage = http://non.tuxfamily.org/;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 269e7472280..789846c15e7 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "raul-svn-${rev}";
-  rev = "5449";
+  rev = "5675";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/raul";
     rev = rev;
-    sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
+    sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4";
   };
 
   buildInputs = [ boost gtk pkgconfig python ];
diff --git a/pkgs/development/libraries/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 2f5b9183f66..2f5b9183f66 100644
--- a/pkgs/development/libraries/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
new file mode 100644
index 00000000000..a15ae7dad40
--- /dev/null
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, fftwFloat }:
+
+stdenv.mkDerivation rec {
+  name = "zita-convolver-${version}";
+  version = "3.1.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz";
+  };
+
+  buildInputs = [ fftwFloat ];
+
+  patchPhase = ''
+    cd libs
+    sed -e "s@ldconfig@@" -i Makefile
+  '';
+
+  installPhase = ''
+    make PREFIX="$out" SUFFIX="" install
+
+    # create lib link for building apps
+    ln -s $out/lib/libzita-convolver.so.$version $out/lib/libzita-convolver.so.3
+  '';
+
+  meta = {
+    description = "Convolution library by Fons Adriaensen";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
new file mode 100644
index 00000000000..8c7e82557ab
--- /dev/null
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "zita-resampler-${version}";
+  version = "1.3.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX="
+  ];
+
+  patchPhase = ''
+    cd libs
+    sed -e "s@ldconfig@@" -i Makefile
+  '';
+
+  fixupPhase = ''
+    ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1
+  '';
+
+  meta = {
+    description = "resample library by Fons Adriaensen";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 6dc1b5241f2..5975a61ff77 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -9,11 +9,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "belle-sip-1.4.0";
+  name = "belle-sip-1.4.1";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
-    sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";
+    sha256 = "0q1d3fqsrxi3kxcjcibr376js25h6in8c1hm7c53wz252jx6f42b";
   };
 
   nativeBuildInputs = [ jre ];
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
new file mode 100644
index 00000000000..4b7be5ca3d4
--- /dev/null
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "biblesync-${version}";
+  version = "1.1.2";
+
+  src = fetchurl{
+    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
+  };
+
+  buildInputs = [ pkgconfig cmake libuuid ];
+
+  meta = {
+    homepage = http://www.crosswire.org/wiki/BibleSync;
+    description = "A multicast protocol to Bible software shared conavigation";
+    longDescription = ''
+      BibleSync is a multicast protocol to support Bible software
+      shared co-navigation. It uses LAN multicast in either a
+      personal/small team mutual navigation motif or in a classroom
+      environment where there are Speakers plus the Audience. The
+      library implementing the protocol is a single C++ class
+      providing a complete yet minimal public interface to support
+      mode setting, setup for packet reception, transmit on local
+      navigation, and handling of incoming packets.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.AndersonTorres ]; 
+  };
+}
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index a64a8bd5943..e6f59ca8efe 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
   patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
 
   buildInputs = [ pkgconfig gfortran texinfo ]
-    ++ optional (boost != null) boost
-    ;
+    ++ optional (boost != null) [ boost.lib ];
 
   configureFlags =
     [ "--enable-shared"
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
new file mode 100644
index 00000000000..87eb1e324ce
--- /dev/null
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
+, utillinux, yodl }:
+
+let version = "4.00.00"; in
+stdenv.mkDerivation {
+  name = "bobcat-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs";
+    rev = version;
+    repo = "bobcat";
+    owner = "fbb-git";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Brokken's Own Base Classes And Templates";
+    homepage = https://fbb-git.github.io/bobcat/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ libmilter libX11 openssl readline utillinux ];
+  nativeBuildInputs = [ icmake yodl ];
+
+  sourceRoot = "bobcat-${version}-src/bobcat";
+
+  postPatch = ''
+    substituteInPlace INSTALL.im --replace /usr $out
+    patchShebangs ./build
+  '';
+
+  buildPhase = ''
+    ./build libraries all
+    ./build man
+  '';
+
+  installPhase = ''
+    ./build install
+  '';
+}
diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch
new file mode 100644
index 00000000000..25c6b9f06f3
--- /dev/null
+++ b/pkgs/development/libraries/boehm-gc/cygwin.patch
@@ -0,0 +1,108 @@
+--- gc-7.2/include/gc.h	2014-06-01 19:00:48.000000000 +0200
++++ gc-7.2/include/gc.h	2015-05-27 12:55:42.248984200 +0200
+@@ -1386,7 +1386,14 @@
+ /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not    */
+ /* to GC_malloc() or GC_malloc_atomic().                                */
+ 
+-#ifdef __CYGWIN32__
++#ifdef __CYGWIN__
++#ifdef __x86_64__
++  extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[];
++#define GC_DATASTART (__data_start__ < __bss_start__ ?\
++                      (void *)__data_start__ : (void *)__bss_start__)
++#define GC_DATAEND (__data_end__ < __bss_end__ ?\
++                      (void *)__data_end__ : (void *)__bss_end__)
++#else
+   /* Similarly gnu-win32 DLLs need explicit initialization from the     */
+   /* main program, as does AIX.                                         */
+   extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[];
+@@ -1394,6 +1401,7 @@
+                        (void *)_data_start__ : (void *)_bss_start__)
+ # define GC_DATAEND (_data_end__ > _bss_end__ ? \
+                      (void *)_data_end__ : (void *)_bss_end__)
++#endif
+ # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \
+                                  GC_gcollect() /* For blacklisting. */
+         /* Required at least if GC is in a DLL.  And doesn't hurt. */
+--- gc-7.2/include/private/gcconfig.h	2014-06-01 19:00:48.000000000 +0200
++++ gc-7.2/include/private/gcconfig.h	2015-05-27 12:46:01.864338700 +0200
+@@ -441,10 +441,20 @@
+ #   endif
+ #   define mach_type_known
+ # endif
+-# if defined(__CYGWIN32__) || defined(__CYGWIN__)
++# if defined(__CYGWIN32__)
+ #   define I386
+ #   define CYGWIN32
+ #   define mach_type_known
++#if defined(__CYGWIN__)
++#  if defined(__LP64__)
++#    define X86_64
++#    define mach_type_known
++#  else
++#    define I386
++#  endif
++#  define CYGWIN32
++#  define mach_type_known
++#endif
+ # endif
+ # if defined(__MINGW32__) && !defined(mach_type_known)
+ #   define I386
+@@ -511,6 +521,16 @@
+ #    define mach_type_known
+ # endif
+ 
++#if defined(__CYGWIN__)
++#  if defined(__LP64__)
++#    define X86_64
++#    define mach_type_known
++#  else
++#    define I386
++#  endif
++#  define CYGWIN32
++#  define mach_type_known
++#endif
+ /* Feel free to add more clauses here */
+ 
+ /* Or manually define the machine type here.  A machine type is         */
+@@ -2279,6 +2299,20 @@
+ #       define GWW_VDB
+ #       define DATAEND  /* not needed */
+ #   endif
++
++#   ifdef CYGWIN32
++#       define OS_TYPE "CYGWIN32"
++#       define DATASTART ((ptr_t)GC_DATASTART)  /* From gc.h */
++#       define DATAEND   ((ptr_t)GC_DATAEND)
++#       define ALIGNMENT 8
++#       undef STACK_GRAN
++#       define STACK_GRAN 0x10000
++#       ifdef USE_MMAP
++#         define NEED_FIND_LIMIT
++#         define USE_MMAP_ANON
++#       endif
++#   endif
++
+ # endif /* X86_64 */
+ 
+ # ifdef HEXAGON
+--- gc-7.2/os_dep.c	2015-05-27 12:25:29.097698800 +0200
++++ gc-7.2/os_dep.c	2015-05-27 12:48:23.714600800 +0200
+@@ -764,10 +764,16 @@
+     /* gcc version of boehm-gc).                                        */
+     GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
+     {
++# ifdef __x86_64__
++      PNT_TIB pTib = NtCurrentTeb();
++      void * _tlsbase = pTib->StackBase;
++      /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/
++      /*extern void * _tlsbase __asm__ ("%gs:8");*/
++# else
+       void * _tlsbase;
+-
+       __asm__ ("movl %%fs:4, %0"
+                : "=r" (_tlsbase));
++# endif
+       sb -> mem_base = _tlsbase;
+       return GC_SUCCESS;
+     }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 08937019547..4839bedd8bb 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
     url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz;
     sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
   };
+  patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null;
 
   outputs = [ "dev" "out" "doc" ];
 
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 59d25a76732..92e02c6ca08 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
-    license = "boost-license";
+    license = licenses.boost;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/boost/1.56.nix b/pkgs/development/libraries/boost/1.56.nix
deleted file mode 100644
index fb62c2a07fa..00000000000
--- a/pkgs/development/libraries/boost/1.56.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.56.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
-    sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
-  };
-})
diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix
deleted file mode 100644
index 6393c6e0d30..00000000000
--- a/pkgs/development/libraries/boost/1.57.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.57.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2";
-    sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i";
-  };
-})
diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
new file mode 100644
index 00000000000..2666b1d6c5d
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -0,0 +1,40 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.59.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
+    sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
+  };
+
+  patches = if stdenv.isCygwin then [
+      ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
+      ./cygwin-fedora-boost-1.50.0-pool.patch
+      ./cygwin-fedora-boost-1.57.0-mpl-print.patch
+      ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
+      ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
+      ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
+      ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
+      ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
+      ./cygwin-fedora-boost-1.57.0-move-is_class.patch
+      ./cygwin-1.40.0-cstdint-cygwin.patch
+      ./cygwin-1.57.0-asio-cygwin.patch
+      ./cygwin-1.55.0-asio-MSG_EOR.patch
+      ./cygwin-1.57.0-config-cygwin.patch
+      ./cygwin-1.57.0-context-cygwin.patch
+      ./cygwin-1.57.0-filesystem-cygwin.patch
+      ./cygwin-1.55.0-interlocked-cygwin.patch
+      ./cygwin-1.40.0-iostreams-cygwin.patch
+      ./cygwin-1.57.0-locale-cygwin.patch
+      ./cygwin-1.57.0-log-cygwin.patch
+      ./cygwin-1.40.0-python-cygwin.patch
+      ./cygwin-1.40.0-regex-cygwin.patch
+      ./cygwin-1.57.0-smart_ptr-cygwin.patch
+      ./cygwin-1.57.0-system-cygwin.patch
+      ./cygwin-1.45.0-jam-cygwin.patch
+      ./cygwin-1.50.0-jam-pep3149.patch
+    ] else null;
+})
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
new file mode 100644
index 00000000000..61791c60d9e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
@@ -0,0 +1,20 @@
+These were fixed in ~1.7.0-46
+
+--- boost_1_40_0/boost/cstdint.hpp	2009-01-14 04:18:19.000000000 -0600
++++ boost_1_40_0/boost/cstdint.hpp	2009-08-27 23:41:34.063543700 -0500
+@@ -40,15 +40,6 @@
+ #   include <inttypes.h>
+ # else
+ #   include <stdint.h>
+-
+-// There is a bug in Cygwin two _C macros
+-#   if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
+-#     undef INTMAX_C
+-#     undef UINTMAX_C
+-#     define INTMAX_C(c) c##LL
+-#     define UINTMAX_C(c) c##ULL
+-#   endif
+-
+ # endif
+ 
+ #ifdef __QNX__
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
new file mode 100644
index 00000000000..6641ba823b1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
@@ -0,0 +1,24 @@
+--- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2008-03-22 16:45:55.000000000 -0500
++++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2009-08-27 23:41:34.082544800 -0500
+@@ -44,8 +44,7 @@
+ //------------------Locale support--------------------------------------------//
+ 
+ #ifndef BOOST_IOSTREAMS_NO_LOCALE
+-# if defined(BOOST_NO_STD_LOCALE) || \
+-     defined(__CYGWIN__) && \
++# if defined(BOOST_NO_STD_LOCALE) && \
+      ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \
+      /**/
+ #  define BOOST_IOSTREAMS_NO_LOCALE
+--- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2008-03-22 16:45:55.000000000 -0500
++++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2009-08-27 23:41:34.087545100 -0500
+@@ -13,8 +13,7 @@
+ 
+ // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use.
+ #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX )
+-# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \
+-     !defined(__CYGWIN__) \
++# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
+      /**/
+ #  define BOOST_IOSTREAMS_WINDOWS
+ # else
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
new file mode 100644
index 00000000000..7932b0e124b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
@@ -0,0 +1,35 @@
+--- boost_1_40_0/boost/python/detail/config.hpp	2007-11-25 12:07:19.000000000 -0600
++++ boost_1_40_0/boost/python/detail/config.hpp	2009-08-27 23:41:34.092545400 -0500
+@@ -83,7 +83,7 @@
+ #     endif
+ #     define BOOST_PYTHON_DECL_FORWARD
+ #     define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default")))
+-#  elif (defined(_WIN32) || defined(__CYGWIN__))
++#  elif defined(_WIN32)
+ #     if defined(BOOST_PYTHON_SOURCE)
+ #        define BOOST_PYTHON_DECL __declspec(dllexport)
+ #        define BOOST_PYTHON_BUILD_DLL
+--- boost_1_40_0/boost/python/detail/wrap_python.hpp	2007-04-27 17:16:47.000000000 -0500
++++ boost_1_40_0/boost/python/detail/wrap_python.hpp	2009-08-27 23:41:34.096545600 -0500
+@@ -82,8 +82,8 @@
+ // Some things we need in order to get Python.h to work with compilers other
+ // than MSVC on Win32
+ //
+-#if defined(_WIN32) || defined(__CYGWIN__)
+-# if defined(__GNUC__) && defined(__CYGWIN__)
++#if defined(_WIN32)
++# if defined(__GNUC__)
+ 
+ #  define SIZEOF_LONG 4
+ 
+--- boost_1_40_0/boost/python/module_init.hpp	2007-06-07 13:08:54.000000000 -0500
++++ boost_1_40_0/boost/python/module_init.hpp	2009-08-27 23:41:34.101545900 -0500
+@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char 
+ 
+ }}}
+ 
+-#  if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
++#  if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE)
+ 
+ #   define BOOST_PYTHON_MODULE_INIT(name)               \
+ void init_module_##name();                              \
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
new file mode 100644
index 00000000000..969bb814bd1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
@@ -0,0 +1,15 @@
+--- boost_1_40_0/boost/regex/v4/fileiter.hpp	2007-11-25 12:07:19.000000000 -0600
++++ boost_1_40_0/boost/regex/v4/fileiter.hpp	2009-08-27 23:41:34.106546200 -0500
+@@ -28,11 +28,7 @@
+ 
+ #ifndef BOOST_REGEX_NO_FILEITER
+ 
+-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
+-#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
+-#define BOOST_REGEX_FI_WIN32_MAP
+-#define BOOST_REGEX_FI_POSIX_DIR
+-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
++#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
+ #define BOOST_REGEX_FI_WIN32_MAP
+ #define BOOST_REGEX_FI_WIN32_DIR
+ #else
diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
new file mode 100644
index 00000000000..1a00851fa92
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
@@ -0,0 +1,12 @@
+OS_CYGWIN is used to assume cygpath, Win32-isms
+
+--- boost_1_48_0/tools/build/src/engine/jam.h
++++ boost_1_48_0/tools/build/src/engine/jam.h
+@@ -245,7 +245,6 @@
+ #endif
+ #if defined(__cygwin__) || defined(__CYGWIN__)
+     #define OSMINOR "OS=CYGWIN"
+-    #define OS_CYGWIN
+ #endif
+ #if defined(__FreeBSD__) && !defined(__DragonFly__)
+     #define OSMINOR "OS=FREEBSD"
diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
new file mode 100644
index 00000000000..4bc6ec9d36e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
@@ -0,0 +1,11 @@
+--- a/tools/build/src/tools/python.jam	2012-04-25 22:35:55.000000000 -0500
++++ b/tools/build/src/tools/python.jam	2013-01-21 07:22:30.814373200 -0600
+@@ -376,7 +376,7 @@ local rule path-to-native ( paths * )
+ #
+ local rule split-version ( version )
+ {
+-    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ;
++    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ;
+     if ! $(major-minor[2]) || $(major-minor[3])
+     {
+         ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
new file mode 100644
index 00000000000..46308a59cb0
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
@@ -0,0 +1,14 @@
+--- boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:54.186255800 -0500
++++ boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:03.887868700 -0500
+@@ -332,7 +332,11 @@ typedef int signed_size_type;
+ # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB
+ # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK
+ # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE
++#ifdef MSG_EOR
+ # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR
++#else
++# define BOOST_ASIO_OS_DEF_MSG_EOR 0
++#endif
+ # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD
+ # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR
+ # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
new file mode 100644
index 00000000000..df3edf51e7b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
@@ -0,0 +1,11 @@
+--- boost_1_55_0/boost/detail/interlocked.hpp	2013-10-24 09:01:53.000000000 -0500
++++ boost_1_55_0/boost/detail/interlocked.hpp	2014-08-31 13:01:33.830313500 -0500
+@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc
+     ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
+ # endif
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
+ 
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
new file mode 100644
index 00000000000..3702d475c8e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
@@ -0,0 +1,1835 @@
+--- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2015-05-04 17:33:18.798985800 -0500
+@@ -42,7 +42,7 @@ protected:
+   BOOST_ASIO_DECL static void init_native_buffer(
+       native_buffer_type& buf,
+       const boost::asio::const_buffer& buffer);
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   // The maximum number of buffers to support in a single operation.
+   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
+ 
+@@ -61,7 +61,7 @@ protected:
+     buf.buf = const_cast<char*>(boost::asio::buffer_cast<const char*>(buffer));
+     buf.len = static_cast<ULONG>(boost::asio::buffer_size(buffer));
+   }
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   // The maximum number of buffers to support in a single operation.
+   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
+ 
+@@ -92,7 +92,7 @@ protected:
+           boost::asio::buffer_cast<const void*>(buffer)));
+     iov.iov_len = boost::asio::buffer_size(buffer);
+   }
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ };
+ 
+ // Helper class to translate buffers into the native buffer representation.
+--- boost_1_57_0/boost/asio/detail/config.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/config.hpp	2015-05-04 17:34:30.756623300 -0500
+@@ -474,7 +474,7 @@
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: target OS version.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS)
+ #  if defined(_MSC_VER) || defined(__BORLANDC__)
+ #   pragma message( \
+@@ -512,29 +512,29 @@
+ #   error You must add -D__USE_W32_SOCKETS to your compiler options.
+ #  endif // !defined(__USE_W32_SOCKETS)
+ # endif // defined(__CYGWIN__)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: minimise header inclusion.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
+ #  if !defined(WIN32_LEAN_AND_MEAN)
+ #   define WIN32_LEAN_AND_MEAN
+ #  endif // !defined(WIN32_LEAN_AND_MEAN)
+ # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: suppress definition of "min" and "max" macros.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(BOOST_ASIO_NO_NOMINMAX)
+ #  if !defined(NOMINMAX)
+ #   define NOMINMAX 1
+ #  endif // !defined(NOMINMAX)
+ # endif // !defined(BOOST_ASIO_NO_NOMINMAX)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: IO Completion Ports.
+ #if !defined(BOOST_ASIO_HAS_IOCP)
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+ #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+ #   if !defined(UNDER_CE)
+ #    if !defined(BOOST_ASIO_DISABLE_IOCP)
+@@ -542,7 +542,7 @@
+ #    endif // !defined(BOOST_ASIO_DISABLE_IOCP)
+ #   endif // !defined(UNDER_CE)
+ #  endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+ #endif // !defined(BOOST_ASIO_HAS_IOCP)
+ 
+ // Linux: epoll, eventfd and timerfd.
+@@ -599,8 +599,7 @@
+ #if !defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ # if defined(BOOST_ASIO_HAS_IOCP) \
+   || !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #  if !defined(__SYMBIAN32__)
+ #   if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT)
+ #    define BOOST_ASIO_HAS_SERIAL_PORT 1
+@@ -609,7 +608,6 @@
+ # endif // defined(BOOST_ASIO_HAS_IOCP)
+         //   || !defined(BOOST_ASIO_WINDOWS)
+         //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-        //   && !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ // Windows: stream handles.
+@@ -633,11 +631,11 @@
+ // Windows: object handles.
+ #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
+ # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
+-#  if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#  if defined(BOOST_ASIO_WINDOWS)
+ #   if !defined(UNDER_CE)
+ #    define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1
+ #   endif // !defined(UNDER_CE)
+-#  endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#  endif // defined(BOOST_ASIO_WINDOWS)
+ # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
+ #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
+ 
+@@ -654,12 +652,10 @@
+ #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
+ # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
+ #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
+ 
+@@ -667,12 +663,10 @@
+ #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
+ # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_LOCAL_SOCKETS 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
+ #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
+ 
+@@ -680,12 +674,10 @@
+ #if !defined(BOOST_ASIO_HAS_SIGACTION)
+ # if !defined(BOOST_ASIO_DISABLE_SIGACTION)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_SIGACTION 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION)
+ #endif // !defined(BOOST_ASIO_HAS_SIGACTION)
+ 
+@@ -700,7 +692,7 @@
+ 
+ // Can use getaddrinfo() and getnameinfo().
+ #if !defined(BOOST_ASIO_HAS_GETADDRINFO)
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+ #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+ #   define BOOST_ASIO_HAS_GETADDRINFO 1
+ #  elif defined(UNDER_CE)
+--- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2015-05-04 17:33:18.826989400 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <cstddef>
+ #include <boost/system/error_code.hpp>
+@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d,
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP
+--- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2015-05-04 17:33:18.830489800 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/addressof.hpp>
+ #include <boost/asio/detail/bind_handler.hpp>
+@@ -116,6 +116,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP
+--- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2015-05-04 17:33:18.833490200 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/addressof.hpp>
+ #include <boost/asio/detail/bind_handler.hpp>
+@@ -116,6 +116,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP
+--- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2015-05-04 17:33:18.836490600 -0500
+@@ -26,7 +26,7 @@ namespace boost {
+ namespace asio {
+ namespace detail {
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef win_fd_set_adapter fd_set_adapter;
+ #else
+ typedef posix_fd_set_adapter fd_set_adapter;
+--- boost_1_57_0/boost/asio/detail/hash_map.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/hash_map.hpp	2015-05-04 17:33:18.839991000 -0500
+@@ -21,9 +21,9 @@
+ #include <boost/asio/detail/assert.hpp>
+ #include <boost/asio/detail/noncopyable.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/socket_types.hpp>
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value(
+     + (reinterpret_cast<std::size_t>(p) >> 3);
+ }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ inline std::size_t calculate_hash_value(SOCKET s)
+ {
+   return static_cast<std::size_t>(s);
+ }
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Note: assumes K and V are POD types.
+ template <typename K, typename V>
+--- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2015-05-04 17:33:18.843491500 -0500
+@@ -21,8 +21,7 @@
+ #include <boost/asio/error.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -448,6 +447,5 @@ int poll_write(int d, state_type state,
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP
+--- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2015-05-04 17:33:18.846991900 -0500
+@@ -19,7 +19,6 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #if !defined(BOOST_ASIO_WINDOWS)
+-#if !defined(__CYGWIN__)
+ #if !defined(__SYMBIAN32__)
+ #if !defined(BOOST_ASIO_HAS_EVENTFD)
+ 
+@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset()
+ 
+ #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
+ #endif // !defined(__SYMBIAN32__)
+-#endif // !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+--- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2015-05-04 17:33:18.849992300 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/error.hpp>
+ #include <boost/asio/detail/reactive_descriptor_service.hpp>
+@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP
+--- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2015-05-04 17:33:18.853492700 -0500
+@@ -19,7 +19,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <cstring>
+ #include <boost/asio/detail/reactive_serial_port_service.hpp>
+@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP
+--- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2015-05-04 17:29:21.281324900 -0500
+@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_
+       max_fd = fd_sets_[i].max_descriptor();
+   }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Connection operations on Windows use both except and write fd_sets.
+   have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty();
+   fd_sets_[write_op].set(op_queue_[connect_op], ops);
+@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_
+   fd_sets_[except_op].set(op_queue_[connect_op], ops);
+   if (fd_sets_[except_op].max_descriptor() > max_fd)
+     max_fd = fd_sets_[except_op].max_descriptor();
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   // We can return immediately if there's no work to do and the reactor is
+   // not supposed to block.
+@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_
+   // Dispatch all ready operations.
+   if (retval > 0)
+   {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     // Connection operations on Windows use both except and write fd_sets.
+     fd_sets_[except_op].perform(op_queue_[connect_op], ops);
+     fd_sets_[write_op].perform(op_queue_[connect_op], ops);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+     // Exception operations must be processed first to ensure that any
+     // out-of-band data is read before normal data.
+--- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2015-05-04 17:33:18.857993300 -0500
+@@ -60,12 +60,10 @@ signal_state* get_signal_state()
+ void boost_asio_signal_handler(int signal_number)
+ {
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__)
++  || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_set_service::deliver_signal(signal_number);
+ #else // defined(BOOST_ASIO_WINDOWS)
+       //   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-      //   || defined(__CYGWIN__)
+   int saved_errno = errno;
+   signal_state* state = get_signal_state();
+   signed_size_type result = ::write(state->write_descriptor_,
+@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa
+   errno = saved_errno;
+ #endif // defined(BOOST_ASIO_WINDOWS)
+        //   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   || defined(__CYGWIN__)
+ 
+ #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION)
+   ::signal(signal_number, boost_asio_signal_handler);
+@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa
+ }
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ class signal_set_service::pipe_read_op : public reactor_op
+ {
+ public:
+@@ -115,30 +111,25 @@ public:
+ };
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ signal_set_service::signal_set_service(
+     boost::asio::io_service& io_service)
+   : io_service_(boost::asio::use_service<io_service_impl>(io_service)),
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+     reactor_(boost::asio::use_service<reactor>(io_service)),
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+     next_(0),
+     prev_(0)
+ {
+   get_signal_state()->mutex_.init();
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   reactor_.init_task();
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+   for (int i = 0; i < max_signal_number; ++i)
+     registrations_[i] = 0;
+@@ -174,8 +165,7 @@ void signal_set_service::fork_service(
+     boost::asio::io_service::fork_event fork_ev)
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+   static_mutex::scoped_lock lock(state->mutex_);
+ 
+@@ -217,11 +207,9 @@ void signal_set_service::fork_service(
+   }
+ #else // !defined(BOOST_ASIO_WINDOWS)
+       //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-      //   && !defined(__CYGWIN__)
+   (void)fork_ev;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::construct(
+@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         delete new_registration;
+         return ec;
+       }
+@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(signal_number, SIG_DFL) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         return ec;
+       }
+     }
+@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         return ec;
+       }
+     }
+@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig
+   signal_state* state = get_signal_state();
+   static_mutex::scoped_lock lock(state->mutex_);
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+   // If this is the first service to be created, open a new pipe.
+   if (state->service_list_ == 0)
+     open_descriptors();
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+   // Insert service into linked list of all services.
+   service->next_ = state->service_list_;
+@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig
+   state->service_list_ = service;
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   // Register for pipe readiness notifications.
+   int read_descriptor = state->read_descriptor_;
+   lock.unlock();
+@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig
+       read_descriptor, service->reactor_data_, new pipe_read_op);
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::remove_service(signal_set_service* service)
+@@ -534,8 +520,7 @@ void signal_set_service::remove_service(
+   if (service->next_ || service->prev_ || state->service_list_ == service)
+   {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+     // Disable the pipe readiness notifications.
+     int read_descriptor = state->read_descriptor_;
+     lock.unlock();
+@@ -544,7 +529,6 @@ void signal_set_service::remove_service(
+     lock.lock();
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+     // Remove service from linked list of all services.
+     if (state->service_list_ == service)
+@@ -556,19 +540,18 @@ void signal_set_service::remove_service(
+     service->next_ = 0;
+     service->prev_ = 0;
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+     // If this is the last service to be removed, close the pipe.
+     if (state->service_list_ == 0)
+       close_descriptors();
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+   }
+ }
+ 
+ void signal_set_service::open_descriptors()
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+ 
+   int pipe_fds[2];
+@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor
+   }
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::close_descriptors()
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+ 
+   if (state->read_descriptor_ != -1)
+@@ -612,7 +593,6 @@ void signal_set_service::close_descripto
+   state->write_descriptor_ = -1;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::start_wait_op(
+--- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp	2015-05-04 17:32:20.048025400 -0500
+@@ -33,12 +33,12 @@
+ # include <string>
+ #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \
++#if defined(BOOST_ASIO_WINDOWS) \
+   || defined(__MACH__) && defined(__APPLE__)
+ # if defined(BOOST_ASIO_HAS_PTHREADS)
+ #  include <pthread.h>
+ # endif // defined(BOOST_ASIO_HAS_PTHREADS)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+        // || defined(__MACH__) && defined(__APPLE__)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+@@ -50,9 +50,9 @@ namespace socket_ops {
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ struct msghdr { int msg_namelen; };
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #if defined(__hpux)
+ // HP-UX doesn't declare these functions extern "C", so they are declared again
+@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c
+ 
+ inline void clear_last_error()
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   WSASetLastError(0);
+ #else
+   errno = 0;
+@@ -78,7 +78,7 @@ template <typename ReturnType>
+ inline ReturnType error_wrapper(ReturnType return_value,
+     boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ec = boost::system::error_code(WSAGetLastError(),
+       boost::asio::error::get_system_category());
+ #else
+@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta
+     }
+ 
+     clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     result = error_wrapper(::closesocket(s), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+     result = error_wrapper(::close(s), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+     if (result != 0
+         && (ec == boost::asio::error::would_block
+@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta
+       // current OS where this behaviour is seen, Windows, says that the socket
+       // remains open. Therefore we'll put the descriptor back into blocking
+       // mode and have another attempt at closing it.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+       ioctl_arg_type arg = 0;
+       ::ioctlsocket(s, FIONBIO, &arg);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ # if defined(__SYMBIAN32__)
+       int flags = ::fcntl(s, F_GETFL, 0);
+       if (flags >= 0)
+@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta
+       ioctl_arg_type arg = 0;
+       ::ioctl(s, FIONBIO, &arg);
+ # endif // defined(__SYMBIAN32__)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+       state &= ~non_blocking;
+ 
+       clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+       result = error_wrapper(::closesocket(s), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+       result = error_wrapper(::close(s), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+     }
+   }
+ 
+@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ioctl_arg_type arg = (value ? 1 : 0);
+   int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
+ #elif defined(__SYMBIAN32__)
+@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ioctl_arg_type arg = (value ? 1 : 0);
+   int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
+ #elif defined(__SYMBIAN32__)
+@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s,
+   // Check if the connect operation has finished. This is required since we may
+   // get spurious readiness notifications from the reactor.
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set write_fds;
+   FD_ZERO(&write_fds);
+@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s,
+   zero_timeout.tv_usec = 0;
+   int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s,
+   fds.revents = 0;
+   int ready = ::poll(&fds, 1, 0);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (ready == 0)
+   {
+@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s,
+ int socketpair(int af, int type, int protocol,
+     socket_type sv[2], boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(af);
+   (void)(type);
+   (void)(protocol);
+@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy
+ 
+ #if defined(SIOCATMARK)
+   ioctl_arg_type value = 0;
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec);
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec);
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+   if (result == 0)
+     ec = boost::system::error_code();
+ # if defined(ENOTTY)
+@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s
+   }
+ 
+   ioctl_arg_type value = 0;
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+   if (result == 0)
+     ec = boost::system::error_code();
+ #if defined(ENOTTY)
+@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v
+   base = static_cast<T>(addr);
+ }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef WSABUF buf;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ typedef iovec buf;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ void init_buf(buf& b, void* data, size_t size)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   b.buf = static_cast<char*>(data);
+   b.len = static_cast<u_long>(size);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   init_buf_iov_base(b.iov_base, data);
+   b.iov_len = size;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ void init_buf(buf& b, const void* data, size_t size)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   b.buf = static_cast<char*>(const_cast<void*>(data));
+   b.len = static_cast<u_long>(size);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   init_buf_iov_base(b.iov_base, const_cast<void*>(data));
+   b.iov_len = size;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr)
+@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf
+     int flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Receive some data.
+   DWORD recv_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = bufs;
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recv(socket_type s, state_type state, buf* bufs,
+@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s,
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Receive some data.
+   DWORD recv_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s,
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   init_msghdr_msg_name(msg.msg_name, addr);
+   msg.msg_namelen = static_cast<int>(*addrlen);
+@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s,
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recvfrom(socket_type s, state_type state, buf* bufs,
+@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s,
+     int in_flags, int& out_flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   out_flags = 0;
+   return socket_ops::recv(s, bufs, count, in_flags, ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = bufs;
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s,
+   else
+     out_flags = 0;
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recvmsg(socket_type s, state_type state,
+@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con
+     int flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Send the data.
+   DWORD send_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = const_cast<buf*>(bufs);
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_send(socket_type s, state_type state, const buf* bufs,
+@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Send the data.
+   DWORD send_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   init_msghdr_msg_name(msg.msg_name, addr);
+   msg.msg_namelen = static_cast<int>(addrlen);
+@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_sendto(socket_type s, state_type state, const buf* bufs,
+@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0,
+         WSA_FLAG_OVERLAPPED), ec);
+   if (s == invalid_socket)
+@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type
+   }
+   ec = boost::asio::error::fault;
+   return socket_error_retval;
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   clear_last_error();
+   int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
+         s, level, optname, optval, optlen), ec);
+@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type
+   if (result == 0)
+     ec = boost::system::error_code();
+   return result;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   clear_last_error();
+   int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
+         s, level, optname, optval, optlen), ec);
+@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type
+   if (result == 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ template <typename SockLenType>
+@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad
+     return socket_error_retval;
+   }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (cached)
+   {
+     // Check if socket is still connected.
+@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad
+     ec = boost::system::error_code();
+     return 0;
+   }
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   (void)cached;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   clear_last_error();
+   int result = error_wrapper(call_getpeername(
+@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec);
+ #elif defined(__MACH__) && defined(__APPLE__) \
+   || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd
+     fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (!readfds && !writefds && !exceptfds && timeout)
+   {
+     DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
+@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd
+   if (timeout && timeout->tv_sec == 0
+       && timeout->tv_usec > 0 && timeout->tv_usec < 1000)
+     timeout->tv_usec = 1000;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #if defined(__hpux) && defined(__SELECT)
+   timespec ts;
+@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set fds;
+   FD_ZERO(&fds);
+@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (result == 0)
+     ec = (state & user_set_non_blocking)
+@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set fds;
+   FD_ZERO(&fds);
+@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (result == 0)
+     ec = (state & user_set_non_blocking)
+@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set write_fds;
+   FD_ZERO(&write_fds);
+@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s
+     ec = boost::system::error_code();
+   return result;
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s
+     ec = boost::system::error_code();
+   return result;
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ }
+ 
+@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void
+     ec = boost::asio::error::address_family_not_supported;
+     return 0;
+   }
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   using namespace std; // For memcpy.
+ 
+   if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6))
+@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void
+     ec = boost::asio::error::invalid_argument;
+ 
+   return result == socket_error_retval ? 0 : dest;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   const char* result = error_wrapper(::inet_ntop(
+         af, src, dest, static_cast<int>(length)), ec);
+   if (result == 0 && !ec)
+@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void
+     strcat(dest, if_name);
+   }
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ int inet_pton(int af, const char* src, void* dest,
+@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v
+     ec = boost::asio::error::address_family_not_supported;
+     return -1;
+   }
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   using namespace std; // For memcpy and strcmp.
+ 
+   if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6))
+@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v
+     ec = boost::system::error_code();
+ 
+   return result == socket_error_retval ? -1 : 1;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::inet_pton(af, src, dest), ec);
+   if (result <= 0 && !ec)
+     ec = boost::asio::error::invalid_argument;
+@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v
+     }
+   }
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ int gethostname(char* name, int namelen, boost::system::error_code& ec)
+@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char
+     hostent* result, char* buffer, int buflength, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(buffer);
+   (void)(buflength);
+   hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec);
+@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char
+     char* buffer, int buflength, int ai_flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(buffer);
+   (void)(buflength);
+   (void)(ai_flags);
+@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla
+   case EAI_SOCKTYPE:
+     return boost::asio::error::socket_type_not_supported;
+   default: // Possibly the non-portable EAI_SYSTEM.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     return boost::system::error_code(
+         WSAGetLastError(), boost::asio::error::get_system_category());
+ #else
+@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co
+   host = (host && *host) ? host : 0;
+   service = (service && *service) ? service : 0;
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   int error = ::getaddrinfo(host, service, &hints, result);
+@@ -3213,7 +3201,7 @@ boost::system::error_code background_get
+ 
+ void freeaddrinfo(addrinfo_type* ai)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   ::freeaddrinfo(ai);
+@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co
+     std::size_t addrlen, char* host, std::size_t hostlen,
+     char* serv, std::size_t servlen, int flags, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   clear_last_error();
+--- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp	2015-05-04 17:33:18.861493700 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <cstdlib>
+@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset()
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+--- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp	2015-05-04 17:33:18.864494100 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+ #include <boost/asio/detail/winsock_init.hpp>
+@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP
+--- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp	2015-05-04 17:33:18.867994600 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+ #include <boost/asio/detail/socket_types.hpp>
+@@ -54,6 +54,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP
+--- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp	2015-05-04 17:33:18.870994900 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_HAS_THREADS) \
+   || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+@@ -65,7 +64,6 @@ public:
+ #endif // !defined(BOOST_ASIO_HAS_THREADS)
+        // || defined(BOOST_ASIO_WINDOWS)
+        // || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP
+--- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp	2015-05-04 17:33:18.874495400 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ // Guess whether we are building against on old Platform SDK.
+ #if !defined(IN6ADDR_ANY_INIT)
+@@ -211,6 +211,6 @@ struct addrinfo_emulation
+ # define IPPROTO_ICMPV6 58
+ #endif
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP
+--- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp	2015-05-04 17:33:18.877995800 -0500
+@@ -19,7 +19,6 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS)
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-#if !defined(__CYGWIN__)
+ #if !defined(__SYMBIAN32__)
+ #if !defined(BOOST_ASIO_HAS_EVENTFD)
+ 
+@@ -84,7 +83,6 @@ private:
+ 
+ #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
+ #endif // !defined(__SYMBIAN32__)
+-#endif // !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+--- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp	2015-05-04 17:33:18.881496300 -0500
+@@ -18,7 +18,6 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(__CYGWIN__) \
+   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <cstring>
+@@ -114,7 +113,6 @@ private:
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+-       // && !defined(__CYGWIN__)
+        // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP
+--- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp	2015-05-04 17:33:18.886496900 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/buffer.hpp>
+ #include <boost/asio/io_service.hpp>
+@@ -319,6 +318,5 @@ private:
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP
+--- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp	2015-05-04 17:33:18.889497300 -0500
+@@ -19,7 +19,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <string>
+ #include <boost/asio/error.hpp>
+@@ -230,7 +230,7 @@ private:
+ # include <boost/asio/detail/impl/reactive_serial_port_service.ipp>
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP
+--- boost_1_57_0/boost/asio/detail/select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp	2015-05-04 17:33:18.892497700 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__)
+ # include <boost/asio/detail/socket_select_interrupter.hpp>
+ #elif defined(BOOST_ASIO_HAS_EVENTFD)
+ # include <boost/asio/detail/eventfd_select_interrupter.hpp>
+@@ -31,7 +31,7 @@ namespace boost {
+ namespace asio {
+ namespace detail {
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__)
+ typedef socket_select_interrupter select_interrupter;
+ #elif defined(BOOST_ASIO_HAS_EVENTFD)
+ typedef eventfd_select_interrupter select_interrupter;
+--- boost_1_57_0/boost/asio/detail/select_reactor.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/select_reactor.hpp	2015-05-04 17:33:18.895498100 -0500
+@@ -51,13 +51,13 @@ class select_reactor
+   : public boost::asio::detail::service_base<select_reactor>
+ {
+ public:
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   enum op_types { read_op = 0, write_op = 1, except_op = 2,
+     max_select_ops = 3, connect_op = 3, max_ops = 4 };
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   enum op_types { read_op = 0, write_op = 1, except_op = 2,
+     max_select_ops = 3, connect_op = 1, max_ops = 3 };
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   // Per-descriptor data.
+   struct per_descriptor_data
+--- boost_1_57_0/boost/asio/detail/signal_blocker.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp	2015-05-04 17:33:18.898498400 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++  || defined(__SYMBIAN32__)
+ # include <boost/asio/detail/null_signal_blocker.hpp>
+ #elif defined(BOOST_ASIO_HAS_PTHREADS)
+ # include <boost/asio/detail/posix_signal_blocker.hpp>
+@@ -33,7 +33,7 @@ namespace detail {
+ 
+ #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++  || defined(__SYMBIAN32__)
+ typedef null_signal_blocker signal_blocker;
+ #elif defined(BOOST_ASIO_HAS_PTHREADS)
+ typedef posix_signal_blocker signal_blocker;
+--- boost_1_57_0/boost/asio/detail/signal_init.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_init.hpp	2015-05-04 17:33:18.901998900 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <csignal>
+ 
+@@ -44,6 +44,6 @@ public:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP
+--- boost_1_57_0/boost/asio/detail/signal_set_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp	2015-05-04 17:33:18.904999300 -0500
+@@ -28,9 +28,9 @@
+ #include <boost/asio/detail/signal_op.hpp>
+ #include <boost/asio/detail/socket_types.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/reactor.hpp>
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -183,8 +183,7 @@ private:
+   io_service_impl& io_service_;
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   // The type used for registering for pipe reactor notifications.
+   class pipe_read_op;
+ 
+@@ -195,7 +194,6 @@ private:
+   reactor::per_descriptor_data reactor_data_;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+   // A mapping from signal number to the registered signal sets.
+   registration* registrations_[max_signal_number];
+--- boost_1_57_0/boost/asio/detail/socket_ops.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/socket_ops.hpp	2015-05-04 17:33:18.907999600 -0500
+@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_
+ BOOST_ASIO_DECL int listen(socket_type s,
+     int backlog, boost::system::error_code& ec);
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef WSABUF buf;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ typedef iovec buf;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size);
+ 
+--- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp	2015-05-04 17:33:18.912500200 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+@@ -85,7 +84,6 @@ private:
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+--- boost_1_57_0/boost/asio/detail/socket_types.hpp	2015-05-04 17:16:30.021887400 -0500
++++ boost_1_57_0/boost/asio/detail/socket_types.hpp	2015-05-04 17:33:18.915500600 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ // Empty.
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
+ #  error WinSock.h has already been included
+ # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
+@@ -169,7 +169,7 @@ typedef int signed_size_type;
+ # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800
+ # define BOOST_ASIO_OS_DEF_AI_ALL 0x100
+ # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ typedef SOCKET socket_type;
+ const SOCKET invalid_socket = INVALID_SOCKET;
+ const int socket_error_retval = SOCKET_ERROR;
+--- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp	2015-05-04 17:33:18.919001000 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+ #include <boost/asio/detail/reactor_op_queue.hpp>
+@@ -146,6 +146,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP
+--- boost_1_57_0/boost/asio/detail/winsock_init.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/winsock_init.hpp	2015-05-04 17:33:18.923501600 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini
+ # include <boost/asio/detail/impl/winsock_init.ipp>
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP
+--- boost_1_57_0/boost/asio/error.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/error.hpp	2015-05-04 17:33:18.926502000 -0500
+@@ -20,7 +20,6 @@
+ #include <boost/system/error_code.hpp>
+ #include <boost/system/system_error.hpp>
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ # include <winerror.h>
+ #else
+@@ -45,7 +44,7 @@
+ # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e)
+ # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e)
+ # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_NATIVE_ERROR(e) e
+ # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e
+ # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e
+@@ -225,7 +224,7 @@ inline const boost::system::error_catego
+   return boost::system::system_category();
+ }
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_netdb_category();
+@@ -233,7 +232,7 @@ const boost::system::error_category& get
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_addrinfo_category();
+ 
+-#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#else // !defined(BOOST_ASIO_WINDOWS)
+ 
+ inline const boost::system::error_category& get_netdb_category()
+ {
+@@ -245,7 +244,7 @@ inline const boost::system::error_catego
+   return get_system_category();
+ }
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_misc_category();
+--- boost_1_57_0/boost/asio/impl/error.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/impl/error.ipp	2015-05-04 17:33:18.931002600 -0500
+@@ -25,7 +25,7 @@ namespace boost {
+ namespace asio {
+ namespace error {
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ namespace detail {
+ 
+@@ -87,7 +87,7 @@ const boost::system::error_category& get
+   return instance;
+ }
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ namespace detail {
+ 
+--- boost_1_57_0/boost/asio/impl/serial_port_base.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp	2015-05-04 17:33:18.936503300 -0500
+@@ -27,7 +27,7 @@
+ 
+ #if defined(GENERATING_DOCUMENTATION)
+ # define BOOST_ASIO_OPTION_STORAGE implementation_defined
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_OPTION_STORAGE DCB
+ #else
+ # define BOOST_ASIO_OPTION_STORAGE termios
+@@ -41,7 +41,7 @@ namespace asio {
+ boost::system::error_code serial_port_base::baud_rate::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.BaudRate = value_;
+ #else
+   speed_t baud;
+@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::baud_rate::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   value_ = storage.BaudRate;
+ #else
+   speed_t baud = ::cfgetospeed(&storage);
+@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con
+ boost::system::error_code serial_port_base::flow_control::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.fOutxCtsFlow = FALSE;
+   storage.fOutxDsrFlow = FALSE;
+   storage.fTXContinueOnXoff = TRUE;
+@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::flow_control::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.fOutX && storage.fInX)
+   {
+     value_ = software;
+@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_
+ boost::system::error_code serial_port_base::parity::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   switch (value_)
+   {
+   case none:
+@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::parity::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.Parity == EVENPARITY)
+   {
+     value_ = even;
+@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits(
+ boost::system::error_code serial_port_base::stop_bits::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   switch (value_)
+   {
+   case one:
+@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::stop_bits::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.StopBits == ONESTOPBIT)
+   {
+     value_ = one;
+@@ -507,7 +507,7 @@ serial_port_base::character_size::charac
+ boost::system::error_code serial_port_base::character_size::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.ByteSize = value_;
+ #else
+   storage.c_cflag &= ~CSIZE;
+@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::character_size::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   value_ = storage.ByteSize;
+ #else
+   if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; }
+--- boost_1_57_0/boost/asio/io_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/io_service.hpp	2015-05-04 17:33:18.940003700 -0500
+@@ -24,7 +24,7 @@
+ #include <boost/asio/detail/wrapped_handler.hpp>
+ #include <boost/system/error_code.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/winsock_init.hpp>
+ #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \
+   || defined(__osf__)
+@@ -600,7 +600,7 @@ public:
+   friend bool has_service(io_service& ios);
+ 
+ private:
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   detail::winsock_init<> init_;
+ #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \
+   || defined(__osf__)
+--- boost_1_57_0/boost/asio/serial_port_base.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/serial_port_base.hpp	2015-05-04 17:33:18.943004100 -0500
+@@ -21,16 +21,16 @@
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \
+   || defined(GENERATING_DOCUMENTATION)
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ # include <termios.h>
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+ #include <boost/system/error_code.hpp>
+ 
+ #if defined(GENERATING_DOCUMENTATION)
+ # define BOOST_ASIO_OPTION_STORAGE implementation_defined
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_OPTION_STORAGE DCB
+ #else
+ # define BOOST_ASIO_OPTION_STORAGE termios
+--- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp	2015-05-04 17:33:18.946504500 -0500
+@@ -85,15 +85,15 @@ public:
+ private:
+   static unsigned long openssl_id_func()
+   {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     return ::GetCurrentThreadId();
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+     void* id = instance()->thread_id_;
+     if (id == 0)
+       instance()->thread_id_ = id = &id; // Ugh.
+     BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*));
+     return reinterpret_cast<unsigned long>(id);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+   }
+ 
+   static void openssl_locking_func(int mode, int n, 
+@@ -109,10 +109,10 @@ private:
+   std::vector<boost::asio::detail::shared_ptr<
+         boost::asio::detail::mutex> > mutexes_;
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+   // The thread identifiers to be used by openssl.
+   boost::asio::detail::tss_ptr<void> thread_id_;
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #if !defined(SSL_OP_NO_COMPRESSION) \
+   && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch
new file mode 100644
index 00000000000..97acc72689d
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch
@@ -0,0 +1,76 @@
+--- boost_1_57_0/boost/config/platform/cygwin.hpp	2015-05-04 18:02:21.742811600 -0500
++++ boost_1_57_0/boost/config/platform/cygwin.hpp	2015-05-04 17:16:30.183407900 -0500
+@@ -39,18 +39,8 @@
+ #define BOOST_HAS_STDINT_H
+ #endif
+ 
+-/// Cygwin has no fenv.h
+-#define BOOST_NO_FENV_H
+-
+ // boilerplate code:
+ #include <boost/config/posix_features.hpp>
+-
+-//
+-// Cygwin lies about XSI conformance, there is no nl_types.h:
+-//
+-#ifdef BOOST_HAS_NL_TYPES_H
+-#  undef BOOST_HAS_NL_TYPES_H
+-#endif
+  
+ 
+ 
+--- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp	2015-05-04 17:54:44.835791700 -0500
+@@ -68,7 +68,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/sgi.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/sgi.hpp	2015-05-04 17:54:52.911817300 -0500
+@@ -41,7 +41,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/stlport.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/stlport.hpp	2015-05-04 17:55:00.621796300 -0500
+@@ -17,7 +17,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/vacpp.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/vacpp.hpp	2015-05-04 17:55:07.424660200 -0500
+@@ -13,7 +13,7 @@
+ #define BOOST_NO_STD_MESSAGES
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/predef/os/cygwin.h	2014-07-10 08:53:53.000000000 -0500
++++ boost_1_57_0/boost/predef/os/cygwin.h	2015-05-04 17:57:31.634472500 -0500
+@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
+     defined(__CYGWIN__) \
+     )
+ #   undef BOOST_OS_CYGWIN
+-#   define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE
++#   define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE
+ #endif
+ 
+ #if BOOST_OS_CYGWIN
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch
new file mode 100644
index 00000000000..3d9726179be
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch
@@ -0,0 +1,600 @@
+--- boost_1_57_0/libs/context/build/Jamfile.v2	2014-10-20 01:26:00.000000000 -0500
++++ boost_1_57_0/libs/context/build/Jamfile.v2	2015-05-04 17:43:10.812161900 -0500
+@@ -29,6 +29,7 @@ local rule default_binary_format ( )
+     local tmp = elf ;
+     if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+     if [ os.name ] = "NT" { tmp = pe ; }
++    if [ os.name ] = "CYGWIN" { tmp = pe ; }
+     if [ os.name ] = "AIX" { tmp = xcoff ; }
+     return $(tmp) ;
+ }
+@@ -581,6 +582,16 @@ alias asm_context_sources
+    ;
+ 
+ alias asm_context_sources
++   : asm/make_i386_ms_pe_gas.S
++     asm/jump_i386_ms_pe_gas.S
++     dummy.cpp
++   : <address-model>32
++     <architecture>x86
++     <binary-format>pe
++     <toolset>gcc
++   ;
++
++alias asm_context_sources
+    : asm/make_i386_ms_pe_masm.asm
+      asm/jump_i386_ms_pe_masm.asm
+      dummy.cpp
+@@ -715,6 +726,16 @@ alias asm_context_sources
+    ;
+ 
+ alias asm_context_sources
++   : asm/make_x86_64_ms_pe_gas.S
++     asm/jump_x86_64_ms_pe_gas.S
++     dummy.cpp
++   : <address-model>64
++     <architecture>x86
++     <binary-format>pe
++     <toolset>gcc
++   ;
++
++alias asm_context_sources
+    : asm/make_x86_64_ms_pe_masm.asm
+      asm/jump_x86_64_ms_pe_masm.asm
+      dummy.cpp
+--- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S	2015-05-04 17:43:10.821663100 -0500
+@@ -0,0 +1,108 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/********************************************************************
++ *                                                                  *
++ *  --------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
++ *  --------------------------------------------------------------  *
++ *  |    0h   |   04h   |   08h   |   0ch   |   010h   |   014h  |  *
++ *  --------------------------------------------------------------  *
++ *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    6    |    7    |    8    |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |   018h  |   01ch  |   020h  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |    sp   |   size  |  limit  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    9    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  024h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_execpt|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   10    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  028h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_strage|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   11    |    12   |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  |  02ch   |   030h  |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|                                        |  *
++ *  --------------------------------------------------------------  *
++ *                                                                  *
++ * *****************************************************************/
++
++.file	"jump_i386_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	_jump_fcontext
++.def	_jump_fcontext;	.scl	2;	.type	32;	.endef
++_jump_fcontext:
++    movl    0x04(%esp), %ecx        /* load address of the first fcontext_t arg */
++    movl    %edi,       (%ecx)      /* save EDI */
++    movl    %esi,       0x04(%ecx)  /* save ESI */
++    movl    %ebx,       0x08(%ecx)  /* save EBX */
++    movl    %ebp,       0x0c(%ecx)  /* save EBP */
++
++    movl    %fs:(0x18), %edx        /* load NT_TIB */
++    movl    (%edx),     %eax        /* load current SEH exception list */
++    movl    %eax,       0x24(%ecx)  /* save current exception list */
++    movl    0x04(%edx), %eax        /* load current stack base */
++    movl    %eax,       0x18(%ecx)  /* save current stack base */
++    movl    0x08(%edx), %eax        /* load current stack limit */
++    movl    %eax,       0x20(%ecx)  /* save current stack limit */
++    movl    0x10(%edx), %eax        /* load fiber local storage */
++    movl    %eax,       0x28(%ecx)  /* save fiber local storage */
++
++    leal    0x04(%esp), %eax        /* exclude the return address */
++    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
++    movl    (%esp),     %eax        /* load return address */
++    movl    %eax,       0x14(%ecx)  /* save return address */
++
++    movl    0x08(%esp), %edx        /* load address of the second fcontext_t arg */
++    movl    (%edx),     %edi        /* restore EDI */
++    movl    0x04(%edx), %esi        /* restore ESI */
++    movl    0x08(%edx), %ebx        /* restore EBX */
++    movl    0x0c(%edx), %ebp        /* restore EBP */
++
++    movl    0x10(%esp), %eax        /* check if fpu enve preserving was requested */
++    testl   %eax,       %eax 
++    je      1f
++
++    stmxcsr 0x2c(%ecx)              /* save MMX control word */
++    fnstcw  0x30(%ecx)              /* save x87 control word */
++    ldmxcsr 0x2c(%edx)              /* restore MMX control word */
++    fldcw   0x30(%edx)              /* restore x87 control word */
++1:
++    movl    %edx,       %ecx        
++    movl    %fs:(0x18), %edx        /* load NT_TIB */
++    movl    0x24(%ecx), %eax        /* load SEH exception list */
++    movl    %eax,       (%edx)      /* restore next SEH item */
++    movl    0x18(%ecx), %eax        /* load stack base */
++    movl    %eax,       0x04(%edx)  /* restore stack base */
++    movl    0x20(%ecx), %eax        /* load stack limit */
++    movl    %eax,       0x08(%edx)  /* restore stack limit */
++    movl    0x28(%ecx), %eax        /* load fiber local storage */
++    movl    %eax,       0x10(%edx)  /* restore fiber local storage */
++			            
++    movl    0x0c(%esp), %eax        /* use third arg as return value after jump */
++			            
++    movl    0x10(%ecx), %esp        /* restore ESP */
++    movl    %eax,       0x04(%esp)  /* use third arg as first arg in context function */
++    movl    0x14(%ecx), %ecx        /* fetch the address to return to */
++
++    jmp     *%ecx                   /* indirect jump to context */
+--- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S	2015-05-04 17:43:10.829664200 -0500
+@@ -0,0 +1,189 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/****************************************************************************************
++ *                                                                                      *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        R12        |         R13       |         R14        |        R15        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RDI        |        RSI        |         RBX        |        RBP        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    16   |    17   |    18   |    19   |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x40  |   0x44  |   0x48  |   0x4c  |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RSP        |        RIP        |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    20   |    21   |    22   |    23   |    24    |    25   |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x50  |   0x54  |   0x58  |   0x5c  |   0x60   |   0x64  |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        sp         |       size        |        limit       |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    26   |   27    |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x68  |   0x6c  |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |      fbr_strg     |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    28   |   29    |    30   |    31   |    32    |    33   |   34    |   35    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x70  |   0x74  |   0x78  |   0x7c  |   0x80   |   0x84  |  0x88   |  0x8c   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|      fc_xmm       |      SEE registers (XMM6-XMM15)        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   36    |    37   |    38   |    39   |    40    |    41   |   42    |   43    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x90   |   0x94  |   0x98  |   0x9c  |   0xa0   |   0xa4  |  0xa8   |  0xac   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    44    |   45    |    46   |    47  |    48    |    49   |   50    |   51    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xb0   |  0xb4   |  0xb8   |  0xbc  |   0xc0   |   0xc4  |  0xc8   |  0xcc   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    52    |   53    |    54   |   55   |    56    |    57   |   58    |   59    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xd0   |  0xd4   |   0xd8  |  0xdc  |   0xe0   |  0xe4   |  0xe8   |  0xec   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    60   |    61   |    62    |    63  |    64    |    65   |   66    |   67    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0xf0   |  0xf4   |   0xf8   |  0xfc  |   0x100  |  0x104  |  0x108  |  0x10c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    68   |    69   |    70    |    71  |    72    |    73   |   74    |   75    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x110  |  0x114  |   0x118  |  0x11c |   0x120  |  0x124  |  0x128  |  0x12c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *                                                                                      *
++ * *************************************************************************************/
++
++.file	"jump_x86_64_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	jump_fcontext
++.def	jump_fcontext;	.scl	2;	.type	32;	.endef
++.seh_proc	jump_fcontext
++jump_fcontext:
++.seh_endprologue
++    movq    %r12,       (%rcx)      /* save R12 */
++    movq    %r13,       0x08(%rcx)  /* save R13 */
++    movq    %r14,       0x10(%rcx)  /* save R14 */
++    movq    %r15,       0x18(%rcx)  /* save R15 */
++    movq    %rdi,       0x20(%rcx)  /* save RDI */
++    movq    %rsi,       0x28(%rcx)  /* save RSI */
++    movq    %rbx,       0x30(%rcx)  /* save RBX */
++    movq    %rbp,       0x38(%rcx)  /* save RBP */
++
++    movq    %gs:(0x30), %r10        /* load NT_TIB */
++    movq    0x08(%r10), %rax        /* load current stack base */
++    movq    %rax,       0x50(%rcx)  /* save current stack base */
++    movq    0x10(%r10), %rax        /* load current stack limit */
++    movq    %rax,       0x60(%rcx)  /* save current stack limit */
++    movq    0x18(%r10), %rax        /* load fiber local storage */
++    movq    %rax,       0x68(%rcx)  /* save fiber local storage */
++
++    testq   %r9,        %r9
++    je      1f
++
++    stmxcsr 0x70(%rcx)              /* save MMX control and status word */
++    fnstcw  0x74(%rcx)              /* save x87 control word */
++    /* save XMM storage */
++    /* save start address of SSE register block in R10 */
++    leaq    0x90(%rcx), %r10
++    /* shift address in R10 to lower 16 byte boundary */
++    /* == pointer to SEE register block */
++    andq    $-16,       %r10
++
++    movaps  %xmm6,      (%r10)
++    movaps  %xmm7,      0x10(%r10)
++    movaps  %xmm8,      0x20(%r10)
++    movaps  %xmm9,      0x30(%r10)
++    movaps  %xmm10,     0x40(%r10)
++    movaps  %xmm11,     0x50(%r10)
++    movaps  %xmm12,     0x60(%r10)
++    movaps  %xmm13,     0x70(%r10)
++    movaps  %xmm14,     0x80(%r10)
++    movaps  %xmm15,     0x90(%r10)
++
++    ldmxcsr 0x70(%rdx)              /* restore MMX control and status word */
++    fldcw   0x74(%rdx)              /* restore x87 control word */
++    /* restore XMM storage */
++	/* save start address of SSE register block in R10 */
++    leaq    0x90(%rdx), %r10
++    /* shift address in R10 to lower 16 byte boundary */
++    /* == pointer to SEE register block */
++    andq    $-16,       %r10
++
++    movaps  (%r10),     %xmm6
++    movaps  0x10(%r10), %xmm7
++    movaps  0x20(%r10), %xmm8
++    movaps  0x30(%r10), %xmm9
++    movaps  0x40(%r10), %xmm10
++    movaps  0x50(%r10), %xmm11
++    movaps  0x60(%r10), %xmm12
++    movaps  0x70(%r10), %xmm13
++    movaps  0x80(%r10), %xmm14
++    movaps  0x90(%r10), %xmm15
++
++1:
++    leaq    0x08(%rsp), %rax        /* exclude the return address */
++    movq    %rax,       0x40(%rcx)  /* save as stack pointer */
++    movq    (%rsp),     %rax        /* load return address */
++    movq    %rax,       0x48(%rcx)  /* save return address */
++
++    movq    (%rdx),     %r12        /* restore R12 */
++    movq    0x08(%rdx), %r13        /* restore R13 */
++    movq    0x10(%rdx), %r14        /* restore R14 */
++    movq    0x18(%rdx), %r15        /* restore R15 */
++    movq    0x20(%rdx), %rdi        /* restore RDI */
++    movq    0x28(%rdx), %rsi        /* restore RSI */
++    movq    0x30(%rdx), %rbx        /* restore RBX */
++    movq    0x38(%rdx), %rbp        /* restore RBP */
++
++    movq    %gs:(0x30), %r10        /* load NT_TIB */
++    movq    0x50(%rdx), %rax        /* load stack base */
++    movq    %rax,       0x08(%r10)  /* restore stack base */
++    movq    0x60(%rdx), %rax        /* load stack limit */
++    movq    %rax,       0x10(%r10)  /* restore stack limit */
++    movq    0x68(%rdx), %rax        /* load fiber local storage */
++    movq    %rax,       0x18(%r10)  /* restore fiber local storage */
++
++    movq    0x40(%rdx), %rsp        /* restore RSP */
++    movq    0x48(%rdx), %r10        /* fetch the address to returned to */
++
++    movq    %r8,        %rax        /* use third arg as return value after jump */
++    movq    %r8,        %rcx        /* use third arg as first arg in context function */
++
++    jmp     *%r10                   /* indirect jump to caller */
++.seh_endproc
+--- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S	2015-05-04 17:43:10.836165000 -0500
+@@ -0,0 +1,115 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/********************************************************************
++ *                                                                  *
++ *  --------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
++ *  --------------------------------------------------------------  *
++ *  |    0h   |   04h   |   08h   |   0ch   |   010h   |   014h  |  *
++ *  --------------------------------------------------------------  *
++ *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    6    |    7    |    8    |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |   018h  |   01ch  |   020h  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |    sp   |   size  |  limit  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    9    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  024h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_execpt|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   10    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  028h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_strage|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   11    |    12   |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  |  02ch   |   030h  |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|                                        |  *
++ *  --------------------------------------------------------------  *
++ *                                                                  *
++ * *****************************************************************/
++
++.file	"make_i386_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	_make_fcontext
++.def	_make_fcontext;	.scl	2;	.type	32;	.endef
++_make_fcontext:
++    movl    0x04(%esp), %eax        /* load 1. arg of make_fcontext, pointer to context stack (base) */
++    leal    -0x34(%eax),%eax        /* reserve space for fcontext_t at top of context stack */
++
++    /* shift address in EAX to lower 16 byte boundary */
++    /* == pointer to fcontext_t and address of context stack */
++    andl    $-16,       %eax
++
++    movl    0x04(%esp), %ecx        /* load 1. arg of make_fcontext, pointer to context stack (base) */
++    movl    %ecx,       0x18(%eax)  /* save address of context stack (base) in fcontext_t */
++    movl    0x08(%esp), %edx        /* load 2. arg of make_fcontext, context stack size */
++    movl    %edx,       0x1c(%eax)  /* save context stack size in fcontext_t */
++    negl    %edx                    /* negate stack size for LEA instruction (== substraction) */
++    leal    (%ecx,%edx),%ecx        /* compute bottom address of context stack (limit) */
++    movl    %ecx,       0x20(%eax)  /* save address of context stack (limit) in fcontext_t */
++    movl    0x0c(%esp), %ecx        /* load 3. arg of make_fcontext, pointer to context function */
++    movl    %ecx,       0x14(%eax)  /* save address of context function in fcontext_t */
++
++    stmxcsr 0x02c(%eax)             /* save MMX control word */
++    fnstcw  0x030(%eax)             /* save x87 control word */
++
++    leal    -0x1c(%eax),%edx        /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */
++    movl    %edx,       0x10(%eax)  /* save address in EDX as stack pointer for context function */
++
++    movl    $finish,    %ecx        /* abs address of finish */
++    movl    %ecx,       (%edx)      /* save address of finish as return address for context function */
++                                    /* entered after context function returns */
++
++    /* traverse current seh chain to get the last exception handler installed by Windows */
++    /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */
++    /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */
++    /* at its end by RaiseException all seh andlers are disregarded if not present and the */
++    /* program is aborted */
++    movl    %fs:(0x18), %ecx        /* load NT_TIB into ECX */
++
++walk:
++    movl    (%ecx),     %edx        /* load 'next' member of current SEH into EDX */
++    incl    %edx                    /* test if 'next' of current SEH is last (== 0xffffffff) */
++    jz      found
++    decl    %edx
++    xchgl    %ecx,      %edx        /* exchange content; ECX contains address of next SEH */
++    jmp     walk                    /* inspect next SEH */
++
++found:
++    movl    0x04(%ecx), %ecx        /* load 'handler' member of SEH == address of last SEH handler installed by Windows */
++    movl    0x10(%eax), %edx        /* load address of stack pointer for context function */
++    movl    %ecx,       0x18(%edx)  /* save address in ECX as SEH handler for context */
++    movl    $0xffffffff,%ecx        /* set ECX to -1 */
++    movl    %ecx,       0x14(%edx)  /* save ECX as next SEH item */
++    leal    0x14(%edx), %ecx        /* load address of next SEH item */
++    movl    %ecx,       0x24(%eax)  /* save next SEH */
++
++    ret
++
++finish:
++    /* ESP points to same address as ESP on entry of context function + 0x4 */
++    xorl    %eax,       %eax
++    movl    %eax,       (%esp)      /* exit code is zero */
++    call    __exit                  /* exit application */
++    hlt
++
++.def	__exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
+--- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S	2015-05-04 17:43:10.843165900 -0500
+@@ -0,0 +1,132 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/****************************************************************************************
++ *                                                                                      *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        R12        |         R13       |         R14        |        R15        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RDI        |        RSI        |         RBX        |        RBP        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    16   |    17   |    18   |    19   |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x40  |   0x44  |   0x48  |   0x4c  |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RSP        |        RIP        |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    20   |    21   |    22   |    23   |    24    |    25   |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x50  |   0x54  |   0x58  |   0x5c  |   0x60   |   0x64  |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        sp         |       size        |        limit       |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    26   |   27    |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x68  |   0x6c  |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |      fbr_strg     |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    28   |   29    |    30   |    31   |    32    |    33   |   34    |   35    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x70  |   0x74  |   0x78  |   0x7c  |   0x80   |   0x84  |  0x88   |  0x8c   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|      fc_xmm       |      SEE registers (XMM6-XMM15)        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   36    |    37   |    38   |    39   |    40    |    41   |   42    |   43    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x90   |   0x94  |   0x98  |   0x9c  |   0xa0   |   0xa4  |  0xa8   |  0xac   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    44    |   45    |    46   |    47  |    48    |    49   |   50    |   51    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xb0   |  0xb4   |  0xb8   |  0xbc  |   0xc0   |   0xc4  |  0xc8   |  0xcc   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    52    |   53    |    54   |   55   |    56    |    57   |   58    |   59    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xd0   |  0xd4   |   0xd8  |  0xdc  |   0xe0   |  0xe4   |  0xe8   |  0xec   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    60   |    61   |    62    |    63  |    64    |    65   |   66    |   67    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0xf0   |  0xf4   |   0xf8   |  0xfc  |   0x100  |  0x104  |  0x108  |  0x10c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    68   |    69   |    70    |    71  |    72    |    73   |   74    |   75    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x110  |  0x114  |   0x118  |  0x11c |   0x120  |  0x124  |  0x128  |  0x12c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *                                                                                      *
++ * *************************************************************************************/
++
++.file	"make_x86_64_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	make_fcontext
++.def	make_fcontext;	.scl	2;	.type	32;	.endef
++.seh_proc	make_fcontext
++make_fcontext:
++.seh_endprologue
++    leaq    -0x130(%rcx),%rax       /* reserve space for fcontext_t at top of context stack */
++
++    /* shift address in RAX to lower 16 byte boundary */
++    /* == pointer to fcontext_t and address of context stack */
++    andq    $-16,       %rax
++
++    movq    %r8,        0x48(%rax)  /* save address of context function in fcontext_t */
++    movq    %rdx,       0x58(%rax)  /* save context stack size in fcontext_t */
++    movq    %rcx,       0x50(%rax)  /* save address of context stack pointer (base) in fcontext_t */
++
++    negq    %rdx                    /* negate stack size for LEA instruction (== substraction) */
++    leaq    (%rcx,%rdx),%rcx        /* compute bottom address of context stack (limit) */
++    movq    %rcx,       0x60(%rax)  /* save bottom address of context stack (limit) in fcontext_t */
++
++    stmxcsr 0x70(%rax)              /* save MMX control and status word */
++    fnstcw  0x74(%rax)              /* save x87 control word */
++
++    leaq    -0x28(%rax),%rdx        /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */
++    movq    %rdx,       0x40(%rax)  /* save address in RDX as stack pointer for context function */
++
++    leaq    finish(%rip),%rcx       /* compute abs address of label finish */
++    movq    %rcx,(%rdx)             /* save address of finish as return address for context function */
++                                    /* entered after context function returns */
++
++    ret
++
++finish:
++    /* RSP points to same address as RSP on entry of context function + 0x8 */
++    xorq    %rcx,       %rcx        /* exit code is zero */
++    call    _exit                   /* exit application */
++    hlt
++.seh_endproc
++
++.def	_exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch
new file mode 100644
index 00000000000..cbb5757746d
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch
@@ -0,0 +1,32 @@
+--- boost_1_57_0/libs/filesystem/src/operations.cpp	2014-10-29 10:34:00.000000000 -0500
++++ boost_1_57_0/libs/filesystem/src/operations.cpp	2015-05-04 23:30:34.278446000 -0500
+@@ -1966,8 +1966,7 @@ namespace
+   {
+     errno = 0;
+ 
+-#   if !defined(__CYGWIN__)\
+-    && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\
++#   if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\
+     && defined(_SC_THREAD_SAFE_FUNCTIONS)\
+     && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\
+     && (!defined(__hpux) || defined(_REENTRANT)) \
+--- boost_1_57_0/libs/filesystem/src/path.cpp	2014-10-29 10:34:00.000000000 -0500
++++ boost_1_57_0/libs/filesystem/src/path.cpp	2015-05-04 17:45:45.582315200 -0500
+@@ -36,7 +36,7 @@
+ # include "windows_file_codecvt.hpp"
+ # include <windows.h>
+ #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+- || defined(__FreeBSD__) || defined(__OPEN_BSD__)
++ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__)
+ # include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
+ #endif
+ 
+@@ -831,7 +831,7 @@ namespace
+     std::locale global_loc = std::locale();
+     return std::locale(global_loc, new windows_file_codecvt);
+ # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+-  || defined(__FreeBSD__) || defined(__OpenBSD__)
++  || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+     // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+     // and nothing else." See
+     // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
new file mode 100644
index 00000000000..16208385a9b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
@@ -0,0 +1,81 @@
+--- boost_1_57_0/libs/locale/build/Jamfile.v2	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/build/Jamfile.v2	2015-05-04 18:11:52.956846500 -0500
+@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla
+ 
+     }
+         
+-    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) && ! <target-os>cygwin in $(properties) 
++    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) 
+     {
+         ECHO "- Boost.Locale needs either iconv or ICU library to be built." ;
+         result += <build>no ;
+@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla
+     if ! <boost.locale.winapi> in $(properties:G)
+     {
+         if <target-os>windows in $(properties) 
+-          || <target-os>cygwin in $(properties)
+         {
+             properties += <boost.locale.winapi>on ;
+         }      
+@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla
+     }
+     
+     if ( ! <boost.locale.winapi>off in $(properties) || ! <boost.locale.std>off in $(properties) )
+-       && ( <target-os>windows in $(properties) || <target-os>cygwin in $(properties) )
++       && <target-os>windows in $(properties)
+     {
+         result += <source>win32/lcid.cpp ;
+     }
+--- boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2015-05-04 23:16:01.778652600 -0500
+@@ -8,7 +8,7 @@
+ #define BOOST_LOCALE_SOURCE
+ #include <boost/config.hpp>
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ #define BOOST_LOCALE_WITH_WCONV
+ #endif
+ 
+--- boost_1_57_0/libs/locale/src/encoding/conv.hpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/encoding/conv.hpp	2015-05-04 23:16:08.454000300 -0500
+@@ -59,7 +59,7 @@ namespace boost {
+                     return normalize_encoding(l).compare(normalize_encoding(r));
+                 }
+             
+-                #if defined(BOOST_WINDOWS)  || defined(__CYGWIN__)
++                #if defined(BOOST_WINDOWS)
+                 int encoding_to_windows_codepage(char const *ccharset);
+                 #endif
+             
+--- boost_1_57_0/libs/locale/src/util/default_locale.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/util/default_locale.cpp	2015-05-04 23:16:16.311998100 -0500
+@@ -15,7 +15,7 @@
+ #  pragma warning(disable : 4996)
+ #endif
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ #ifndef NOMINMAX
+ #define NOMINMAX
+ #endif
+--- boost_1_57_0/libs/locale/test/test_codepage.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/test/test_codepage.cpp	2015-05-04 23:16:40.883618300 -0500
+@@ -23,7 +23,7 @@
+ # include <locale.h>
+ #endif
+ 
+-#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
++#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
+ #ifndef NOMINMAX
+ # define NOMINMAX
+ #endif
+@@ -395,7 +395,7 @@ int main()
+         def.push_back("posix");
+         #endif
+ 
+-        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
++        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
+         test_iso_8859_8 = IsValidCodePage(28598)!=0;
+         #endif
+ 
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch
new file mode 100644
index 00000000000..a7748ec58d8
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch
@@ -0,0 +1,46 @@
+--- boost_1_57_0/boost/log/detail/config.hpp	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/boost/log/detail/config.hpp	2015-05-04 17:56:38.663746100 -0500
+@@ -96,11 +96,6 @@
+ #   define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS
+ #endif
+ 
+-#if defined(__CYGWIN__)
+-    // Boost.ASIO is broken on Cygwin
+-#   define BOOST_LOG_NO_ASIO
+-#endif
+-
+ #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO)
+ #   ifndef BOOST_LOG_WITHOUT_SYSLOG
+ #       define BOOST_LOG_WITHOUT_SYSLOG
+--- boost_1_57_0/libs/log/build/Jamfile.v2	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/libs/log/build/Jamfile.v2	2015-05-04 22:16:49.242537800 -0500
+@@ -170,10 +170,6 @@ project boost/log
+         <target-os>windows:<library>ws2_32
+         <target-os>windows:<library>mswsock
+ 
+-        <target-os>cygwin:<define>__USE_W32_SOCKETS
+-        <target-os>cygwin:<library>ws2_32
+-        <target-os>cygwin:<library>mswsock
+-
+         <target-os>linux:<library>rt
+         <target-os>linux:<define>_XOPEN_SOURCE=600
+         <target-os>linux:<define>_GNU_SOURCE=1
+--- boost_1_57_0/libs/log/src/windows_version.hpp	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/libs/log/src/windows_version.hpp	2015-05-04 23:17:08.281597400 -0500
+@@ -18,7 +18,7 @@
+ 
+ #include <boost/log/detail/config.hpp>
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ 
+ #if defined(BOOST_LOG_USE_WINNT6_API)
+ 
+@@ -50,6 +50,6 @@
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ 
+-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_WINDOWS)
+ 
+ #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch
new file mode 100644
index 00000000000..35e6905b0f3
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch
@@ -0,0 +1,77 @@
+--- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp	2015-05-04 17:47:15.556740500 -0500
+@@ -79,7 +79,7 @@
+ #elif defined( BOOST_SP_HAS_SYNC )
+ # include <boost/smart_ptr/detail/atomic_count_sync.hpp>
+ 
+-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ # include <boost/smart_ptr/detail/atomic_count_win32.hpp>
+ 
+ #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+--- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp	2015-05-04 17:47:45.234509100 -0500
+@@ -32,7 +32,7 @@
+ #  include <boost/smart_ptr/detail/lwm_nop.hpp>
+ #elif defined(BOOST_HAS_PTHREADS)
+ #  include <boost/smart_ptr/detail/lwm_pthreads.hpp>
+-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ #  include <boost/smart_ptr/detail/lwm_win32_cs.hpp>
+ #else
+ // Use #define BOOST_DISABLE_THREADS to avoid the error
+--- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp	2015-05-04 17:47:45.240009800 -0500
+@@ -65,7 +65,7 @@
+ #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
+ # include <boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp>
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ # include <boost/smart_ptr/detail/sp_counted_base_w32.hpp>
+ 
+ #elif defined( _AIX )
+--- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp	2015-05-04 17:48:39.316376700 -0500
+@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch
+ # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange
+ # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ namespace boost
+ {
+--- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp	2015-05-04 17:47:45.247510800 -0500
+@@ -49,7 +49,7 @@
+ #elif defined( BOOST_SP_HAS_SYNC )
+ #  include <boost/smart_ptr/detail/spinlock_sync.hpp>
+ 
+-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ #  include <boost/smart_ptr/detail/spinlock_w32.hpp>
+ 
+ #elif defined(BOOST_HAS_PTHREADS)
+--- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp	2015-05-04 17:47:45.253511600 -0500
+@@ -47,7 +47,7 @@ extern "C" void _mm_pause();
+ 
+ //
+ 
+-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #if defined( BOOST_USE_WINDOWS_H )
+ # include <windows.h>
+--- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp	2015-05-04 23:18:21.717422600 -0500
+@@ -8,7 +8,7 @@
+ //  http://www.boost.org/LICENSE_1_0.txt
+ //
+ 
+-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #include <boost/smart_ptr/detail/sp_interlocked.hpp>
+ #include <boost/detail/lightweight_test.hpp>
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch
new file mode 100644
index 00000000000..e241f37f203
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch
@@ -0,0 +1,22 @@
+--- boost_1_57_0/boost/system/api_config.hpp	2014-08-03 15:44:11.000000000 -0500
++++ boost_1_57_0/boost/system/api_config.hpp	2015-05-04 17:51:31.189701800 -0500
+@@ -33,7 +33,7 @@
+ //    Standalone MinGW and all other known Windows compilers do predefine _WIN32
+ //    Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too.
+ 
+-# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin
++# if defined(_WIN32) // Windows default, including MinGW and Cygwin
+ #   define BOOST_WINDOWS_API
+ # else
+ #   define BOOST_POSIX_API 
+--- boost_1_57_0/boost/system/detail/error_code.ipp	2014-08-03 15:44:11.000000000 -0500
++++ boost_1_57_0/boost/system/detail/error_code.ipp	2015-05-04 17:51:02.925112700 -0500
+@@ -97,7 +97,7 @@ namespace
+       char buf[64];
+       char * bp = buf;
+       std::size_t sz = sizeof(buf);
+-  #  if defined(__CYGWIN__) || defined(__USE_GNU)
++  #  if defined(__GNU_VISIBLE) || defined(__USE_GNU)
+       // Oddball version of strerror_r
+       const char * c_str = strerror_r( ev, bp, sz );
+       return  c_str
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
new file mode 100644
index 00000000000..b60a3ac49d3
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
@@ -0,0 +1,22 @@
+diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
+index 8b2bc43..d04f2fe 100644
+--- a/libs/units/example/autoprefixes.cpp
++++ b/libs/units/example/autoprefixes.cpp
+@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
+ struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
+ {
+   static const char* name() { return("EUR"); }
+-  static const char* symbol() { return("�"); }
++  static const char* symbol() { return("€"); }
+ };
+ 
+ int main()
+@@ -140,7 +140,7 @@ int main()
+ 
+   quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
+   cout << name_format << engineering_prefix << ce << endl;  // 2.048 kiloEUR
+-  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k�
++  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k€
+ 
+ 
+     return 0;
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch
new file mode 100644
index 00000000000..15ce4007675
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch
@@ -0,0 +1,122 @@
+Index: boost/pool/pool.hpp
+===================================================================
+--- a/boost/pool/pool.hpp	(revision 78317)
++++ b/boost/pool/pool.hpp	(revision 78326)
+@@ -27,4 +27,6 @@
+ #include <boost/pool/poolfwd.hpp>
+ 
++// std::numeric_limits
++#include <boost/limits.hpp>
+ // boost::math::static_lcm
+ #include <boost/math/common_factor_ct.hpp>
+@@ -358,4 +360,13 @@
+     }
+ 
++    size_type max_chunks() const
++    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
++      size_type partition_size = alloc_size();
++      size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
++      size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
++    
++      return max_chunks;
++    }
++
+     static void * & nextof(void * const ptr)
+     { //! \returns Pointer dereferenced.
+@@ -377,5 +388,7 @@
+       //!   the first time that object needs to allocate system memory.
+       //!   The default is 32. This parameter may not be 0.
+-      //! \param nmax_size is the maximum number of chunks to allocate in one block.
++      //! \param nmax_size is the maximum number of chunks to allocate in one block.			
++      set_next_size(nnext_size);
++      set_max_size(nmax_size);
+     }
+ 
+@@ -400,7 +413,7 @@
+     }
+     void set_next_size(const size_type nnext_size)
+-    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
+-      //! \returns nnext_size.
+-      next_size = start_size = nnext_size;
++    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     
++      BOOST_USING_STD_MIN();
++      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
+     }
+     size_type get_max_size() const
+@@ -410,5 +423,6 @@
+     void set_max_size(const size_type nmax_size)
+     { //! Set max_size.
+-      max_size = nmax_size;
++      BOOST_USING_STD_MIN();
++      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
+     }
+     size_type get_requested_size() const
+@@ -713,7 +727,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -753,7 +767,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -797,4 +811,6 @@
+   //! \returns Address of chunk n if allocated ok.
+   //! \returns 0 if not enough memory for n chunks.
++  if (n > max_chunks())
++    return 0;
+ 
+   const size_type partition_size = alloc_size();
+@@ -845,7 +861,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  insert it into the list,
+Index: libs/pool/test/test_bug_6701.cpp
+===================================================================
+--- a/libs/pool/test/test_bug_6701.cpp	(revision 78326)
++++ b/libs/pool/test/test_bug_6701.cpp	(revision 78326)
+@@ -0,0 +1,27 @@
++/* Copyright (C) 2012 Étienne Dupuis
++* 
++* Use, modification and distribution is subject to the 
++* Boost Software License, Version 1.0. (See accompanying
++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
++
++#include <boost/pool/object_pool.hpp>
++#include <boost/limits.hpp>
++
++int main()
++{
++  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
++
++  void *x = p.malloc();
++  BOOST_ASSERT(!x);
++  
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
++
++  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
++  BOOST_ASSERT(!y);
++
++  return 0;
++}
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
new file mode 100644
index 00000000000..b7c91284d9b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
@@ -0,0 +1,11 @@
+diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp
+--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp	2013-07-23 00:47:27.020787174 +0200
++++ boost_1_54_0/boost/locale/boundary/segment.hpp	2013-07-23 00:50:40.382959016 +0200
+@@ -27,7 +27,6 @@ namespace boundary {
+         int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end)
+         {
+             typedef LeftIterator left_iterator;
+-            typedef RightIterator right_iterator;
+             typedef typename std::iterator_traits<left_iterator>::value_type char_type;
+             typedef std::char_traits<char_type> traits;
+             while(l_begin!=l_end && r_begin!=r_end) {
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
new file mode 100644
index 00000000000..6c1d0a021ed
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
@@ -0,0 +1,14 @@
+diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp
+--- a/boost/pool/pool.hpp~	2013-08-21 17:49:56.023296922 +0200
++++ b/boost/pool/pool.hpp	2013-08-22 11:38:01.133912638 +0200
+@@ -361,9 +361,7 @@ class pool: protected simple_segregated_
+     { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
+       size_type partition_size = alloc_size();
+       size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
+-      size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+-    
+-      return max_chunks;
++      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+     }
+ 
+     static void * & nextof(void * const ptr)
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
new file mode 100644
index 00000000000..8adf8ed2080
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
@@ -0,0 +1,15 @@
+diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp
+--- boost_1_53_0/boost/python/to_python_value.hpp~	2007-12-16 11:12:07.000000000 +0100
++++ boost_1_53_0/boost/python/to_python_value.hpp	2013-07-23 16:19:02.518904596 +0200
+@@ -147,8 +147,8 @@ namespace detail
+   template <class T>
+   inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const
+   {
+-      typedef converter::registered<argument_type> r;
+ # if BOOST_WORKAROUND(__GNUC__, < 3)
++      typedef converter::registered<argument_type> r;
+       // suppresses an ICE, somehow
+       (void)r::converters;
+ # endif 
+
+Diff finished.  Tue Jul 23 16:19:05 2013
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch
new file mode 100644
index 00000000000..cf9756e40ea
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch
@@ -0,0 +1,20 @@
+diff -up ./move/core.hpp~ ./move/core.hpp
+--- a/boost/move/core.hpp~	2015-02-09 17:33:35.000000000 +0100
++++ b/boost/move/core.hpp	2015-02-13 13:54:52.012130813 +0100
+@@ -43,6 +43,7 @@
+ #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ 
+    #include <boost/move/detail/meta_utils.hpp>
++   #include <boost/type_traits/is_class.hpp>
+ 
+    //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
+    #if defined(__GNUC__) && (__GNUC__ >= 4) && \
+@@ -65,7 +66,7 @@
+    template <class T>
+    class rv
+       : public ::boost::move_detail::if_c
+-         < ::boost::move_detail::is_class_or_union<T>::value
++         < ::boost::is_class<T>::value
+          , T
+          , ::boost::move_detail::nat
+          >::type
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch
new file mode 100644
index 00000000000..561cef19eb2
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch
@@ -0,0 +1,31 @@
+diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
+--- boost_1_57_0/boost/mpl/print.hpp~	2014-07-09 23:12:31.000000000 +0200
++++ boost_1_57_0/boost/mpl/print.hpp	2015-01-20 12:44:59.621400948 +0100
+@@ -52,16 +52,15 @@ struct print
+     enum { n = sizeof(T) + -1 };
+ #elif defined(__MWERKS__)
+     void f(int);
+-#else 
+-    enum {
+-        n =
+-# if defined(__EDG_VERSION__)
+-           aux::dependent_unsigned<T>::value > -1
+-# else 
+-           sizeof(T) > -1
+-# endif 
+-        };
+-#endif 
++#elif defined(__EDG_VERSION__)
++    enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++    enum { n1 };
++    enum { n2 };
++    enum { n = n1 != n2 };
++#else
++    enum { n = sizeof(T) > -1 };
++#endif
+ };
+ 
+ #if defined(BOOST_MSVC)
+
+Diff finished.  Tue Jan 20 12:45:03 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch
new file mode 100644
index 00000000000..57e6206bba1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch
@@ -0,0 +1,33 @@
+diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2
+--- boost_1_57_0/libs/pool/test/Jamfile.v2~	2014-07-10 06:36:10.000000000 +0200
++++ boost_1_57_0/libs/pool/test/Jamfile.v2	2015-01-20 13:59:10.818700586 +0100
+@@ -28,17 +28,17 @@ explicit valgrind_config_check ;
+ local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : <testing.launcher>"valgrind --error-exitcode=1" : <build>no ] ;
+ 
+ test-suite pool :
+-    [ run test_simple_seg_storage.cpp ]
+-    [ run test_pool_alloc.cpp ]
+-    [ run pool_msvc_compiler_bug_test.cpp ]
+-    [ run test_msvc_mem_leak_detect.cpp ]
+-    [ run test_bug_3349.cpp ]
+-    [ run test_bug_4960.cpp ]
+-    [ run test_bug_1252.cpp ]
+-    [ run test_bug_2696.cpp ]
+-    [ run test_bug_5526.cpp ]
++    [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
++    [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
+     [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ]
+-    [ run  ../example/time_pool_alloc.cpp ]
++    [ run  ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
+     [ compile test_poisoned_macros.cpp ]
+ 
+ #
+
+Diff finished.  Tue Jan 20 13:59:16 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
new file mode 100644
index 00000000000..eb9ea14011f
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
@@ -0,0 +1,10 @@
+--- a/boost/signals2/trackable.hpp
++++ b/boost/signals2/trackable.hpp
+@@ -18,6 +18,7 @@
+ 
+ #include <boost/assert.hpp>
+ #include <boost/shared_ptr.hpp>
++#include <boost/weak_ptr.hpp>
+ 
+ namespace boost {
+   namespace signals2 {
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
new file mode 100644
index 00000000000..282962987c5
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
@@ -0,0 +1,19 @@
+diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~	2014-10-13 12:21:40.000000000 +0200
++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2015-01-20 13:25:50.069710766 +0100
+@@ -282,12 +282,12 @@ struct grammar_definition
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+         typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+         typedef grammar_helper_list<GrammarT> helper_list_t;
+-        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+ 
+         helper_list_t&  helpers =
+         grammartract_helper_list::do_(self);
+ 
+ # if defined(BOOST_INTEL_CXX_VERSION)
++        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+         for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
+             (*i)->undefine(self);
+ # else
+
+Diff finished.  Tue Jan 20 13:25:53 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch
new file mode 100644
index 00000000000..30ebb981b70
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch
@@ -0,0 +1,11 @@
+--- a/boost/uuid/detail/uuid_x86.hpp
++++ b/boost/uuid/detail/uuid_x86.hpp
+@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+     cmp = (cmp - 1u) ^ cmp;
+     rcmp = (rcmp - 1u) ^ rcmp;
+ 
+-    return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp);
++    return cmp < rcmp;
+ }
+ 
+ } // namespace uuids
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 3006a5a456d..6eba16847f8 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "9";
-  sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
+  revision = "10";
+  sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb";
   extraConfigureFlags = "--with-gnump";
 })
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index c843a00b836..823e50e3227 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -21,13 +21,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ python bzip2 zlib gmp openssl boost ];
 
   configurePhase = ''
-    python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}
+    python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
   '';
 
   enableParallelBuilding = true;
 
   preInstall = ''
-    patchShebangs src/scripts
+    if [ -d src/scripts ]; then
+      patchShebangs src/scripts
+    fi
   '';
 
   postInstall = ''
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index cc2a5ebaa31..5685d261829 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "16";
-  sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
+  revision = "19";
+  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
   openssl = null;
 })
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 74875e41783..10a7ca54952 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -3,9 +3,9 @@ x@{builderDefsPackage
   , inputproto, libXi, fetchsvn, pkgconfig
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 58e7c17f249..eb68a7b9a91 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -8,13 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
-
     homepage = http://c-ares.haxx.se;
-
-    license = stdenv.lib.licenses.mit;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 0d0d5a55ae8..18a9a7aa051 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
-, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
+, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
   propagatedBuildInputs =
-    with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ]
+    with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ]
     ++ optional (!stdenv.isDarwin) libXrender
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 990d44dfef8..97636f7a957 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:
+{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
 
 stdenv.mkDerivation rec {
   name = "cairomm-1.11.2";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
+  propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
   };
 }
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index c6bd7e4f4d4..839d48e488f 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "capnproto-${version}";
-  version = "0.5.0";
+  version = "0.5.3";
 
   src = fetchurl {
     url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
-    sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7";
+    sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index d61c82bb7d3..a72532ee35b 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, bash }:
+{ stdenv, fetchurl, bash, cmake }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
-  version = "2.1.2";
+  version = "3.0.4";
 
   src = fetchurl {
-    url    = "http://www.capstone-engine.org/download/${version}/${name}.tgz";
-    sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29";
+    url    = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
+    sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
   };
 
-  buildPhase = false;
-
-  patchPhase = ''
-    substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash"
-  '';
-
-  installPhase = "PREFIX=$out ./make.sh install";
+  buildInputs = [ cmake ];
+  enableParallelBuild = true;
 
   meta = {
     description = "advanced disassembly library";
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
new file mode 100644
index 00000000000..625ec2995e3
--- /dev/null
+++ b/pkgs/development/libraries/catch/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+
+  name = "catch-${version}";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "philsquared";
+    repo = "Catch";
+    rev = "v" + version;
+    sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2";
+  };
+
+  buildInputs = [ cmake ];
+  dontUseCmakeConfigure = true;
+
+  buildPhase = ''
+    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release
+    cd Build
+    make
+    cd ..
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv include $out/.
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
+    homepage = "http://catch-lib.net";
+    license = licenses.boost;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+}
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix
index 5105bd29876..5574e18ffa0 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/pkgs/development/libraries/ccrtp/1.8.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # fails to compile with libgcrypt >= 1.6
   };
 }
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
new file mode 100644
index 00000000000..f998f464457
--- /dev/null
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, ncurses}:
+let
+  buildInputs = [
+    ncurses
+  ];
+in
+stdenv.mkDerivation {
+  name = "cdk";
+  inherit buildInputs;
+  src = fetchurl {
+    url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
+    sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp";
+  };
+  meta = {
+    description = ''Curses development kit'';
+    license = stdenv.lib.licenses.bsdOriginal ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 5273e88763a..3841878341c 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv }:
 
-let version = "0.9.14"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "check-${version}";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
-    sha256 = "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2";
+    sha256 = "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm";
   };
 
   # Test can randomly fail: http://hydra.nixos.org/build/7243912
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Unit testing framework for C";
 
     longDescription =
@@ -26,6 +26,8 @@ stdenv.mkDerivation {
 
     homepage = http://check.sourceforge.net/;
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 63c5959960a..52990097a23 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -1,39 +1,29 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto
+, inputproto, libXi, libXmu
+}:
+
+stdenv.mkDerivation rec {
+  name = "chipmunk-${version}";
+  majorVersion = "7";
+  version = "${majorVersion}.0.0";
 
-  version = lib.attrByPath ["version"] "6.1.5" args;
-  majorVersion = lib.attrByPath ["majorVersion"] "6" args;
-  buildInputs = with args; [
-    cmake freeglut mesa
-    libX11 xproto inputproto libXi libXmu
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
-    sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7";
+    url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
+    sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-  
-  /* doConfigure should be specified separately */
-  phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
-
-  genMakefile = fullDepEntry ''
-    cmake -D CMAKE_INSTALL_PREFIX=$out . 
-  '' ["minInit" "addInputs" "doUnpack"];
+  buildInputs =
+    [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ];
 
-  demoInstall = fullDepEntry(''
+  postInstall = ''
     mkdir -p $out/bin
-    cp Demo/chipmunk_demos $out/bin
-  '') ["doMakeInstall" "defEnsureDir"];
-      
-  name = "chipmunk-" + version;
-  meta = {
-    description = "2D physics engine";
+    cp demo/chipmunk_demos $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fast and lightweight 2D game physics library";
+    homepage = http://chipmunk2d.net/;
+    license = licenses.mit;
+    platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work
   };
 }
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
new file mode 100644
index 00000000000..ccd93828319
--- /dev/null
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -0,0 +1,63 @@
+{ fetchurl, stdenv, gmp, isl }:
+
+stdenv.mkDerivation rec {
+  name = "cloog-0.18.0";
+
+  src = fetchurl {
+    url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
+    sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228";
+  };
+
+  buildInputs = [ gmp ];
+
+  propagatedBuildInputs = [ isl ];
+
+  configureFlags = [ "--with-isl=system" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = {
+    description = "Library that generates loops for scanning polyhedra";
+
+    longDescription = ''
+      CLooG is a free software library to generate code for scanning
+      Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that
+      reaches each integral point of one or more parameterized polyhedra.
+      CLooG has been originally written to solve the code generation problem
+      for optimizing compilers based on the polytope model.  Nevertheless it
+      is used now in various area e.g., to build control automata for
+      high-level synthesis or to find the best polynomial approximation of a
+      function.  CLooG may help in any situation where scanning polyhedra
+      matters.  While the user has full control on generated code quality,
+      CLooG is designed to avoid control overhead and to produce a very
+      effective code.
+    '';
+
+    homepage = http://www.cloog.org/;
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    /* Leads to an ICE on Cygwin:
+
+       make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
+       /bin/sh ../libtool --tag=CXX   --mode=compile g++ -DHAVE_CONFIG_H -I. -I..  -I.. -I../src    -g -O2 -frounding-math  -W -Wall -c -o Box.lo Box.cc
+       libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc  -DDLL_EXPORT -DPIC -o .libs/Box.o
+       In file included from checked.defs.hh:595,
+                        from Checked_Number.defs.hh:27,
+                        from Coefficient.types.hh:15,
+                        from Coefficient.defs.hh:26,
+                        from Box.defs.hh:28,
+                        from Box.cc:24:
+       checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)':
+       checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719
+       Please submit a full bug report,
+       with preprocessed source if appropriate.
+       See <URL:http://cygwin.com/problems.html> for instructions.
+       make[3]: *** [Box.lo] Error 1
+
+    */
+    platforms = with stdenv.lib.platforms; allBut cygwin;
+  };
+}
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 629cdba1fd4..55f70597170 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     /* Leads to an ICE on Cygwin:
 
        make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.24.nix
index 7a9d114ce8e..b9d45b6c62b 100644
--- a/pkgs/development/libraries/clutter/1.18.nix
+++ b/pkgs/development/libraries/clutter/1.24.nix
@@ -4,15 +4,15 @@ gobjectIntrospection
 }:
 
 let
-  ver_maj = "1.18";
-  ver_min = "2";
+  ver_maj = "1.24";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
+    sha256 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -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
index 1489f48c9b4..5eb12fe2998 100644
--- a/pkgs/development/libraries/cogl/1.20.nix
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-introspection"
-    "--enable-gles1"
-    "--enable-gles2"
     "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk_pixbuf gobjectIntrospection
diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.22.nix
index f6927770d86..ce4fda5bd46 100644
--- a/pkgs/development/libraries/cogl/1.18.nix
+++ b/pkgs/development/libraries/cogl/1.22.nix
@@ -3,7 +3,7 @@
 , gstreamerSupport ? true, gst_all_1 }:
 
 let
-  ver_maj = "1.18";
+  ver_maj = "1.22";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -11,17 +11,16 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
-    sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4";
+    sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [
     "--enable-introspection"
-    "--enable-gles1"
-    "--enable-gles2"
     "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk_pixbuf gobjectIntrospection
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 2f088b4d304..685d095a818 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cmake, boost, openssl }:
 
 let
-  version = "0.11.0";
+  version = "0.11.2";
 in
 
 stdenv.mkDerivation rec {
   name = "cpp-netlib-${version}";
 
   src = fetchurl {
-    url = "http://commondatastorage.googleapis.com/cpp-netlib-downloads/${version}/${name}.tar.bz2";
-    md5 = "0765cf203f451394df98e6ddf7bf2541";
+    url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
+    sha256 = "0vwnp1jpvsdjaz7f7w55p7gw6hj7694nklmljcvphvkrhbw1g1q5";
   };
 
   buildInputs = [ cmake boost openssl ];
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;
-    maintainers = with maintainers; [ shlevy ];
     platforms   = platforms.all;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
new file mode 100644
index 00000000000..8bffeebd024
--- /dev/null
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "cpptest-1.1.2";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz";
+    sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://cpptest.sourceforge.net/;
+    description = "Simple C++ unit testing framework";
+    maintainers = with maintainers; [ bosu ];
+    license = stdenv.lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index fc2d04e649b..282ad7bfcd7 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq";
+  name = "cppzmq-2015-07-06";
 
   src = fetchgit {
-    url = "git://github.com/zeromq/cppzmq";
-    rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a";
-    sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398";
+    url = "https://github.com/zeromq/cppzmq";
+    rev = "a88bf3e0b0bc6ed5f5b25a58f8997a1dae374c8b";
+    sha256 = "75a6630b870c1f0d5b9d6a0ba03e83ceee47aaa2a253894e75a8a93a6d65d3aa";
   };
 
   installPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/zeromq/cppzmq;
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch
new file mode 100644
index 00000000000..48fdfe42048
--- /dev/null
+++ b/pkgs/development/libraries/crypto++/GNUmakefile.patch
@@ -0,0 +1,13 @@
+--- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500
++++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500
+@@ -87,8 +87,8 @@
+ endif
+
+ ifeq ($(UNAME),Darwin)
+-AR = libtool
+-ARFLAGS = -static -o
++AR = ar
++ARFLAGS = cru
+ CXX = c++
+ IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932)
+ ifeq ($(IS_GCC2),1)
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index cf22a775b14..788d488659a 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, libtool }:
+{ fetchurl, stdenv, unzip }:
 
 stdenv.mkDerivation rec {
   name = "crypto++-5.6.2";
@@ -8,44 +8,38 @@ stdenv.mkDerivation rec {
     sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw";
   };
 
-  patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch;
-
-  buildInputs = [ unzip libtool ];
-
-  # Unpack the thing in a subdirectory.
-  unpackPhase = ''
-    echo "unpacking Crypto++ to \`${name}' from \`$PWD'..."
-    mkdir "${name}" && (cd "${name}" && unzip "$src")
-    sourceRoot="$PWD/${name}"
-  '';
-
-  cxxflags = if stdenv.isi686 then "-march=i686" else
-             if stdenv.isx86_64 then "-march=nocona -fPIC" else
-             "";
-
-  configurePhase = ''
-    sed -i GNUmakefile \
-      -e 's|-march=native|${cxxflags}|g' \
-      -e 's|-mtune=native||g' \
-      -e '/^CXXFLAGS =/s|-g -O2|-O3|'
-  '';
-
-  # I add what 'enableParallelBuilding' would add to the make call,
-  # if we were using the generic build phase.
-  buildPhase = ''
-    make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
-  '';
-
-  # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run
-  # that binary during this build anyway to verify everything works.
-  installPhase = ''
-    mkdir "$out"
-    make install PREFIX="$out"
-  '';
+  patches = with stdenv;
+    lib.optional (system != "i686-cygwin") ./dll.patch
+    ++ lib.optional isDarwin ./GNUmakefile.patch;
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  configurePhase = let
+    marchflags =
+      if stdenv.isi686 then "-march=i686" else
+      if stdenv.isx86_64 then "-march=nocona -mtune=generic" else
+      "";
+    in
+    ''
+      sed -i GNUmakefile \
+        -e 's|-march=native|${marchflags} -fPIC|g' \
+        -e 's|-mtune=native||g' \
+        -e '/^CXXFLAGS =/s|-g ||'
+    '';
+
+  enableParallelBuilding = true;
+
+  makeFlags = "PREFIX=$(out)";
+  buildFlags = "libcryptopp.so";
 
   doCheck = true;
   checkPhase = "LD_LIBRARY_PATH=`pwd` make test";
 
+  # prefer -fPIC and .so to .a; cryptotest.exe seems superfluous
+  postInstall = ''rm "$out"/lib/*.a -r "$out/bin" '';
+
   meta = with stdenv.lib; {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
@@ -54,3 +48,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
   };
 }
+
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
new file mode 100644
index 00000000000..ab5cd2beff3
--- /dev/null
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, gcc48 }:
+
+stdenv.mkDerivation rec {
+  name = "ctpp2";
+  version = "2.8.3";
+
+  src = fetchurl {
+    url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz";
+    sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
+  };
+
+  buildInputs = [ cmake gcc48 ];
+
+  patchPhase = ''
+    # include <unistd.h> to fix undefined getcwd
+    sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp
+  '';
+
+  meta = {
+    description = "A high performance templating engine";
+    homepage = http://ctpp.havoc.ru;
+    maintiainers = with stdenv.lib.maintainers; [ robbinch ];
+  };
+}
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
new file mode 100644
index 00000000000..a86bdc8e035
--- /dev/null
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }:
+
+stdenv.mkDerivation rec {
+    name = "cwiid-2010-02-21-git";
+    src = fetchgit {
+        url = https://github.com/abstrakraft/cwiid;
+        sha256 = "6f5355d036dab017da713c49d3042011fa24fb732ed0d5ee338ab6f5ff400f06";
+        rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
+    };
+    configureFlags = "--without-python";
+    prePatch = ''
+        sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
+    '';
+    buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ];
+    postInstall = ''
+        # Some programs (for example, cabal-install) have problems with the double 0
+        sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
+    '';
+    meta = {
+        description = "Linux Nintendo Wiimote interface";
+        homepage = http://cwiid.org;
+        license = stdenv.lib.licenses.gpl2Plus;
+        maintainers = [ stdenv.lib.maintainers.bennofs ];
+        platforms = stdenv.lib.platforms.linux; 
+    };   
+}
diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix
index 69ef08b91d9..5e2081e750d 100644
--- a/pkgs/development/libraries/czmq/default.nix
+++ b/pkgs/development/libraries/czmq/default.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation rec {
   baseName="czmq";
-  version="3.0.0-rc1";
+  version="3.0.2";
   name="${baseName}-${version}";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9";
+    sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
   };
 
-  buildInputs = [ zeromq ];
+  # Needs to be propagated for the .pc file to work
+  propagatedBuildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
     homepage = "http://czmq.zeromq.org/";
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 013a7fd35b9..077bd4e03a3 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
+    "--enable-dbm"
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 00b302bde8d..480dc61897b 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ expat libiconv ];
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 087df1a7151..4a0f98d262a 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -7,8 +7,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.8.16";
-  sha256 = "01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz";
+  version = "1.8.20";
+  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
 
   inherit (stdenv) lib;
 
@@ -76,7 +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;
+    meta.platforms = stdenv.lib.platforms.all;
   };
 
 
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
new file mode 100644
index 00000000000..6207f3d2038
--- /dev/null
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "dclxvi-2013-01-27";
+
+  src = fetchFromGitHub {
+    owner = "agl";
+    repo = "dclxvi";
+    rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2";
+    sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g";
+  };
+
+  buildFlags = [ "libdclxvipairing.so" ];
+
+  installPhase = ''
+    mkdir -p $out/{include,lib}
+    find . -name \*.h -exec cp {} $out/include \;
+    find . -name \*.so -exec cp {} $out/lib \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/agl/dclxvi";
+    description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.x86_64;
+  };
+}
diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix
index 172a823cfdc..2cb241b0427 100644
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao,
+  stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao,
   libtool, ncurses, glibc
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc
+    openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc
   ];
 
   configurePhase = "cd src";
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index 81c23f7e41c..b4dd865dec0 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
-, enableX11 ? true, xlibs
+, enableX11 ? true, xorg
 , enableSDL ? true, SDL }:
 
 let s = 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
     ++ stdenv.lib.optional enableSDL SDL
-    ++ stdenv.lib.optionals enableX11 (with xlibs; [
+    ++ stdenv.lib.optionals enableX11 (with xorg; [
       xproto libX11 libXext #xextproto
       #renderproto libXrender
     ]);
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 0d262fb061e..8a24445dcca 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, x11 }:
+{ stdenv, fetchurl, cmake, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   version = "18.10";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   '';   
 
   enableParallelBuilding = true;
-  buildInputs = [ cmake x11 ];
-  propagatedBuildInputs = [ x11 ];
+  buildInputs = [ cmake xlibsWrapper ];
+  propagatedBuildInputs = [ xlibsWrapper ];
 
   meta = with stdenv.lib; {
     description = "A general purpose cross-platform C++ machine learning library";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 07f11d9fa39..049a799c44f 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
 
   src = fetchFromGitHub {
-    owner = "floitsch";
+    owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
     sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
-    homepage = https://github.com/floitsch/double-conversion;
+    homepage = https://github.com/google/double-conversion;
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index ae276c6aa0a..a544baf7d6d 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+  , ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
   , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
   , ...}:
 builderDefsPackage
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 90f50037dce..0e43b9fb602 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.2.4";
+  version = "3.2.5";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "19c6as664a3kxvkhas2cq19r6ag19jw9lcz04sc0kza6i1hlh9xv";
+    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
   };
   
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index a1b0d87cdfd..66039daa479 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -1,30 +1,26 @@
-{ stdenv, fetchurl, autoconf, autogen, automake, gettext, libX11
-, mesa, pkgconfig, python, utilmacros
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python
+, mesa, libX11
 }:
 
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
-  version = "1.2";
+  version = "1.3.1";
 
-  src = fetchurl {
-    url = "https://github.com/anholt/libepoxy/archive/v${version}.tar.gz";
-    sha256 = "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2";
+  src = fetchFromGitHub {
+    owner = "anholt";
+    repo = "libepoxy";
+    rev = "v${version}";
+    sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";
   };
 
-  buildInputs = [
-    autoconf autogen automake gettext libX11 mesa pkgconfig python
-    utilmacros
-  ];
-
-  configureScript = ''
-    ./autogen.sh --prefix="$out"
-  '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
+  buildInputs = [ mesa libX11 ];
 
   meta = with stdenv.lib; {
     description = "A library for handling OpenGL function pointer management";
     homepage = https://github.com/anholt/libepoxy;
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index e941f0f6547..e7a3bd49513 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
   };
 
-  configureFlags = [ "--with-boost=${boost.dev}" ];
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+  ];
 
   buildInputs = [ expat zlib boost ];
 
diff --git a/pkgs/development/libraries/expat/CVE-2015-1283.patch b/pkgs/development/libraries/expat/CVE-2015-1283.patch
new file mode 100644
index 00000000000..33b975912d4
--- /dev/null
+++ b/pkgs/development/libraries/expat/CVE-2015-1283.patch
@@ -0,0 +1,77 @@
+Found at https://hg.mozilla.org/releases/mozilla-esr31/rev/2f3e78643f5c on 2015-07-27.  Modified: replaced path parser/expat/lib/xmlparse.c with lib/xmlparse.c.
+diff --git a/lib/xmlparse.c b/lib/xmlparse.c
+--- a/lib/xmlparse.c
++++ b/lib/xmlparse.c
+@@ -1646,29 +1646,40 @@ XML_ParseBuffer(XML_Parser parser, int l
+   XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
+   positionPtr = bufferPtr;
+   return result;
+ }
+ 
+ void * XMLCALL
+ XML_GetBuffer(XML_Parser parser, int len)
+ {
++/* BEGIN MOZILLA CHANGE (sanity check len) */
++  if (len < 0) {
++    errorCode = XML_ERROR_NO_MEMORY;
++    return NULL;
++  }
++/* END MOZILLA CHANGE */
+   switch (ps_parsing) {
+   case XML_SUSPENDED:
+     errorCode = XML_ERROR_SUSPENDED;
+     return NULL;
+   case XML_FINISHED:
+     errorCode = XML_ERROR_FINISHED;
+     return NULL;
+   default: ;
+   }
+ 
+   if (len > bufferLim - bufferEnd) {
+-    /* FIXME avoid integer overflow */
+     int neededSize = len + (int)(bufferEnd - bufferPtr);
++/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
++    if (neededSize < 0) {
++      errorCode = XML_ERROR_NO_MEMORY;
++      return NULL;
++    }
++/* END MOZILLA CHANGE */
+ #ifdef XML_CONTEXT_BYTES
+     int keep = (int)(bufferPtr - buffer);
+ 
+     if (keep > XML_CONTEXT_BYTES)
+       keep = XML_CONTEXT_BYTES;
+     neededSize += keep;
+ #endif  /* defined XML_CONTEXT_BYTES */
+     if (neededSize  <= bufferLim - buffer) {
+@@ -1687,17 +1698,25 @@ XML_GetBuffer(XML_Parser parser, int len
+     }
+     else {
+       char *newBuf;
+       int bufferSize = (int)(bufferLim - bufferPtr);
+       if (bufferSize == 0)
+         bufferSize = INIT_BUFFER_SIZE;
+       do {
+         bufferSize *= 2;
+-      } while (bufferSize < neededSize);
++/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
++      } while (bufferSize < neededSize && bufferSize > 0);
++/* END MOZILLA CHANGE */
++/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
++      if (bufferSize <= 0) {
++        errorCode = XML_ERROR_NO_MEMORY;
++        return NULL;
++      }
++/* END MOZILLA CHANGE */
+       newBuf = (char *)MALLOC(bufferSize);
+       if (newBuf == 0) {
+         errorCode = XML_ERROR_NO_MEMORY;
+         return NULL;
+       }
+       bufferLim = newBuf + bufferSize;
+ #ifdef XML_CONTEXT_BYTES
+       if (bufferPtr) {
+
+
+
+
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 9a49225d172..05cfeaee423 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
   };
 
+  patches = [ ./CVE-2015-1283.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index f75c2117084..6808ea52adf 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   postInstall = "ln -s . $out/include/fastcgi";
 
   meta = with stdenv.lib; {
-    description = "FastCGI  is a language independent, scalable, open extension to CG";
+    description = "A language independent, scalable, open extension to CG";
     homepage = http://www.fastcgi.com/;
     license = "FastCGI see LICENSE.TERMS";
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
new file mode 100644
index 00000000000..5f7d61f3601
--- /dev/null
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, cmake, boost }:
+
+stdenv.mkDerivation rec {
+  name = "fcppt-1.3.0";
+
+  src = fetchgit {
+    url = https://github.com/freundlich/fcppt.git;
+    rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851";
+    sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy";
+  };
+
+  buildInputs = [ cmake boost ];
+
+  cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Freundlich's C++ toolkit";
+    longDescription = ''
+      Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on improving general C++ code by providing better types, a strong focus on C++11 (non-conforming compilers are mostly not supported) and functional programming (which is both efficient and syntactically affordable in C++11).
+    '';
+    homepage = http://fcppt.org;
+    license = stdenv.lib.licenses.boost;
+    maintainers = with stdenv.lib.maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index e674ef0b97b..654741283f9 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -67,7 +67,7 @@
 , gnutls ? null
 , gsm ? null # GSM de/encoder
 #, ilbc ? null # iLBC de/encoder
-, jack2 ? null # Jack audio (only version 2 is supported in this build)
+, libjack2 ? null # Jack audio (only version 2 is supported in this build)
 , ladspaH ? null # LADSPA audio filtering
 , lame ? null # LAME MP3 encoder
 , libass ? null # (Advanced) SubStation Alpha subtitle rendering
@@ -108,7 +108,7 @@
 #, openh264 ? null # H.264/AVC encoder
 , openjpeg_1 ? null # JPEG 2000 de/encoder
 , opensslExtlib ? false, openssl ? null
-, pulseaudio ? null # Pulseaudio input support
+, libpulseaudio ? null # Pulseaudio input support
 , rtmpdump ? null # RTMP[E] support
 #, libquvi ? null # Quvi input support
 , samba ? null # Samba protocol
@@ -157,7 +157,7 @@
  *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
  *
  * Need fixes to support Darwin:
- *   frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
+ *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
  *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
  *
  * Not supported:
@@ -230,12 +230,12 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-${version}";
-  version = "2.6.1";
+  name = "ffmpeg-full-${version}";
+  version = "2.7.2";
 
   src = fetchurl {
-    url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
+    url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
+    sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
   };
 
   patchPhase = ''patchShebangs .'';
@@ -253,7 +253,7 @@ stdenv.mkDerivation rec {
     # On some ARM platforms --enable-thumb
     "--enable-shared --disable-static"
     (enableFeature true "pic")
-    (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null)
+    (if stdenv.cc.isClang then "--cc=clang" else null)
     (enableFeature smallBuild "small")
     (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
     (enableFeature grayBuild "gray")
@@ -361,7 +361,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (openh264 != null) "openh264")
     (enableFeature (openjpeg_1 != null) "libopenjpeg")
     (enableFeature (opensslExtlib && gplLicensing) "openssl")
-    (enableFeature (pulseaudio != null) "libpulse")
+    (enableFeature (libpulseaudio != null) "libpulse")
     #(enableFeature quvi "libquvi")
     (enableFeature (rtmpdump != null) "librtmp")
     #(enableFeature (schroedinger != null) "libschroedinger")
@@ -397,9 +397,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
-    jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
+    libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump
+    libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
     samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
   ] ++ optional openglExtlib mesa
     ++ optionals x11grabExtlib [ libXext libXfixes ]
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index bad142f6f96..b008151d6cb 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.15";
+  version = "${branch}.16";
   branch = "0.10";
-  sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb";
+  sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77";
 })
diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix
deleted file mode 100644
index abdb2666877..00000000000
--- a/pkgs/development/libraries/ffmpeg/0.11.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.5";
-  branch = "0.11";
-  sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll";
-})
diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix
index e382fe7154d..fbbb75cb832 100644
--- a/pkgs/development/libraries/ffmpeg/2.2.nix
+++ b/pkgs/development/libraries/ffmpeg/2.2.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.13";
+  version = "${branch}.15";
   branch = "2.2";
-  sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0";
+  sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4";
 })
diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix
index 9e097ddfebb..60fc32e030e 100644
--- a/pkgs/development/libraries/ffmpeg/2.6.nix
+++ b/pkgs/development/libraries/ffmpeg/2.6.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.1";
+  version = "${branch}.3";
   branch = "2.6";
-  sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
+  sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
 })
diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix
new file mode 100644
index 00000000000..105239c48c9
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.7.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.2";
+  branch = "2.7";
+  sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
+})
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 1f127d948af..99d8fe679ab 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
-, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora
-, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264
-, xvidcore, zlib
+, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
+, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr
+, x264, xvidcore, zlib
 , openglSupport ? false, mesa ? null
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
        else
          "--disable-pthreads --disable-w32threads")
       (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2
+      "--enable-network"
       (ifMinVer "2.4" "--enable-pixelutils")
     # Executables
       "--enable-ffmpeg"
@@ -105,6 +106,7 @@ stdenv.mkDerivation rec {
       (ifMinVer "0.6" "--disable-doc")
     # External Libraries
       "--enable-bzlib"
+      "--enable-gnutls"
       (ifMinVer "1.0" "--enable-fontconfig")
       (ifMinVer "0.7" "--enable-libfreetype")
       "--enable-libmp3lame"
@@ -129,15 +131,15 @@ stdenv.mkDerivation rec {
       "--disable-stripping"
     # Disable mmx support for 0.6.90
       (verFix null "0.6.90" "--disable-mmx")
-  ] ++ optional (stdenv.cc.cc.isClang or false) "--cc=clang";
+  ] ++ optional stdenv.cc.isClang "--cc=clang";
 
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
 
   buildInputs = [
-    bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau
-    libvorbis lzma SDL soxr x264 xvidcore zlib
+    bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
+    libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
   ] ++ optional openglSupport mesa
-    ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
+    ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin
     ++ optional (isLinux || isFreeBSD) libva
     ++ optional isLinux alsaLib;
 
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
new file mode 100644
index 00000000000..df1c532f633
--- /dev/null
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -0,0 +1,31 @@
+{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "ffmpegthumbnailer-${version}";
+  version = "2.0.10";
+
+  src = fetchurl {
+    url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2";
+    sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3";
+  };
+
+  buildInputs = [ ffmpeg cmake libpng pkgconfig ];
+
+  meta = with stdenv.lib;  {
+    homepage = https://github.com/dirkvdb/ffmpegthumbnailer;
+    description = "A lightweight video thumbnailer";
+    longDescription = "FFmpegthumbnailer is a lightweight video 
+        thumbnailer that can be used by file managers to create thumbnails
+        for your video files. The thumbnailer uses ffmpeg o decode frames
+        from the video files, so supported videoformats depend on the
+        configuration flags of ffmpeg.
+        This thumbnailer was designed to be as fast and lightweight as possible.
+        The only dependencies are ffmpeg and libpng.
+    ";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jagajaga ];
+  };
+
+}
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 8d5166a7743..aa383b0c73a 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ optional (precision != "double") "--enable-${precision}"
     # all x86_64 have sse2
     ++ optional stdenv.isx86_64 "--enable-sse2"
-    ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp";
+    ++ optional stdenv.cc.isGNU "--enable-openmp";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
new file mode 100644
index 00000000000..989d9518a0e
--- /dev/null
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "filter-audio-20150624";
+
+  src = fetchgit {
+    url = "https://github.com/irungentoo/filter_audio.git";
+    rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
+    sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
+  };
+
+  doCheck = false;
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Lightweight audio filtering library made from webrtc code";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ viric jgeerds ];
+    platforms = platforms.all;
+  };
+}
+
+
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index d51419f3754..6398e5542ac 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
 , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
 
 let inherit (composableDerivation) edf; in
@@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec {
     sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
   };
 
-  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
+  propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
 
   buildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index 8fb4d40b1db..cb71724a360 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -1,21 +1,27 @@
-{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
 , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
-
+, cfg ? {}
 , automake, autoconf, libtool
 }:
 
 let inherit (composableDerivation) edf; in
 
-let version = "1.3.2"; in
+let version = "1.3.3"; in
 composableDerivation.composableDerivation {} {
   name = "fltk-${version}";
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
-    sha256 = "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p";
+    sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq";
   };
 
-  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
+  # http://www.fltk.org/str.php?L3156
+  postPatch = ''
+    substituteInPlace FL/x.H \
+      --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
+  '';
+
+  propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
 
   enableParallelBilding = true;
 
@@ -48,7 +54,7 @@ composableDerivation.composableDerivation {} {
     localpngSupport = false;
     sharedSupport = true;
     threadsSupport = true;
-  };
+  } // cfg;
 
   meta = {
     description = "A C++ cross-platform light-weight GUI library binding";
@@ -56,9 +62,5 @@ composableDerivation.composableDerivation {} {
   };
 
   patches = [
-    # https://bugs.archlinux.org/task/36186
-    (fetchurl {
-    url = "https://bugs.archlinux.org/task/36186?getfile=10750";
-    sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj";
-  }) ];
+     ];
 }
diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix
new file mode 100644
index 00000000000..d1768d656b4
--- /dev/null
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl }:
+
+assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
+let
+  bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+  patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
+
+  src =
+    (if (bits == "64") then
+      fetchurl {
+        url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz";
+        sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y";
+      }
+    else
+      fetchurl {
+        url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz";
+        sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5";
+      }
+    );
+in
+stdenv.mkDerivation rec {
+  inherit src;
+
+  name    = "fmod-${version}";
+  version = "4.24.16";
+
+  dontStrip = true;
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/lib $out/include/fmodex
+
+    cd api/inc && cp * $out/include/fmodex && cd ../lib
+    cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so
+    cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so
+
+    ${patchLib "$out/lib/libfmodex.so"}
+    ${patchLib "$out/lib/libfmodexL.so"}
+  '';
+
+  meta = {
+    description = "Programming library and toolkit for the creation and playback of interactive audio";
+    homepage    = "http://www.fmod.org/";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 180de724d95..4659ba21123 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,19 +2,18 @@
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.32.0";
+  version = "2015-09-17";
   name = "folly-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
-    rev = "v${version}";
-    sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh";
+    rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3";
+    sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb";
   };
 
-  buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
-
-  nativeBuildInputs = [ autoreconfHook python boost ];
+  nativeBuildInputs = [ autoreconfHook python ];
+  buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/folly";
   preBuild = ''
@@ -31,6 +30,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     # 32bit is not supported: https://github.com/facebook/folly/issues/103
     platforms = [ "x86_64-linux" ];
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index dfd2c75184e..2d44444ab40 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
+{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
 
 let
   version = "1.7.9";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
   };
 
-  buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
+  buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 604fe3c2fdf..3c823adf91b 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
+{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
 , libXrandr, mesa, libXft, libXfixes, xinput }:
 
 let
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
   };
 
-  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+  buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
       libXft mesa libXfixes xinput ];
 
   doCheck = true;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.6";
-    description = "FOX is a C++ based class library for building Graphical User Interfaces";
+    description = "A C++ based class library for building Graphical User Interfaces";
     longDescription = ''
         FOX stands for Free Objects for X.
         It is a C++ based class library for building Graphical User Interfaces.
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 86ebaa0d8d9..fa8e9f0ef2c 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-,  stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }:
+,  stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }:
 
 stdenv.mkDerivation rec {
   name = "frame-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ 
     stdenv pkgconfig
-  ] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi];
+  ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
 
   configureFlags = stdenv.lib.optional enableX11 "--with-x11";
 
diff --git a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
deleted file mode 100644
index b11a50a9de1..00000000000
--- a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001
-From: Florian Friesdorf <flo@chaoflow.net>
-Date: Wed, 4 Jan 2012 23:12:44 +0100
-Subject: [PATCH] remove typedefs now living in mesa
-
----
- progs/demos/smooth_opengl3/smooth_opengl3.c |   20 --------------------
- 1 files changed, 0 insertions(+), 20 deletions(-)
-
-diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
-index abbdfb5..1172615 100755
---- a/progs/demos/smooth_opengl3/smooth_opengl3.c
-+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
-@@ -98,26 +98,6 @@ typedef char ourGLchar;
- #define APIENTRY
- #endif
- 
--typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
--typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
--typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
--typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
--typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
--typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
--typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
--typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
--typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
--typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
--typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
--typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
--typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
--typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
--typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
--typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
--typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
--typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
--typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
--
- PFNGLGENBUFFERSPROC gl_GenBuffers;
- PFNGLBINDBUFFERPROC gl_BindBuffer;
- PFNGLBUFFERDATAPROC gl_BufferData;
--- 
-1.7.8
-
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 73e7e2ccce5..368a1e27487 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, lib, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, autoreconfHook }:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }:
 
-let version = "2.8.1";
+let version = "3.0.0";
 in stdenv.mkDerivation {
   name = "freeglut-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
-    sha256 = "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x";
+    sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
   };
 
-  buildInputs = [
-    libXi libXrandr libXxf86vm mesa x11
-  ] ++ lib.optionals stdenv.isDarwin [
-    autoreconfHook
-  ];
+  buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ];
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace Makefile.am --replace \
-      "SUBDIRS = src include progs doc" \
-      "SUBDIRS = src include doc"
-  '';
-
-  configureFlags = [ "--enable-warnings" ];
-
-  # patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
+  meta = with stdenv.lib; {
+    description = "Create and manage windows containing OpenGL contexts";
+    longDescription = ''
+      FreeGLUT is an open source alternative to the OpenGL Utility Toolkit
+      (GLUT) library. GLUT (and hence FreeGLUT) allows the user to create and
+      manage windows containing OpenGL contexts on a wide range of platforms
+      and also read the mouse, keyboard and joystick functions. FreeGLUT is
+      intended to be a full replacement for GLUT, and has only a few
+      differences.
+    '';
+    homepage = http://freeglut.sourceforge.net/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
new file mode 100644
index 00000000000..d0fba6ed821
--- /dev/null
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }:
+
+stdenv.mkDerivation rec {
+  name = "freenect-${version}";
+  version = "0.5.2";
+
+  src = fetchzip {
+    url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
+    sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
+  };
+
+  buildInputs = [ libusb freeglut mesa libXi libXmu ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = {
+    description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
+    inherit version;
+    homepage = http://openkinect.org;
+    license = with stdenv.lib.licenses; [ gpl2 asl20 ];
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 3980c5b61b3..695abcfbba2 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -3,11 +3,11 @@
 
 assert odbcSupport -> unixODBC != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "freetds-0.91";
 
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz;
+    url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz";
     sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
   };
 
@@ -30,4 +30,3 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 0b22aa501e6..e6b1875a9e0 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch;
+    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch;
 
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 6639f2e498b..eef89e9cff6 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, graphviz, gtk, gtkmm, pkgconfig, python }:
+{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "ganv-${version}";
-  version = "1.4.2";
+  name = "ganv-svn-${rev}";
+  rev = "5675";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/ganv";
+    rev = rev;
+    sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj";
   };
 
   buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index fe7d0869fbd..6e1ada69039 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.2";
+  version = "2.0.0";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
+    sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6";
   };
 
-  buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
+  buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
+  ++ (with pythonPackages; [ python numpy wrapPython ]);
 
   patches = [
     # This ensures that the python package is installed into gdal's prefix,
@@ -44,11 +45,15 @@ composableDerivation.composableDerivation {} (fixed: rec {
   #   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
+    pythonInstallDir=$out/lib/${pythonPackages.python.libPrefix}/site-packages
     mkdir -p $pythonInstallDir
     export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
   '';
 
+  postInstall = ''
+    wrapPythonPrograms
+  '';
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11_2.nix
new file mode 100644
index 00000000000..fe7d0869fbd
--- /dev/null
+++ b/pkgs/development/libraries/gdal/gdal-1_11_2.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, libpng }:
+
+composableDerivation.composableDerivation {} (fixed: rec {
+  version = "1.11.2";
+  name = "gdal-${version}";
+
+  src = fetchurl {
+    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
+    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
+  };
+
+  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";
+
+  configureFlags = [
+    "--with-jpeg=${libjpeg}"
+    "--with-libtiff=${libtiff}" # optional (without largetiff support)
+    "--with-libpng=${libpng}"   # optional
+    "--with-libz=${zlib}"       # optional
+
+    "--with-pg=${postgresql}/bin/pg_config"
+    "--with-mysql=${mysql.lib}/bin/mysql_config"
+    "--with-geotiff=${libgeotiff}"
+    "--with-python"               # optional
+    "--with-static-proj4=${proj}" # optional
+    "--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/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 69d39855699..626fb2627b3 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11
-, jasper, libintlOrEmpty, gobjectIntrospection }:
+, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
 
 let
-  ver_maj = "2.31";
-  ver_min = "3";
+  ver_maj = "2.32";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc";
+    sha256 = "0rqvj5gcs2zfyyg9llm289b0xkj4mrhzxfjpjja0wx1m6vn5axjk";
   };
 
   outputs = [ "dev" "out" "bin" "doc" ];
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
     ;
 
-  doCheck = true;
+  # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
+  inherit (doCheck);
 
   # propagate the bin output
   postPhases = "postPostFixup";
diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
index 06e820633b8..ba7ab82f50b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@@ -1,23 +1,15 @@
 findGdkPixbufLoaders() {
 
-	if [ -n "$out" ] && [ -z "$IN_NIX_SHELL" ]; then
-
-		# set pixbuf loaders.cache for this package
-
-		local loadersDir="$out/lib/gdk-pixbuf-loaders-2.0/$name"
-		mkdir -p "$loadersDir"
-		
-		if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then
-			cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$loadersDir/loaders.cache"
+	# choose the longest loaders.cache
+	local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	if [ -f "$loadersCache" ]; then
+		if [ -f "$GDK_PIXBUF_MODULE_FILE" ]; then
+			if [ $(cat "$loadersCache"|wc -l) -gt $(cat "$GDK_PIXBUF_MODULE_FILE"|wc -l) ]; then
+				export GDK_PIXBUF_MODULE_FILE="$loadersCache"
+			fi
+		else
+			export GDK_PIXBUF_MODULE_FILE="$loadersCache"
 		fi
-	
-		if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then
-			cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$loadersDir/loaders.cache"
-		fi
-		
-		# note, this is not a search path
-		export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$loadersDir/loaders.cache")
-
 	fi
 
 }
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 24c24fe5f12..5ef53ec7939 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }:
+, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }:
 
 stdenv.mkDerivation rec {
   name = "geis-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig python3 dbus_libs frame grail ]
-  ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver];
+  ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver];
 
   configureFlags = stdenv.lib.optional enableX11"--enable-x11";
 
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 99a566cf195..77ea6b6a016 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl }:
+# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
+# e.g. geolite-legacy
+{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }:
 
 let version = "1.6.2"; in
 
 stdenv.mkDerivation {
-  name = "geoip-${version}";
+  name = "${drvName}-${version}";
 
   src = fetchurl {
     url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
     sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
   };
 
+  postInstall = ''
+    DB=${toString geoipDatabase}
+    if [ -n "$DB" ]; then
+      ln -s $DB/share/GeoIP $out/share/GeoIP
+    fi
+  '';
+
   meta = {
     description = "Geolocation API";
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index d1695f295fc..d63a1bb7572 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -10,11 +10,11 @@ composableDerivation.composableDerivation {} rec {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.4.2";
+  name = "geos-3.5.0";
 
   src = fetchurl {
     url = "http://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "0lvcs8x9as5jlxilykgg3i4220x8m4z59b2ngfapl219gvgvzs0m";
+    sha256 = "49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 6b53e07acdb..e3dfc9fe0a9 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "getdata-0.8.6";
+  name = "getdata-0.8.9";
   src = fetchurl {
     url = "mirror://sourceforge/getdata/${name}.tar.bz2";
-    sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8";
+    sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
deleted file mode 100644
index 3ea70bea80b..00000000000
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, libiconv }:
-
-stdenv.mkDerivation rec {
-  name = "gettext-0.17";
-
-  src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
-  };
-
-  configureFlags = "--disable-csharp";
-
-  # On cross building, gettext supposes that the wchar.h from libc
-  # does not fulfill gettext needs, so it tries to work with its
-  # own wchar.h file, which does not cope well with the system's
-  # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      echo gl_cv_func_wcwidth_works=yes > cachefile
-      configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
-    fi
-  '';
-
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-
-  meta = {
-    description = "GNU gettext, a well integrated set of translation tools and documentation";
-
-    longDescription = ''
-      Usually, programs are written and documented in English, and use
-      English at execution time for interacting with users.  Using a common
-      language is quite handy for communication between developers,
-      maintainers and users from all countries.  On the other hand, most
-      people are less comfortable with English than with their own native
-      language, and would rather be using their mother tongue for day to
-      day's work, as far as possible.  Many would simply love seeing their
-      computer screen showing a lot less of English, and far more of their
-      own language.
-
-      GNU `gettext' is an important step for the GNU Translation Project, as
-      it is an asset on which we may build many other steps. This package
-      offers to programmers, translators, and even users, a well integrated
-      set of tools and documentation. Specifically, the GNU `gettext'
-      utilities are a set of tools that provides a framework to help other
-      GNU packages produce multi-lingual messages.
-    '';
-
-    homepage = http://www.gnu.org/software/gettext/;
-
-    maintainers = [ ];
-    branch = "0.17";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gettext/0.18.nix b/pkgs/development/libraries/gettext/0.18.nix
deleted file mode 100644
index bb1a0519e7b..00000000000
--- a/pkgs/development/libraries/gettext/0.18.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, fetchurl, gettext }:
-
-stdenv.lib.overrideDerivation gettext (attrs: rec {
-  name = "gettext-0.18.2";
-
-  src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
-  };
-
-})
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index b48ea97abba..b32b126cfe8 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,23 +1,32 @@
 { stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.19.4";
+  name = "gettext-0.19.6";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
+    sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
   };
 
+  outputs = [ "out" "doc" ];
+
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
   configureFlags = [ "--disable-csharp" "--with-xz" ]
      ++ (stdenv.lib.optionals stdenv.isCygwin
-          [ # We have a static libiconv, so we can only build the static lib.
-            "--disable-shared" "--enable-static"
-
+          [ "--disable-java"
+            "--disable-native-java"
             # Share the cache among the various `configure' runs.
             "--config-cache"
-          ]);
+            "--with-included-gettext"
+            "--with-included-glib"
+            "--with-included-libcroco"
+          ])
+     # avoid retaining reference to CF during stdenv bootstrap
+     ++ (stdenv.lib.optionals stdenv.isDarwin [
+        "gt_cv_func_CFPreferencesCopyAppValue=no"
+        "gt_cv_func_CFLocaleCopyCurrent=no"
+      ]);
 
   # On cross building, gettext supposes that the wchar.h from libc
   # does not fulfill gettext needs, so it tries to work with its
@@ -28,6 +37,8 @@ stdenv.mkDerivation (rec {
       echo gl_cv_func_wcwidth_works=yes > cachefile
       configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
     fi
+  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+    sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
   '';
 
   buildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix
index 3ae649b6790..b6e515fef80 100644
--- a/pkgs/development/libraries/giblib/default.nix
+++ b/pkgs/development/libraries/giblib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, imlib2 }:
+{ stdenv, fetchurl, xlibsWrapper, imlib2 }:
 
 stdenv.mkDerivation rec {
   name = "giblib-1.2.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
   };
   
-  buildInputs = [x11 imlib2];
+  buildInputs = [xlibsWrapper imlib2];
 
   meta = {
     homepage = http://linuxbrit.co.uk/giblib/;
diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix
index 49e3fc40ba6..95038284cd6 100644
--- a/pkgs/development/libraries/giflib/5.0.nix
+++ b/pkgs/development/libraries/giflib/5.0.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
   meta = {
-    description = "giflib is a library for reading and writing gif images";
+    description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix
index dcd52fc93f4..0bccb857d35 100644
--- a/pkgs/development/libraries/giflib/5.1.nix
+++ b/pkgs/development/libraries/giflib/5.1.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
   meta = {
-    description = "giflib is a library for reading and writing gif images";
+    description = "A library for reading and writing gif images";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix
new file mode 100644
index 00000000000..823f09b8bce
--- /dev/null
+++ b/pkgs/development/libraries/git2/0.21.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
+
+stdenv.mkDerivation rec {
+  version = "0.21.2";
+  name = "libgit2-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/libgit2/libgit2/tarball/v${version}";
+    sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y";
+  };
+
+  cmakeFlags = "-DTHREADSAFE=ON";
+
+  nativeBuildInputs = [ cmake python ];
+  buildInputs = [ zlib libssh2 openssl http-parser ];
+
+  meta = {
+    description = "the Git linkable library";
+    homepage = http://libgit2.github.com/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 7ddbc408ca6..3f0412bf839 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
 
 stdenv.mkDerivation rec {
-  version = "0.21.2";
+  version = "0.23.2";
   name = "libgit2-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y";
+    sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp";
   };
 
   cmakeFlags = "-DTHREADSAFE=ON";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "the Git linkable library";
     homepage = http://libgit2.github.com/;
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 5127311e7c9..cbdc2831187 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
+{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }:
 
 with stdenv.lib;
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9";
   };
 
-  nativeBuildInputs = [ x11 libXmu libXi ];
+  nativeBuildInputs = [ xlibsWrapper libXmu libXi ];
   propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index ab7e312762f..02d26759834 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }:
+{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
+, libXinerama, libXcursor
+}:
 
 stdenv.mkDerivation rec {
-  name = "glfw-3.0.4";
+  name = "glfw-3.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/glfw/${name}.tar.bz2";
-    sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag";
+    sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ];
+  buildInputs = [
+    cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper
+    libXinerama libXcursor
+  ];
+
+  cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
 
   meta = with stdenv.lib; { 
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 6f0394823a6..a17b7a21409 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 131f224e45e..ae64f1f68e0 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false;
+assert !stdenv.isDarwin -> stdenv.cc.isGNU;
 
 # TODO:
 # * Add gio-module-fam
@@ -39,7 +39,7 @@ let
     ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.44";
+  ver_maj = "2.46";
   ver_min = "0";
 in
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "1fgmjv3yzxgbks31h42201x2izpw0sd84h8dfw0si3x00sqn5lzj";
+    sha256 = "b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
@@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
        sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
        # All gschemas fail to pass the test, upstream bug?
        sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
+       # Cannot reproduce the failing test_associations on hydra
+       sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
        # Needed because of libtool wrappers
        sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
     '';
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 91411e68dd2..5ead702f006 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -11,6 +11,12 @@ make_glib_find_gsettings_schemas() {
 envHooks+=(make_glib_find_gsettings_schemas)
 
 glibPreFixupPhase() {
+    # Move gschemas in case the install flag didn't help
+    if [ -d "$out/share/glib-2.0/schemas" ]; then
+        mkdir -p "$out/share/gsettings-schemas/$name/glib-2.0"
+        mv "$out/share/glib-2.0/schemas" "$out/share/gsettings-schemas/$name/glib-2.0/"
+    fi
+
     addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d5caba68903..03881a41aa5 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -56,6 +56,11 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
+
+      ./security-4a28f4d5.patch
+      ./security-bdf1ff05.patch
+      ./cve-2014-8121.patch
+      ./cve-2015-1781.patch
     ];
 
   postPatch =
diff --git a/pkgs/development/libraries/glibc/cve-2014-8121.patch b/pkgs/development/libraries/glibc/cve-2014-8121.patch
new file mode 100644
index 00000000000..95a86259dba
--- /dev/null
+++ b/pkgs/development/libraries/glibc/cve-2014-8121.patch
@@ -0,0 +1,230 @@
+From 03d2730b44cc2236318fd978afa2651753666c55 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 29 Apr 2015 14:41:25 +0200
+Subject: [PATCH] CVE-2014-8121: Do not close NSS files database during
+ iteration [BZ #18007]
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Robin Hack discovered Samba would enter an infinite loop processing
+certain quota-related requests.  We eventually tracked this down to a
+glibc issue.
+
+Running a (simplified) test case under strace shows that /etc/passwd
+is continuously opened and closed:
+
+…
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
+lseek(3, 2717, SEEK_SET)                = 2717
+close(3)                                = 0
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+lseek(3, 0, SEEK_SET)                   = 0
+read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
+lseek(3, 2717, SEEK_SET)                = 2717
+close(3)                                = 0
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+…
+
+The lookup function implementation in
+nss/nss_files/files-XXX.c:DB_LOOKUP has code to prevent that.  It is
+supposed skip closing the input file if it was already open.
+
+  /* Reset file pointer to beginning or open file.  */			      \
+  status = internal_setent (keep_stream);				      \
+									      \
+  if (status == NSS_STATUS_SUCCESS)					      \
+    {									      \
+      /* Tell getent function that we have repositioned the file pointer.  */ \
+      last_use = getby;							      \
+									      \
+      while ((status = internal_getent (result, buffer, buflen, errnop	      \
+					H_ERRNO_ARG EXTRA_ARGS_VALUE))	      \
+	     == NSS_STATUS_SUCCESS)					      \
+	{ break_if_match }						      \
+									      \
+      if (! keep_stream)						      \
+	internal_endent ();						      \
+    }									      \
+
+keep_stream is initialized from the stayopen flag in internal_setent.
+internal_setent is called from the set*ent implementation as:
+
+  status = internal_setent (stayopen);
+
+However, for non-host database, this flag is always 0, per the
+STAYOPEN magic in nss/getXXent_r.c.
+
+Thus, the fix is this:
+
+-  status = internal_setent (stayopen);
++  status = internal_setent (1);
+
+This is not a behavioral change even for the hosts database (where the
+application can specify the stayopen flag) because with a call to
+sethostent(0), the file handle is still not closed in the
+implementation of gethostent.
+---
+ ChangeLog                 |   8 ++++
+ NEWS                      |  12 +++--
+ nss/Makefile              |   2 +-
+ nss/nss_files/files-XXX.c |   2 +-
+ nss/tst-nss-getpwent.c    | 118 ++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 136 insertions(+), 6 deletions(-)
+ create mode 100644 nss/tst-nss-getpwent.c
+
+diff --git a/nss/Makefile b/nss/Makefile
+index d75dad2..65ab7b5 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -47,7 +47,7 @@ install-bin             := getent makedb
+ makedb-modules = xmalloc hash-string
+ extra-objs		+= $(makedb-modules:=.o)
+ 
+-tests			= test-netdb tst-nss-test1 test-digits-dots
++tests			= test-netdb tst-nss-test1 test-digits-dots tst-nss-getpwent
+ xtests			= bug-erange
+ 
+ # Specify rules for the nss_* modules.  We have some services.
+diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
+index a7a45e5..a7ce5ea 100644
+--- a/nss/nss_files/files-XXX.c
++++ b/nss/nss_files/files-XXX.c
+@@ -134,7 +134,7 @@ CONCAT(_nss_files_set,ENTNAME) (int stayopen)
+ 
+   __libc_lock_lock (lock);
+ 
+-  status = internal_setent (stayopen);
++  status = internal_setent (1);
+ 
+   if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
+     {
+diff --git a/nss/tst-nss-getpwent.c b/nss/tst-nss-getpwent.c
+new file mode 100644
+index 0000000..f2e8abc
+--- /dev/null
++++ b/nss/tst-nss-getpwent.c
+@@ -0,0 +1,118 @@
++/* Copyright (C) 2015 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <pwd.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int
++do_test (void)
++{
++  /* Count the number of entries in the password database, and fetch
++     data from the first and last entries.  */
++  size_t count = 0;
++  struct passwd * pw;
++  char *first_name = NULL;
++  uid_t first_uid = 0;
++  char *last_name = NULL;
++  uid_t last_uid = 0;
++  setpwent ();
++  while ((pw  = getpwent ()) != NULL)
++    {
++      if (first_name == NULL)
++	{
++	  first_name = strdup (pw->pw_name);
++	  if (first_name == NULL)
++	    {
++	      printf ("strdup: %m\n");
++	      return 1;
++	    }
++	  first_uid = pw->pw_uid;
++	}
++
++      free (last_name);
++      last_name = strdup (pw->pw_name);
++      if (last_name == NULL)
++	{
++	  printf ("strdup: %m\n");
++	  return 1;
++	}
++      last_uid = pw->pw_uid;
++      ++count;
++    }
++  endpwent ();
++
++  if (count == 0)
++    {
++      printf ("No entries in the password database.\n");
++      return 0;
++    }
++
++  /* Try again, this time interleaving with name-based and UID-based
++     lookup operations.  The counts do not match if the interleaved
++     lookups affected the enumeration.  */
++  size_t new_count = 0;
++  setpwent ();
++  while ((pw  = getpwent ()) != NULL)
++    {
++      if (new_count == count)
++	{
++	  printf ("Additional entry in the password database.\n");
++	  return 1;
++	}
++      ++new_count;
++      struct passwd *pw2 = getpwnam (first_name);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwnam (%s) failed: %m\n", first_name);
++	  return 1;
++	}
++      pw2 = getpwnam (last_name);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwnam (%s) failed: %m\n", last_name);
++	  return 1;
++	}
++      pw2 = getpwuid (first_uid);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwuid (%llu) failed: %m\n",
++		  (unsigned long long) first_uid);
++	  return 1;
++	}
++      pw2 = getpwuid (last_uid);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwuid (%llu) failed: %m\n",
++		  (unsigned long long) last_uid);
++	  return 1;
++	}
++    }
++  endpwent ();
++  if (new_count < count)
++    {
++      printf ("Missing entry in the password database.\n");
++      return 1;
++    }
++
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+
diff --git a/pkgs/development/libraries/glibc/cve-2015-1781.patch b/pkgs/development/libraries/glibc/cve-2015-1781.patch
new file mode 100644
index 00000000000..6831d5ac742
--- /dev/null
+++ b/pkgs/development/libraries/glibc/cve-2015-1781.patch
@@ -0,0 +1,27 @@
+From 2959eda9272a033863c271aff62095abd01bd4e3 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun.is@lostca.se>
+Date: Tue, 21 Apr 2015 14:06:31 +0200
+Subject: [PATCH] CVE-2015-1781: resolv/nss_dns/dns-host.c buffer overflow
+ [BZ#18287]
+
+---
+ ChangeLog                 | 6 ++++++
+ NEWS                      | 9 ++++++++-
+ resolv/nss_dns/dns-host.c | 3 ++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index b16b0dd..d8c5579 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
+   int have_to_map = 0;
+   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
+   buffer += pad;
+-  if (__glibc_unlikely (buflen < sizeof (struct host_data) + pad))
++  buflen = buflen > pad ? buflen - pad : 0;
++  if (__glibc_unlikely (buflen < sizeof (struct host_data)))
+     {
+       /* The buffer is too small.  */
+     too_small:
+
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 066874973aa..26d2bda2aeb 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -8,7 +8,7 @@
 , withGd ? false, gd ? null, libpng ? null
 }:
 
-assert stdenv.cc.cc.isGNU or false;
+assert stdenv.cc.isGNU;
 
 let
   build = import ./common.nix;
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 518ecea3b72..0cf074323fb 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -31,10 +31,25 @@ build null {
 
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
+    ''
+      + stdenv.lib.optionalString (!allLocales) ''
+      # Check that all locales to be built are supported
+      echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \
+        | sort > locales-to-build.txt
+      cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \
+        | sort > locales-supported.txt
+      comm -13 locales-supported.txt locales-to-build.txt \
+        > locales-unsupported.txt
+      if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then
+        cat locales-supported.txt
+        echo "Error: unsupported locales detected:"
+        cat locales-unsupported.txt
+        echo "You should choose from the list above the error."
+        false
+      fi
 
-      ${if allLocales then "" else
-          "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"}
-
+      echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED
+    '' + ''
       make localedata/install-locales \
           localedir=$out/lib/locale \
     '';
diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 88c8adef922..eeaf21901a3 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch
@@ -6,7 +6,7 @@ diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.
  
  
 +static int
-+open_locale_archive ()
++open_locale_archive (void)
 +{
 +  int fd = -1;
 +  char *path = getenv ("LOCALE_ARCHIVE_2_11");
diff --git a/pkgs/development/libraries/glibc/security-4a28f4d5.patch b/pkgs/development/libraries/glibc/security-4a28f4d5.patch
new file mode 100644
index 00000000000..25f994d859c
--- /dev/null
+++ b/pkgs/development/libraries/glibc/security-4a28f4d5.patch
@@ -0,0 +1,53 @@
+From 4a28f4d55a6cc33474c0792fe93b5942d81bf185 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Thu, 26 Feb 2015 14:55:24 +0100
+Subject: [PATCH] Fix read past end of pattern in fnmatch (bug 18032)
+
+---
+ ChangeLog            | 7 +++++++
+ NEWS                 | 2 +-
+ posix/fnmatch_loop.c | 5 ++---
+ posix/tst-fnmatch3.c | 8 +++++---
+ 4 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
+index c0cb2fc..72c5d8f 100644
+--- a/posix/fnmatch_loop.c
++++ b/posix/fnmatch_loop.c
+@@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
+ 		  }
+ 		else if (c == L('[') && *p == L('.'))
+ 		  {
+-		    ++p;
+ 		    while (1)
+ 		      {
+ 			c = *++p;
+-			if (c == '\0')
++			if (c == L('\0'))
+ 			  return FNM_NOMATCH;
+ 
+-			if (*p == L('.') && p[1] == L(']'))
++			if (c == L('.') && p[1] == L(']'))
+ 			  break;
+ 		      }
+ 		    p += 2;
+diff --git a/posix/tst-fnmatch3.c b/posix/tst-fnmatch3.c
+index d27a557..75bc00a 100644
+--- a/posix/tst-fnmatch3.c
++++ b/posix/tst-fnmatch3.c
+@@ -21,9 +21,11 @@
+ int
+ do_test (void)
+ {
+-  const char *pattern = "[[:alpha:]'[:alpha:]\0]";
+-
+-  return fnmatch (pattern, "a", 0) != FNM_NOMATCH;
++  if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH)
++    return 1;
++  if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH)
++    return 1;
++  return 0;
+ }
+ 
+ #define TEST_FUNCTION do_test ()
+
diff --git a/pkgs/development/libraries/glibc/security-bdf1ff05.patch b/pkgs/development/libraries/glibc/security-bdf1ff05.patch
new file mode 100644
index 00000000000..b4175694f91
--- /dev/null
+++ b/pkgs/development/libraries/glibc/security-bdf1ff05.patch
@@ -0,0 +1,39 @@
+From bdf1ff052a8e23d637f2c838fa5642d78fcedc33 Mon Sep 17 00:00:00 2001
+From: Paul Pluzhnikov <ppluzhnikov@google.com>
+Date: Sun, 22 Feb 2015 12:01:47 -0800
+Subject: [PATCH] Fix BZ #17269 -- _IO_wstr_overflow integer overflow
+
+---
+ ChangeLog       | 6 ++++++
+ NEWS            | 6 +++---
+ libio/wstrops.c | 8 +++++++-
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/libio/wstrops.c b/libio/wstrops.c
+index 43d847d..3993579 100644
+--- a/libio/wstrops.c
++++ b/libio/wstrops.c
+@@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c)
+ 	  wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
+ 	  size_t old_wblen = _IO_wblen (fp);
+ 	  _IO_size_t new_size = 2 * old_wblen + 100;
+-	  if (new_size < old_wblen)
++
++	  if (__glibc_unlikely (new_size < old_wblen)
++	      || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t)))
+ 	    return EOF;
++
+ 	  new_buf
+ 	    = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
+ 									* sizeof (wchar_t));
+@@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
+     return 1;
+ 
+   _IO_size_t newsize = offset + 100;
++  if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t)))
++    return 1;
++
+   wchar_t *oldbuf = wd->_IO_buf_base;
+   wchar_t *newbuf
+     = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize
+
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index 39d84c4f6fe..02d24d21900 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
     then "ln -sf configfsf.guess config.guess"
     else ''echo "Darwin host is `./config.guess`."'';
 
-  configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
+  configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
+    stdenv.lib.optionalString stdenv.isDarwin " ac_cv_build=x86_64-apple-darwin13.4.0 ac_cv_host=x86_64-apple-darwin13.4.0";
 
   # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
   # Newer versions of GMP don't have that issue anymore.
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index ae8ae7c0f18..0768df60a79 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
 
-with { inherit (stdenv.lib) optional; };
+with { inherit (stdenv.lib) optional optionalString; };
 
 stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.is64bit "--with-pic"
     ;
 
+  # The config.guess in GMP tries to runtime-detect various
+  # ARM optimization flags via /proc/cpuinfo (and is also
+  # broken on multicore CPUs). Avoid this impurity.
+  preConfigure = optionalString stdenv.isArm ''
+      configureFlagsArray+=("--build=$(./configfsf.guess)")
+    '';
+
   doCheck = true;
 
   dontDisableStatic = withStatic;
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index b7350c19960..171611e1249 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
 
-with { inherit (stdenv.lib) optional; };
+with { inherit (stdenv.lib) optional optionalString; };
 
 stdenv.mkDerivation rec {
   name = "gmp-6.0.0a";
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.is64bit "--with-pic"
     ;
 
+  # The config.guess in GMP tries to runtime-detect various
+  # ARM optimization flags via /proc/cpuinfo (and is also
+  # broken on multicore CPUs). Avoid this impurity.
+  preConfigure = optionalString stdenv.isArm ''
+      configureFlagsArray+=("--build=$(./configfsf.guess)")
+    '';
+
   doCheck = true;
 
   dontDisableStatic = withStatic;
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index a78d9890729..e674aae2b58 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pciutils }:
 
 stdenv.mkDerivation rec {
-  name = "gnu-efi_${version}";
-  version = "3.0u";
+  name = "gnu-efi-${version}";
+  version = "3.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz";
-    sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w";
+    url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
+    sha256 = "1jxlypkgb8bd1c114x96i699ib0glb5aca9dv56j377x2ldg4c65";
   };
 
-  arch = with stdenv.lib; head (splitString "-" stdenv.system);
+  buildInputs = [ pciutils ];
 
   makeFlags = [
+    "PREFIX=\${out}"
     "CC=gcc"
     "AS=as"
     "LD=ld"
@@ -20,23 +21,10 @@ stdenv.mkDerivation rec {
     "OBJCOPY=objcopy"
   ];
 
-  buildPhase = ''
-    make $makeFlags
-    make $makeFlags -C apps clean all
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/include/efi/{protocol,$arch}
-    make PREFIX="$out" $makeFlags install
-    mkdir -pv $out/share/gnu-efi
-    install -D -m644 apps/*.efi $out/share/gnu-efi
-  '';
-
   meta = with stdenv.lib; {
     description = "GNU EFI development toolchain";
     homepage = http://sourceforge.net/projects/gnu-efi/;
     license = licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
deleted file mode 100644
index e46b1dfd8e6..00000000000
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.2.21";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz";
-    sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m";
-  };
-})
diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index fbf51f34ff8..c314da388dc 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.14";
+  version = "3.3.18";
 
   src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
+    sha256 = "15ckyblhkap3d4sqw0dc9l8wdrnd2aj1fs9m0w0a3bfihvsfg1vs";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index f768e03f184..acd164de024 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,12 +1,17 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.0";
+  version = "3.4.5";
 
   src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "0mhym25ns3fhjd82p6g0aafhzbfkanryqbxvjy9mi25n2xpr1b95";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
+    sha256 = "1bks1zpmhmnkz2v32dd9b44pz6x0a5w4yi9zzwsd0a078vhbi25g";
   };
 
-  patches = [ ./install-fix.patch ];
+  # This fixes some broken parallel dependencies
+  postPatch = ''
+    sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 2191721afc1..d2bdc3fd281 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,21 +1,27 @@
-{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
+{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound
+, tpmSupport ? false, trousers
 
 # Version dependent args
-, version, src, patches ? []
+, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
 , ...}:
 
 assert guileBindings -> guile != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "gnutls-${version}";
 
-  inherit src patches;
+  inherit src patches postPatch;
 
-  configureFlags = [
+  outputs = [ "out" "man" ];
+
+  configureFlags =
+    # FIXME: perhaps use $SSL_CERT_FILE instead
+    lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+  ++ [
     "--disable-dependency-tracking"
     "--enable-fast-install"
-  ] ++ stdenv.lib.optional guileBindings
+  ] ++ lib.optional guileBindings
     [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
@@ -23,24 +29,28 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ]
-    ++ stdenv.lib.optional guileBindings guile;
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
+    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
+    ++ [ unbound ]
+    ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
+  # AutoreconfHook is temporary until the patch lands upstream to fix
+  # header file generation with parallel building
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
 
   # 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,' \
+  preFixup = lib.optionalString (!stdenv.isDarwin) ''
+    sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
         -e 's,-lz,-L${zlib.out}/lib -lz,' \
         -e 's,-lgmp,-L${gmp}/lib -lgmp,' \
         -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Transport Layer Security Library";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gnutls/install-fix.patch b/pkgs/development/libraries/gnutls/install-fix.patch
deleted file mode 100644
index 48ed2da24c0..00000000000
--- a/pkgs/development/libraries/gnutls/install-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 6975df9545e..226fbd2835b 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.42";
+  ver_maj = "1.46";
   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 = "3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7";
+    sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233";
   };
 
   outputs = [ "dev" "out" "doc" ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
   # other dependencies).
   configureFlags = [ "--disable-tests" ];
 
+  preConfigure = ''
+    sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
+  '';
+
   setupHook = ./setup-hook.sh;
 
   patches = [ ./absolute_shlib_path.patch ];
diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix
new file mode 100644
index 00000000000..75a7dfb4898
--- /dev/null
+++ b/pkgs/development/libraries/goffice/0.8.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
+, pango, libgsf, libxml2, libart, intltool, gettext
+, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.8.17";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
+  };
+
+  # fix linking error: undefined reference to pcre_info
+  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
+
+  buildInputs = [
+    pkgconfig libglade bzip2 libart intltool gettext
+    gconf libgnomeui pcre
+  ];
+
+  propagatedBuildInputs = [
+    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
+    glib libgsf libxml2 gtk libglade libart cairo pango
+  ];
+
+  postInstall =
+    ''
+      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
+      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+    '';
+
+  doCheck = true;
+
+  meta = goffice.meta // {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
new file mode 100644
index 00000000000..517836f4d63
--- /dev/null
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.10.22";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
+    glib gtk3 libxml2 cairo pango libgsf
+  ];
+
+  buildInputs = [ libxslt librsvg ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "A Glib/GTK+ set of document centric objects and utilities";
+
+    longDescription = ''
+      There are common operations for document centric applications that are
+      conceptually simple, but complex to implement fully: plugins, load/save
+      documents, undo/redo.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
new file mode 100644
index 00000000000..cd4ef3c9fed
--- /dev/null
+++ b/pkgs/development/libraries/goffice/pcre_info.patch
@@ -0,0 +1,13 @@
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3adb696 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		default: return GO_REG_BADPAT;
+ 		}
+ 	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
++		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
index 3631d4927a3..1423a5a9efc 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -1,14 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "google-gflags-2.0";
+  name = "google-gflags-${version}";
+  version = "2.1.2";
 
-  src = fetchurl {
-    url = "https://gflags.googlecode.com/files/gflags-2.0.tar.gz";
-    sha256 = "1mypfahsfy0piavhf7il2jfs1gq7jp6yarl9sq5hhypj34s5sjnf";
+  src = fetchFromGitHub {
+    owner = "gflags";
+    repo = "gflags";
+    rev = "v${version}";
+    sha256 = "0qxvr9cyxq3px60jglkm94pq5bil8dkjjdb99l3ypqcds7iypx9w";
   };
 
-  doCheck = true;
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=ON"
+    "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+  ];
+
+  doCheck = false;
 
   meta = {
     description = "A C++ library that implements commandline flags processing";
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 8c2feccebb7..5fa14e64a22 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isLinux libunwind;
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile.am --replace stdc++ c++
+    substituteInPlace Makefile.in --replace stdc++ c++
+    substituteInPlace libtool --replace stdc++ c++
+  '';
+
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools
   dontDisableStatic = true;
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index d4913ef21f6..1657ceaeece 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.4";
+  name = "gpgme-1.6.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
+    sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index 3cf946bb4ba..a4f27824d13 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true,
-  stdenv, fetchurl, pkgconfig, xlibs, python3, frame }:
+  stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
 
 stdenv.mkDerivation rec {
   name = "grail-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig python3 frame ]
-  ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes];
+  ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
 
   configureFlags = stdenv.lib.optional enableX11 "--with-x11";
 
diff --git a/pkgs/development/libraries/grantlee/5.x-old.nix b/pkgs/development/libraries/grantlee/5.x-old.nix
new file mode 100644
index 00000000000..4127280fb9a
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5.x-old.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, qt5, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "grantlee-5.0.0";
+
+# Upstream download server has country code firewall, so I made a mirror.
+  src = fetchurl {
+    urls = [
+      "http://downloads.grantlee.org/${name}.tar.gz"
+      "http://www.loegria.net/grantlee/${name}.tar.gz"
+    ];
+    sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa";
+  };
+
+  buildInputs = [ cmake qt5.base qt5.script ];
+
+  meta = {
+    description = "Qt5 port of Django template system";
+    longDescription = ''
+      Grantlee is a plugin based String Template system written using the Qt
+      framework. The goals of the project are to make it easier for application
+      developers to separate the structure of documents from the data they
+      contain, opening the door for theming.
+
+      The syntax is intended to follow the syntax of the Django template system,
+      and the design of Django is reused in Grantlee.'';
+
+    homepage = http://gitorious.org/grantlee;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt5.base.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix
new file mode 100644
index 00000000000..3323cbaeb4c
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5.x.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, qtbase, qtscript, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "grantlee-5.0.0";
+
+# Upstream download server has country code firewall, so I made a mirror.
+  src = fetchurl {
+    urls = [
+      "http://downloads.grantlee.org/${name}.tar.gz"
+      "http://www.loegria.net/grantlee/${name}.tar.gz"
+    ];
+    sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa";
+  };
+
+  buildInputs = [ qtbase qtscript ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Qt5 port of Django template system";
+    longDescription = ''
+      Grantlee is a plugin based String Template system written using the Qt
+      framework. The goals of the project are to make it easier for application
+      developers to separate the structure of documents from the data they
+      contain, opening the door for theming.
+
+      The syntax is intended to follow the syntax of the Django template system,
+      and the design of Django is reused in Grantlee.'';
+
+    homepage = http://gitorious.org/grantlee;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt5.base.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index da4796fba89..dbea97a0271 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, fetchpatch, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-1.16";
@@ -8,9 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
   };
 
-  # ToDo: there might be more impurities than FMA support check
-  patches = [ ./disable-fma.patch ]; # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
-  patchFlags = "-p0";
+  patches = [
+    # ToDo: there might be more impurities than FMA support check
+    ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+    (fetchpatch {
+      name = "bug-39055.patch";
+      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
+      sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
+    })
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch
index d5c0d620863..bb1eda9cccc 100644
--- a/pkgs/development/libraries/gsl/disable-fma.patch
+++ b/pkgs/development/libraries/gsl/disable-fma.patch
@@ -1,5 +1,5 @@
---- configure.ac        2011-09-22 16:13:22 +0000
-+++ configure.ac        2011-11-26 23:55:24 +0000
+--- a/configure.ac        2011-09-22 16:13:22 +0000
++++ b/configure.ac        2011-11-26 23:55:24 +0000
 @@ -381,6 +381,28 @@
  AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
  AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 706bd769219..fb9ff8eb0fb 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "SHELL=${stdenv.shell}"
     "INSTALL_ROOT=$(out)"
-  ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang";
+  ] ++ optional stdenv.cc.isClang "CC=clang";
 
   preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
 
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 75ae4054592..a748d958269 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,31 +1,35 @@
-{ fetchurl, stdenv, shishi }:
+{ stdenv, fetchurl
+
+# Optional Dependencies
+, shishi ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "gss-1.0.2";
+  name = "gss-1.0.3";
 
   src = fetchurl {
     url = "mirror://gnu/gss/${name}.tar.gz";
-    sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9";
+    sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
   buildInputs = [ shishi ];
 
-  doCheck = true;
+  configureFlags = [
+    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+  ];
 
-  meta = {
-    description = "Generic Security Service";
+  doCheck = true;
 
-    longDescription =
-      '' GSS is an implementation of the Generic Security Service Application
-	 Program Interface (GSS-API). GSS-API is used by network servers to
-	 provide security services, e.g., to authenticate SMTP/IMAP clients
-	 against SMTP/IMAP servers.
-       '';
+  # Fixup .la files
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
+    sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
+  '';
 
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gss/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.all;
+    description = "Generic Security Service";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ bjg wkennington ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 792b6d2e4db..1a8cb233b77 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}:
+{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
 
 stdenv.mkDerivation {
-  name = "gssdp-0.12.2.1";
+  name = "gssdp-0.14.11";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
-    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz;
+    sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv";
   };
 
-  buildInputs = [pkgconfig libsoup glib libxml2];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsoup ];
+  propagatedBuildInputs = [ glib ];
 
   meta = {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 4796ce078df..7d349f31e04 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -13,9 +13,9 @@ rec {
 
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
 
-  gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; };
-
   gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
 
   gst-editing-services = callPackage ./ges { inherit gnonlin; };
+
+  gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
 }
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 51ad836b644..c999c65229e 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -3,7 +3,7 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio, libintlOrEmpty
+, libsoup, libpulseaudio, libintlOrEmpty
 }:
 
 let
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     libsoup
   ]
   ++ libintlOrEmpty
-  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 59ee86da86d..eb55ae874e5 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
+{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
 , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-
     sed -i 's@/bin/echo@echo@g' configure
     sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
+
+    patch -p1 < ${./gcc-4.9.patch}
   '';
 
   # TODO : v4l, libvisual
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
     # can't build alsaLib on darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
     ++ stdenv.lib.optionals (!minimalDeps)
-      [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
+      [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango
         liboil ]
     # can't build cdparanoia on darwin
     ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
new file mode 100644
index 00000000000..fd9f6ea240d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
@@ -0,0 +1,38 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=670690
+
+From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Mon, 20 Jan 2014 15:44:09 +0100
+Subject: [PATCH] audioresample: fix build on BSD
+
+On i386, EMMINTRIN is defined but not usable without sse so check for
+__SSE__ and __SSE2__ as well.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670690
+---
+ gst/audioresample/resample.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
+index 98d006c..481fa01 100644
+--- a/gst/audioresample/resample.c
++++ b/gst/audioresample/resample.c
+@@ -77,13 +77,13 @@
+ #define EXPORT G_GNUC_INTERNAL
+ 
+ #ifdef _USE_SSE
+-#ifndef HAVE_XMMINTRIN_H
++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE
+ #endif
+ #endif
+ 
+ #ifdef _USE_SSE2
+-#ifndef HAVE_EMMINTRIN_H
++#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE2
+ #endif
+ #endif
+-- 
+1.8.5.3
+
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 1db7e4dbd55..deca854008a 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
-, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
+, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig glib gstreamer gst_plugins_base ]
-    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ]
     ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index ea1c31ccab8..ce6ae931836 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "C++ bindings for the GStreamer streaming multimedia library";
     homepage = http://www.gtkmm.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ plcplc ];
+    platforms = platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index a91b5d81bb3..c1b94a647b8 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -1,5 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer
-  , gst-plugins-base, pygtk, pygobject3
+{ fetchurl, stdenv, pkgconfig, python
+, gst-plugins-base, pygobject3
+, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +16,16 @@ stdenv.mkDerivation rec {
 
   patches = [ ./different-path-with-pygobject.patch ];
 
-  buildInputs =
-    [ pkgconfig gst-plugins-base pygtk pygobject3 ]
-    ;
+  nativeBuildInputs = [ pkgconfig python ];
+
+  # XXX: in the Libs.private field of python3.pc
+  buildInputs = [ ncurses ];
 
   preConfigure = ''
     export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides"
   '';
 
-  propagatedBuildInputs = [ gstreamer python ];
+  propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
   meta = {
     homepage = http://gstreamer.freedesktop.org;
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
new file mode 100644
index 00000000000..349b5093a3b
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva
+, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
+, libvpx
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-vaapi-${version}";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
+    sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n";
+  };
+
+  nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
+
+  buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
+    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
+
+  preConfigure = "
+    export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0
+    mkdir -p $GST_PLUGIN_PATH_1_0
+    ";
+  configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
+
+  meta = {
+    homepage = "http://www.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  };
+}
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
new file mode 100644
index 00000000000..8d8a018f1fe
--- /dev/null
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="gtdialog";
+    version="1.2";
+    name="${baseName}-${version}";
+    hash="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
+    url="http://foicica.com/gtdialog/download/gtdialog_1.2.zip";
+    sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
+  };
+  buildInputs = [
+    cdk unzip gtk glib ncurses pkgconfig
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  makeFlags = ["PREFIX=$(out)"];
+  meta = {
+    inherit (s) version;
+    description = ''Cross-platform helper for creating interactive dialogs'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://foicica.com/gtdialog";
+    downloadPage = "http://foicica.com/gtdialog/download";
+  };
+}
diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/pkgs/development/libraries/gtdialog/default.upstream
new file mode 100644
index 00000000000..843c88f55ff
--- /dev/null
+++ b/pkgs/development/libraries/gtdialog/default.upstream
@@ -0,0 +1,3 @@
+url http://foicica.com/gtdialog/download
+version_link '[.]zip'
+version '.*_([0-9.]*)[.]zip' '\1'
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 41dab3ad2df..c04a1e0b4cc 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs
-, gdk_pixbuf, libintlOrEmpty, x11
+{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
+, gdk_pixbuf, libintlOrEmpty, xlibsWrapper
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? true, cups ? null
 }:
 
-assert xineramaSupport -> xlibs.libXinerama != null;
+assert xineramaSupport -> xorg.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.27";
+  name = "gtk+-2.24.28";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0";
+    sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj";
   };
 
   outputs = [ "dev" "out" "doc" ];
@@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
 
-  propagatedBuildInputs = with xlibs; with stdenv.lib;
+  propagatedBuildInputs = with xorg; with stdenv.lib;
     [ glib cairo pango gdk_pixbuf atk ]
     ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
          libXrandr libXrender libXcomposite libXi libXcursor
        ]
-    ++ optionals stdenv.isDarwin [ x11 libXdamage ]
+    ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]
     ++ libintlOrEmpty
     ++ optional xineramaSupport libXinerama
     ++ optionals cupsSupport [ cups ];
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
deleted file mode 100644
index 84bea07602f..00000000000
--- a/pkgs/development/libraries/gtk+/3.16.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ 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/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 35b40a507a8..9bf95d015dd 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl
 , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
-, xlibs, x11, wayland, libxkbcommon
+, xlibs, x11, wayland, libxkbcommon, epoxy
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
@@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 let
-  ver_maj = "3.12";
-  ver_min = "2";
+  ver_maj = "3.18";
+  ver_min = "0";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,21 +18,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
+    sha256 = "7fb8ae257403317d3852bad28d064d35f67e978b1fed8b71d5997e87204271b9";
   };
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
-  buildInputs = [ libxkbcommon ];
+  buildInputs = [ libxkbcommon epoxy ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
     ++ optionals stdenv.isLinux [ wayland ]
-    ++ optional stdenv.isDarwin x11
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   # demos fail to install, no idea where's the problem
   preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
 
@@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat];
+    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
deleted file mode 100644
index bc327468855..00000000000
--- a/pkgs/development/libraries/gtkmm/3.16.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ 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/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index e158c64f73a..bc327468855 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
 
 let
-  ver_maj = "3.12";
+  ver_maj = "3.16";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1";
+    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 2dcd5b11c38..789fdcd9c2a 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, gupnp, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-av-${version}";
   majorVersion = "0.12";
-  version = "${majorVersion}.4";
+  version = "${majorVersion}.7";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
-    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+    sha256 = "35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8";
   };
   
-  buildInputs = [ gupnp pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gupnp glib libxml2 ];
 
   meta = {
     homepage = http://gupnp.org/;
     description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
-    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 20a5f2d9c94..182905e9546 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp, python, pygobject }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
  
 stdenv.mkDerivation rec {
-  name = "gupnp-igd-0.2.1";
+  name = "gupnp-igd-${version}";
+  majorVersion = "0.2";
+  version = "${majorVersion}.4";
 
   src = fetchurl {
-    url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz;
-    sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2";
+    url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
+    sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
   };
 
-  propagatedBuildInputs = [ gupnp ];
-
-  buildInputs = [ glib python pygobject ];
-
   nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gupnp ];
 
   meta = {
     homepage = http://www.gupnp.org/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index e278980e1e1..6145c8c4947 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
+{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
  
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
   majorVersion = "0.20";
-  version = "${majorVersion}.9";
+  version = "${majorVersion}.14";
+
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
-    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
+    sha256 = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd";
   };
 
-  propagatedBuildInputs = [ libxml2 libsoup gssdp ];
-  buildInputs = [ glib libuuid ];
-
   nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
 
-  postInstall = '' 
-    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
-    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
-    cp -r ${libxml2}/include/libxml2/libxml $out/include
-    '';
+  postInstall = ''
+    ln -sv ${libsoup}/include/*/libsoup $out/include
+    ln -sv ${libxml2}/include/*/libxml $out/include
+    ln -sv ${gssdp}/include/*/libgssdp $out/include
+  '';
 
   meta = {
     homepage = http://www.gupnp.org/;
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index f7bbe75f116..c33920953ce 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl
 , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1
+, glib, systemd, libusb1, vala
 }:
 stdenv.mkDerivation rec {
   name = "gusb-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
-    systemd libusb1
+    systemd libusb1 vala
     glib
   ];
 
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index dcdef696ffd..d2a958faed8 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchurl, pkgconfig, intltool, libtool
-, glib, dbus, udev, udisks2, libgcrypt
+, glib, dbus, udev, libgudev, udisks2, libgcrypt
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, samba, libmtp
 , gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
 
 let
   ver_maj = "1.22";
-  version = "${ver_maj}.2";
+  version = "${ver_maj}.4";
 in
 stdenv.mkDerivation rec {
   name = "gvfs-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
-    sha256 = "8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250";
+    sha256 = "57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libtool ];
 
   buildInputs =
-    [ makeWrapper glib dbus.libs udev udisks2 libgcrypt
+    [ makeWrapper glib dbus.libs udev libgudev udisks2 libgcrypt
       libgphoto2 avahi libarchive fuse libcdio
       libxml2 libxslt docbook_xsl samba libmtp
       # ToDo: a ligther version of libsoup to have FTP/HTTP support?
diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix
index b8ad3442729..b6cd2e54768 100644
--- a/pkgs/development/libraries/gwenhywfar/default.nix
+++ b/pkgs/development/libraries/gwenhywfar/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "gwenhywfar-4.10.0beta";
+  name = "gwenhywfar-4.11.1";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=${name}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f";
+    sha256 = "0ay79vc03jsw762nax204g112yg5sak340g31bm4hm93q69aiv2b";
   };
 
   propagatedBuildInputs = [ gnutls libgcrypt ];
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 311bfe2c209..d2f8416b3ea 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,13 +8,15 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.40";
+  name = "harfbuzz-1.0.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p";
+    sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = [
     ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
     ( "--with-icu=" +       (if withIcu       then "yes" else "no") )
diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
deleted file mode 100644
index 6693daef619..00000000000
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "AC-Vector";
-  version = "2.3.2";
-  sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
-  meta = {
-    description = "Efficient geometric vectors and transformations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/AES/default.nix b/pkgs/development/libraries/haskell/AES/default.nix
deleted file mode 100644
index 263f2a5d582..00000000000
--- a/pkgs/development/libraries/haskell/AES/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, monadsTf, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "AES";
-  version = "0.2.9";
-  sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
-  buildDepends = [ cereal monadsTf random transformers ];
-  meta = {
-    description = "Fast AES encryption/decryption for bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
deleted file mode 100644
index 5cb9fa07138..00000000000
--- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath
-, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc
-, pandocCiteproc, pandocTypes, parsec, split, strict, temporary
-, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "BlogLiterately";
-  version = "0.7.1.7";
-  sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml boolExtras cmdargs dataDefault filepath HaXml haxr
-    highlightingKate hscolour lens mtl pandoc pandocCiteproc
-    pandocTypes parsec split strict temporary transformers utf8String
-  ];
-  meta = {
-    homepage = "http://byorgey.wordpress.com/blogliterately/";
-    description = "A tool for posting Haskelly articles to blogs";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
deleted file mode 100644
index 137171b7750..00000000000
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Boolean";
-  version = "0.2.3";
-  sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
-  meta = {
-    description = "Generalized booleans and numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix
deleted file mode 100644
index 1f4af9d6f71..00000000000
--- a/pkgs/development/libraries/haskell/BoundedChan/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "BoundedChan";
-  version = "1.0.3.0";
-  sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
-  meta = {
-    description = "Implementation of bounded channels";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/CC-delcont/default.nix b/pkgs/development/libraries/haskell/CC-delcont/default.nix
deleted file mode 100644
index 459c338b80d..00000000000
--- a/pkgs/development/libraries/haskell/CC-delcont/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "CC-delcont";
-  version = "0.2";
-  sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/CC-delcont";
-    description = "Delimited continuations and dynamically scoped variables";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
deleted file mode 100644
index 7f8b0631fc6..00000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.16.0.3";
-  sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg";
-  buildDepends = [ filepath ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
deleted file mode 100644
index 27673beb1a0..00000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
-, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.18.1.3";
-  sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15";
-  buildDepends = [ deepseq filepath time ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
deleted file mode 100644
index 83e8f075f07..00000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
-, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.20.0.3";
-  sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
-  buildDepends = [ deepseq filepath time ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
deleted file mode 100644
index 659a493bc18..00000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, extensibleExceptions, filepath, HUnit
-, QuickCheck, regexPosix, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.22.0.0";
-  sha256 = "13984rli87vzhl5pvpny2cns8dq4k2s5bgmr8n93iw9hrx5w3j48";
-  buildDepends = [ binary deepseq filepath time ];
-  testDepends = [
-    binary extensibleExceptions filepath HUnit QuickCheck regexPosix
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
deleted file mode 100644
index c01793881ad..00000000000
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl
-, operational, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-cairo";
-  version = "1.3.2";
-  sha256 = "19ghd5xav7pn3z5igbkbsa81vhlpvy55xscc42vbxx1v9f6shq7g";
-  buildDepends = [
-    cairo Chart colour dataDefaultClass lens mtl operational time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Cairo backend for Charts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
deleted file mode 100644
index d6b17ec320f..00000000000
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore
-, diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl
-, operational, SVGFonts, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-diagrams";
-  version = "1.3.2";
-  sha256 = "0q5qvzzl5wirlj26a6zpnyq95lpzzkwiqq0mkh25aa3qzzbg4y6g";
-  buildDepends = [
-    blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
-    diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
-    time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Diagrams backend for Charts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
deleted file mode 100644
index 6d55bedb24f..00000000000
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, Chart, ChartCairo, colour, dataDefaultClass, gtk
-, mtl, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Chart-gtk";
-  version = "1.3.2";
-  sha256 = "175bqh5pl4z0gx50z34afg149g94qw8sk87gbp9mavh5bnpj5a07";
-  buildDepends = [
-    cairo Chart ChartCairo colour dataDefaultClass gtk mtl time
-  ];
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "Utility functions for using the chart library with GTK";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
deleted file mode 100644
index c41fa5a5a5d..00000000000
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colour, dataDefaultClass, lens, mtl, operational, time }:
-
-cabal.mkDerivation (self: {
-  pname = "Chart";
-  version = "1.3.2";
-  sha256 = "0y4xkqdmbyyaxf810dgz0zsfmywlx07c26s9wkk155iriz0yz4m9";
-  buildDepends = [
-    colour dataDefaultClass lens mtl operational time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/timbod7/haskell-chart/wiki";
-    description = "A library for generating 2D Charts and Plots";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
deleted file mode 100644
index 829af010da7..00000000000
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, random, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "ChasingBottoms";
-  version = "1.3.0.8";
-  sha256 = "1f6jg4j17s3y7hcz9gp7cffa77p57xgzv15ng5ypcxpq603721dv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl QuickCheck random syb ];
-  jailbreak = true;
-  meta = {
-    description = "For testing partial and infinite values";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
deleted file mode 100644
index a2923dc19dd..00000000000
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MissingH, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "ConfigFile";
-  version = "1.1.4";
-  sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ MissingH mtl parsec ];
-  meta = {
-    homepage = "http://software.complete.org/configfile";
-    description = "Configuration file reading & writing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
deleted file mode 100644
index 18f095cd8b1..00000000000
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, HUnit, json, mtl, network, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "CouchDB";
-  version = "1.2";
-  sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
-  buildDepends = [ HTTP json mtl network utf8String ];
-  testDepends = [ HTTP HUnit json mtl network utf8String ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/arjunguha/haskell-couchdb/";
-    description = "CouchDB interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
deleted file mode 100644
index d9a494fe94e..00000000000
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "Crypto";
-  version = "4.2.5.1";
-  sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HUnit QuickCheck random ];
-  meta = {
-    description = "Collects together existing Haskell cryptographic functions into a package";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
deleted file mode 100644
index b361ae045fb..00000000000
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, dataDefault, either, errors, exceptions
-, httpClient, httpClientTls, httpTypes, lens, mtl, network
-, networkUri, optparseApplicative, transformers, transformersBase
-, utf8String, xmlConduit, xmlHamlet
-}:
-
-cabal.mkDerivation (self: {
-  pname = "DAV";
-  version = "1.0.3";
-  sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    caseInsensitive dataDefault either errors exceptions httpClient
-    httpClientTls httpTypes lens mtl network networkUri
-    optparseApplicative transformers transformersBase utf8String
-    xmlConduit xmlHamlet
-  ];
-  meta = {
-    homepage = "http://floss.scru.org/hDAV";
-    description = "RFC 4918 WebDAV support";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix
deleted file mode 100644
index 741368799d1..00000000000
--- a/pkgs/development/libraries/haskell/DRBG/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cipherAes128, cryptoApi, cryptohashCryptoapi
-, entropy, mtl, parallel, prettyclass, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "DRBG";
-  version = "0.5.3";
-  sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal cipherAes128 cryptoApi cryptohashCryptoapi entropy mtl
-    parallel prettyclass tagged
-  ];
-  meta = {
-    description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Decimal/default.nix b/pkgs/development/libraries/haskell/Decimal/default.nix
deleted file mode 100644
index 03ae15a24d1..00000000000
--- a/pkgs/development/libraries/haskell/Decimal/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Decimal";
-  version = "0.4.2";
-  sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
-    description = "Decimal numbers with variable precision";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
deleted file mode 100644
index 478cb6d657a..00000000000
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Diff";
-  version = "0.3.0";
-  sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98";
-  meta = {
-    description = "O(ND) diff algorithm in haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix
deleted file mode 100644
index 23467560530..00000000000
--- a/pkgs/development/libraries/haskell/EitherT/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadControl, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "EitherT";
-  version = "0.2.0";
-  sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
-  buildDepends = [ monadControl transformers transformersBase ];
-  meta = {
-    description = "EitherT monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Extra-lib/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix
deleted file mode 100644
index d244700e58a..00000000000
--- a/pkgs/development/libraries/haskell/Extra-lib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5
-, QuickCheck, random, regexCompat, time, Unixutils, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Extra";
-  version = "1.46.3";
-  sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
-  buildDepends = [
-    bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random
-    regexCompat time Unixutils zlib
-  ];
-  meta = {
-    homepage = "https://github.com/ddssff/haskell-extra";
-    description = "A grab bag of modules";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix
deleted file mode 100644
index 6f0405807fb..00000000000
--- a/pkgs/development/libraries/haskell/FerryCore/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HaXml, mtl, parsec, TableAlgebra }:
-
-cabal.mkDerivation (self: {
-  pname = "FerryCore";
-  version = "0.4.6.4";
-  sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
-  buildDepends = [ HaXml mtl parsec TableAlgebra ];
-  meta = {
-    description = "Ferry Core Components";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
deleted file mode 100644
index 325ed34c5d6..00000000000
--- a/pkgs/development/libraries/haskell/FontyFruity/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, filepath, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "FontyFruity";
-  version = "0.4";
-  sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf";
-  buildDepends = [ binary deepseq filepath text vector ];
-  meta = {
-    description = "A true type file format loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLFW-b/default.nix b/pkgs/development/libraries/haskell/GLFW-b/default.nix
deleted file mode 100644
index f3bdfebbe67..00000000000
--- a/pkgs/development/libraries/haskell/GLFW-b/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "GLFW-b";
-  version = "1.4.6";
-  sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy";
-  buildDepends = [ bindingsGLFW ];
-  testDepends = [
-    bindingsGLFW HUnit testFramework testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    description = "Bindings to GLFW OpenGL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
deleted file mode 100644
index fb554c95dfc..00000000000
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "GLFW";
-  version = "0.5.2.2";
-  sha256 = "0yqvfkg9p5h5bv3ak6b89am9kan9lbcq26kg1wk53xl6mz1aaijf";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/GLFW";
-    description = "A Haskell binding for GLFW";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
deleted file mode 100644
index d389d7ecf04..00000000000
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, mesa, OpenGLRaw }:
-
-cabal.mkDerivation (self: {
-  pname = "GLURaw";
-  version = "1.4.0.1";
-  sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn";
-  buildDepends = [ OpenGLRaw ];
-  extraLibraries = [ freeglut mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/default.nix b/pkgs/development/libraries/haskell/GLUT/default.nix
deleted file mode 100644
index b2cce856524..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGLRaw
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.5.1.1";
-  sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa";
-  buildDepends = [ OpenGL OpenGLRaw ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
deleted file mode 100644
index 0b7910a7e0f..00000000000
--- a/pkgs/development/libraries/haskell/GLUtil/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUtil";
-  version = "0.8.2";
-  sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3";
-  buildDepends = [
-    cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers
-    vector
-  ];
-  buildTools = [ cpphs ];
-  meta = {
-    description = "Miscellaneous OpenGL utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix
deleted file mode 100644
index d2b8fedfc5e..00000000000
--- a/pkgs/development/libraries/haskell/GenericPretty/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "GenericPretty";
-  version = "1.2.1";
-  sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-  meta = {
-    homepage = "https://github.com/RazvanRanca/GenericPretty";
-    description = "A generic, derivable, haskell pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix
deleted file mode 100644
index 565f213c42b..00000000000
--- a/pkgs/development/libraries/haskell/Glob/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "Glob";
-  version = "0.7.5";
-  sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
-  buildDepends = [ dlist filepath transformers ];
-  meta = {
-    homepage = "http://iki.fi/matti.niemenmaa/glob/";
-    description = "Globbing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
deleted file mode 100644
index 0223d6c6ae5..00000000000
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm }:
-
-cabal.mkDerivation (self: {
-  pname = "GlomeVec";
-  version = "0.2";
-  sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
-  buildTools = [ llvm ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Glome";
-    description = "Simple 3D vector library";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
deleted file mode 100644
index 8e42eaa01d0..00000000000
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Graphalyze";
-  version = "0.14.1.0";
-  sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3";
-  buildDepends = [
-    bktrees fgl filepath graphviz pandoc random text time
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Graph-Theoretic Analysis library";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
deleted file mode 100644
index 9622ea5d0dc..00000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HDBC, mtl, odbc, time, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-odbc";
-  version = "2.4.0.0";
-  sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HDBC mtl time utf8String ];
-  extraLibraries = [ odbc ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/hdbc/hdbc-odbc";
-    description = "ODBC driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
deleted file mode 100644
index 6b0df7e9d85..00000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-postgresql";
-  version = "2.3.2.2";
-  sha256 = "0x42lf429dxjkz22jn5fybimlixxs20zq01ap40344qlwh01hd90";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ convertible HDBC mtl parsec time utf8String ];
-  extraLibraries = [ postgresql ];
-  meta = {
-    homepage = "http://github.com/hdbc/hdbc-postgresql";
-    description = "PostgreSQL driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
deleted file mode 100644
index 563cc38dac3..00000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HDBC, mtl, sqlite, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC-sqlite3";
-  version = "2.3.3.0";
-  sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ HDBC mtl utf8String ];
-  extraLibraries = [ sqlite ];
-  meta = {
-    homepage = "http://software.complete.org/hdbc-sqlite3";
-    description = "Sqlite v3 driver for HDBC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
deleted file mode 100644
index fb835885462..00000000000
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, convertible, mtl, text, time, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HDBC";
-  version = "2.4.0.0";
-  sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ convertible mtl text time utf8String ];
-  meta = {
-    homepage = "https://github.com/hdbc/hdbc";
-    description = "Haskell Database Connectivity";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
deleted file mode 100644
index 05caf6975ac..00000000000
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fuse }:
-
-cabal.mkDerivation (self: {
-  pname = "HFuse";
-  version = "0.2.4.4";
-  sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc";
-  isLibrary = true;
-  isExecutable = true;
-  extraLibraries = [ fuse ];
-  preConfigure = ''
-    sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
-  '';
-  meta = {
-    homepage = "https://github.com/m15k/hfuse";
-    description = "HFuse is a binding for the Linux FUSE library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
deleted file mode 100644
index d2c88291fc2..00000000000
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl
-, syb, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HList";
-  version = "0.3.4.1";
-  sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
-  buildDepends = [ mtl tagged ];
-  testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
-  buildTools = [ diffutils ];
-  doCheck = false;
-  meta = {
-    description = "Heterogeneous lists";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix
deleted file mode 100644
index d34e590e9e6..00000000000
--- a/pkgs/development/libraries/haskell/HPDF/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, random, vector, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "HPDF";
-  version = "1.4.6";
-  sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9";
-  buildDepends = [ binary mtl random vector zlib ];
-  meta = {
-    homepage = "http://www.alpheccar.org";
-    description = "Generation of PDF documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
deleted file mode 100644
index 01c0595e900..00000000000
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HSH";
-  version = "2.1.2";
-  sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath hslogger MissingH mtl regexBase regexCompat regexPosix
-  ];
-  meta = {
-    homepage = "http://software.complete.org/hsh";
-    description = "Library to mix shell scripting with Haskell programs";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
deleted file mode 100644
index 23fd31b2b3d..00000000000
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
-, time, utf8String, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HStringTemplate";
-  version = "0.7.3";
-  sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8";
-  buildDepends = [
-    blazeBuilder deepseq filepath mtl parsec syb text time utf8String
-    void
-  ];
-  meta = {
-    description = "StringTemplate implementation in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
deleted file mode 100644
index cc27d4cf2ae..00000000000
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, base64Bytestring, cpphs, Diff
-, filepath, haskellLexer, haskellSrc, HUnit, liftedBase
-, monadControl, mtl, QuickCheck, random, regexCompat, temporary
-, text, time, unorderedContainers, vector, xmlgen
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTF";
-  version = "0.12.2.3";
-  sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base64Bytestring cpphs Diff haskellLexer haskellSrc HUnit
-    liftedBase monadControl mtl QuickCheck random regexCompat text time
-    vector xmlgen
-  ];
-  testDepends = [
-    aeson aesonPretty filepath HUnit mtl random regexCompat temporary
-    text unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/skogsbaer/HTF/";
-    description = "The Haskell Test Framework";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/default.nix b/pkgs/development/libraries/haskell/HTTP/default.nix
deleted file mode 100644
index 0a5a16dfadc..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
-, httpTypes, HUnit, mtl, network, networkUri, parsec, pureMD5
-, split, testFramework, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.18";
-  sha256 = "1jn0ikbdwhd32qjwpnsmpnmy0dxhmwfhf8851ifxik91fn7j5j4k";
-  buildDepends = [ mtl network networkUri parsec ];
-  testDepends = [
-    caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
-    HUnit mtl network networkUri pureMD5 split testFramework
-    testFrameworkHunit wai warp
-  ];
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit-approx/default.nix b/pkgs/development/libraries/haskell/HUnit-approx/default.nix
deleted file mode 100644
index b507aa21cbb..00000000000
--- a/pkgs/development/libraries/haskell/HUnit-approx/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit-approx";
-  version = "1.0";
-  sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1";
-  buildDepends = [ HUnit ];
-  testDepends = [ HUnit ];
-  meta = {
-    homepage = "https://github.com/goldfirere/HUnit-approx";
-    description = "Approximate equality for floating point numbers with HUnit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/default.nix b/pkgs/development/libraries/haskell/HUnit/default.nix
deleted file mode 100644
index 0ab6f152aee..00000000000
--- a/pkgs/development/libraries/haskell/HUnit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.5.2";
-  sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix
deleted file mode 100644
index 9f5c8c76097..00000000000
--- a/pkgs/development/libraries/haskell/HaTeX/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, matrix, parsec, QuickCheck, tasty, tastyQuickcheck, text
-, transformers, wlPprintExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HaTeX";
-  version = "3.16.0.0";
-  sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa";
-  buildDepends = [
-    matrix parsec QuickCheck text transformers wlPprintExtras
-  ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck text ];
-  meta = {
-    homepage = "http://wrongurl.net/haskell/HaTeX";
-    description = "The Haskell LaTeX library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
deleted file mode 100644
index d20d7be551c..00000000000
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, polyparse, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaXml";
-  version = "1.25";
-  sha256 = "02l53v9c8qzkp5zzs31973pp27q4k2h04h9x3852gah78qjvnslk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath polyparse random ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://projects.haskell.org/HaXml/";
-    description = "Utilities for manipulating XML documents";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
deleted file mode 100644
index 69915ccfeef..00000000000
--- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HTTP, hxt, hxtHttp, MaybeT, mtl, network
-, networkUri, parsec, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HandsomeSoup";
-  version = "0.3.5";
-  sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    HTTP hxt hxtHttp MaybeT mtl network networkUri parsec transformers
-  ];
-  testDepends = [ hspec hxt ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/egonSchiele/HandsomeSoup";
-    description = "Work with HTML more easily in HXT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
deleted file mode 100644
index 9bd9c9f4796..00000000000
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellForMaths";
-  version = "0.4.5";
-  sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://haskellformaths.blogspot.com/";
-    description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
deleted file mode 100644
index 2aad877f688..00000000000
--- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, connection, dataDefault, HaskellNet, network, tls }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellNet-SSL";
-  version = "0.2.5.2";
-  sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp";
-  buildDepends = [ connection dataDefault HaskellNet network tls ];
-  meta = {
-    homepage = "https://github.com/dpwright/HaskellNet-SSL";
-    description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix
deleted file mode 100644
index 284bdce9737..00000000000
--- a/pkgs/development/libraries/haskell/HaskellNet/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }:
-
-cabal.mkDerivation (self: {
-  pname = "HaskellNet";
-  version = "0.4";
-  sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp";
-  buildDepends = [
-    base64String cryptohash mimeMail mtl network text
-  ];
-  meta = {
-    homepage = "https://github.com/jtdaugherty/HaskellNet";
-    description = "Client support for POP3, SMTP, and IMAP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
deleted file mode 100644
index c752b20551d..00000000000
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, openssl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "HsOpenSSL";
-  version = "0.11.1";
-  sha256 = "1v73xjq3hxdzsrisyyshr46i7p9psinjbmc1z49cxgwisg8mn5xy";
-  buildDepends = [ network time ];
-  extraLibraries = [ openssl ];
-  meta = {
-    homepage = "https://github.com/phonohawk/HsOpenSSL";
-    description = "Partial OpenSSL binding for Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix
deleted file mode 100644
index 1be5744b6a3..00000000000
--- a/pkgs/development/libraries/haskell/HsSyck/0.51.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HsSyck";
-  version = "0.51";
-  sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49";
-  buildDepends = [ hashtables syb utf8String ];
-  meta = {
-    description = "Fast, lightweight YAML loader and dumper";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HsSyck/0.52.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix
deleted file mode 100644
index b3d64e539e1..00000000000
--- a/pkgs/development/libraries/haskell/HsSyck/0.52.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "HsSyck";
-  version = "0.52";
-  sha256 = "1hdckbm60pzmydaz4rsw3kz9byd205987jcddakyhmgfinzvqwvc";
-  buildDepends = [ hashtables syb utf8String ];
-  meta = {
-    description = "Fast, lightweight YAML loader and dumper";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix
deleted file mode 100644
index 980ab8c448c..00000000000
--- a/pkgs/development/libraries/haskell/IORefCAS/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitsAtomic, HUnit, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "IORefCAS";
-  version = "0.2.0.1";
-  sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
-  buildDepends = [ bitsAtomic ];
-  testDepends = [ bitsAtomic HUnit QuickCheck time ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
-    description = "Atomic compare and swap for IORefs and STRefs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
deleted file mode 100644
index f9f95586b45..00000000000
--- a/pkgs/development/libraries/haskell/IOSpec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, Stream }:
-
-cabal.mkDerivation (self: {
-  pname = "IOSpec";
-  version = "0.2.5";
-  sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
-  buildDepends = [ mtl QuickCheck Stream ];
-  meta = {
-    description = "A pure specification of the IO monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
deleted file mode 100644
index 0f211b4cd50..00000000000
--- a/pkgs/development/libraries/haskell/IfElse/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "IfElse";
-  version = "0.85";
-  sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Anaphoric and miscellaneous useful control-flow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
deleted file mode 100644
index 65b53d91b52..00000000000
--- a/pkgs/development/libraries/haskell/IntervalMap/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "IntervalMap";
-  version = "0.4.0.1";
-  sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
-  buildDepends = [ deepseq ];
-  testDepends = [ Cabal deepseq QuickCheck ];
-  meta = {
-    homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
-    description = "Maps from Intervals to values, with efficient search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
deleted file mode 100644
index ca3e10682fa..00000000000
--- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, JuicyPixels, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "JuicyPixels-util";
-  version = "0.2";
-  sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
-  buildDepends = [ JuicyPixels vector ];
-  meta = {
-    homepage = "https://github.com/fumieval/JuicyPixels-util";
-    description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
deleted file mode 100644
index e8c1c610e89..00000000000
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, mtl, primitive, transformers, vector
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "JuicyPixels";
-  version = "3.2";
-  sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5";
-  buildDepends = [
-    binary deepseq mtl primitive transformers vector zlib
-  ];
-  meta = {
-    homepage = "https://github.com/Twinside/Juicy.Pixels";
-    description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix
deleted file mode 100644
index 7fef7155190..00000000000
--- a/pkgs/development/libraries/haskell/List/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "List";
-  version = "0.5.1";
-  sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/yairchu/generator/tree";
-    description = "List monad transformer and class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
deleted file mode 100644
index 1e99f819bcc..00000000000
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "ListLike";
-  version = "4.1.0";
-  sha256 = "0j78mm9vsl3scwgqp4h2bhq54hf22bxj9cg9pl26d12zw7038kwj";
-  buildDepends = [ dlist fmlist text vector ];
-  testDepends = [ dlist fmlist HUnit QuickCheck random text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://software.complete.org/listlike";
-    description = "Generic support for list-like structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix
deleted file mode 100644
index 0f3edbaf5f2..00000000000
--- a/pkgs/development/libraries/haskell/ListZipper/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "ListZipper";
-  version = "1.2.0.2";
-  sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    description = "Simple zipper for lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
deleted file mode 100644
index aaf84a84187..00000000000
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession
-, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes
-, monadloc, mtl, parsec, pwstoreFast, random, RefSerialize
-, resourcet, stm, TCache, text, time, transformers, utf8String
-, vector, wai, waiExtra, warp, warpTls, Workflow
-}:
-
-cabal.mkDerivation (self: {
-  pname = "MFlow";
-  version = "0.4.5.9";
-  sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
-  buildDepends = [
-    blazeHtml blazeMarkup caseInsensitive clientsession conduit
-    conduitExtra extensibleExceptions httpTypes monadloc mtl parsec
-    pwstoreFast random RefSerialize resourcet stm TCache text time
-    transformers utf8String vector wai waiExtra warp warpTls Workflow
-  ];
-  buildTools = [ cpphs ];
-  meta = {
-    description = "stateful, RESTful web framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
deleted file mode 100644
index 012ce6249fc..00000000000
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "MaybeT";
-  version = "0.1.2";
-  sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "MaybeT monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
deleted file mode 100644
index 3e7f1818039..00000000000
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, void }:
-
-cabal.mkDerivation (self: {
-  pname = "MemoTrie";
-  version = "0.6.2";
-  sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
-  buildDepends = [ void ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/MemoTrie";
-    description = "Trie-based memo functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
deleted file mode 100644
index 3115c437b09..00000000000
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl
-, network, parsec, QuickCheck, random, regexCompat, testpack, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "MissingH";
-  version = "1.3.0.1";
-  sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
-  buildDepends = [
-    filepath hslogger HUnit mtl network parsec random regexCompat time
-  ];
-  testDepends = [
-    errorcallEqInstance filepath hslogger HUnit mtl network parsec
-    QuickCheck random regexCompat testpack time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://software.complete.org/missingh";
-    description = "Large utility library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
deleted file mode 100644
index 11e97d72ea8..00000000000
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, MonadCatchIOTransformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadCatchIO-mtl";
-  version = "0.3.1.0";
-  sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
-  buildDepends = [ extensibleExceptions MonadCatchIOTransformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
-    description = "Monad-transformer version of the Control.Exception module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
deleted file mode 100644
index d4cbd7c09ba..00000000000
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadCatchIO-transformers";
-  version = "0.3.1.2";
-  sha256 = "1r5c4qz6yp1qrsmk9di35d5kk2dcnaxh2mg3n5kdim991ydzsi1d";
-  buildDepends = [ extensibleExceptions monadsTf transformers ];
-  jailbreak = true;
-  meta = {
-    description = "Monad-transformer compatible version of the Control.Exception module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
deleted file mode 100644
index 412f24450c4..00000000000
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadPrompt";
-  version = "1.0.0.5";
-  sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "MonadPrompt, implementation & examples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
deleted file mode 100644
index 41796adb963..00000000000
--- a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadRandom";
-  version = "0.2.0.1";
-  sha256 = "1689302z053zhcr46w5q3a57kd6z365kkgzxh638gcakzzk3pmwm";
-  buildDepends = [ mtl random transformers ];
-  meta = {
-    description = "Random-number generation monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
deleted file mode 100644
index 0362804ed45..00000000000
--- a/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "MonadRandom";
-  version = "0.3.0.1";
-  sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0";
-  buildDepends = [ mtl random transformers ];
-  meta = {
-    description = "Random-number generation monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
deleted file mode 100644
index 38fbbfdbfbf..00000000000
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "NumInstances";
-  version = "1.4";
-  sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
-  meta = {
-    homepage = "https://github.com/conal/NumInstances";
-    description = "Instances of numeric classes for functions and tuples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
deleted file mode 100644
index e2fed3f2191..00000000000
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ObjectName";
-  version = "1.0.1.0";
-  sha256 = "1aw221i1cisk7jpgchs16f3br0ddllh0n0idhw5v6n6ysv4vv155";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/ObjectName";
-    description = "Explicitly handled object names";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix
deleted file mode 100644
index b2af0024b5c..00000000000
--- a/pkgs/development/libraries/haskell/OneTuple/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "OneTuple";
-  version = "0.2.1";
-  sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-  meta = {
-    description = "Singleton Tuple";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
deleted file mode 100644
index 98aac94e01d..00000000000
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, openal, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenAL";
-  version = "1.6.0.0";
-  sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ openal ];
-  meta = {
-    homepage = "https://github.com/haskell-openal/ALUT";
-    description = "A binding to the OpenAL cross-platform 3D audio API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/default.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix
deleted file mode 100644
index f6767ab577c..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, OpenGLRaw, text }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.9.2.0";
-  sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p";
-  buildDepends = [ GLURaw OpenGLRaw text ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
deleted file mode 100644
index 65466306fd8..00000000000
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGLRaw";
-  version = "1.5.0.0";
-  sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5";
-  extraLibraries = [ mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix
deleted file mode 100644
index 751dadebfa8..00000000000
--- a/pkgs/development/libraries/haskell/PSQueue/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "PSQueue";
-  version = "1.1";
-  sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
-  meta = {
-    description = "Priority Search Queue";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/default.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix
deleted file mode 100644
index 3c623e9f0dd..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, testFramework, tfRandom, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.7.6";
-  sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
-  buildDepends = [ random tfRandom transformers ];
-  testDepends = [ testFramework ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/nick8325/quickcheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
deleted file mode 100644
index 53655d46765..00000000000
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG, pureMD5
-, QuickCheck, SHA, tagged, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "RSA";
-  version = "2.1.0";
-  sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a";
-  buildDepends = [ binary cryptoApi cryptoPubkeyTypes pureMD5 SHA ];
-  testDepends = [
-    binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA
-    tagged testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
deleted file mode 100644
index 51296cb2a0e..00000000000
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "Ranged-sets";
-  version = "0.3.0";
-  sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-  buildDepends = [ HUnit QuickCheck ];
-  meta = {
-    homepage = "http://code.haskell.org/ranged-sets";
-    description = "Ranged sets for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
deleted file mode 100644
index 5380cb59659..00000000000
--- a/pkgs/development/libraries/haskell/Rasterific/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity
-, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector
-, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Rasterific";
-  version = "0.4";
-  sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z";
-  buildDepends = [
-    dlist FontyFruity free JuicyPixels mtl primitive vector
-    vectorAlgorithms
-  ];
-  testDepends = [
-    binary criterion deepseq filepath FontyFruity JuicyPixels
-    QuickCheck statistics vector
-  ];
-  doCheck = false;
-  meta = {
-    description = "A pure haskell drawing engine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
deleted file mode 100644
index c9f10744976..00000000000
--- a/pkgs/development/libraries/haskell/ReadArgs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "ReadArgs";
-  version = "1.2.2";
-  sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ systemFilepath text ];
-  testDepends = [ hspec systemFilepath text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/rampion/ReadArgs";
-    description = "Simple command line argument parsing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix
deleted file mode 100644
index 1307d4ae42e..00000000000
--- a/pkgs/development/libraries/haskell/RefSerialize/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashtables, stringsearch }:
-
-cabal.mkDerivation (self: {
-  pname = "RefSerialize";
-  version = "0.3.1.3";
-  sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm";
-  buildDepends = [ binary hashtables stringsearch ];
-  meta = {
-    description = "Write to and read from ByteStrings maintaining internal memory references";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
deleted file mode 100644
index f62f1b1392e..00000000000
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, typeEquality }:
-
-cabal.mkDerivation (self: {
-  pname = "RepLib";
-  version = "0.5.3.3";
-  sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
-  buildDepends = [ mtl typeEquality ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://code.google.com/p/replib/";
-    description = "Generic programming library with representation types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
deleted file mode 100644
index c744ca41cf9..00000000000
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_image }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-image";
-  version = "0.6.1";
-  sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_image ];
-  meta = {
-    description = "Binding to libSDL_image";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
deleted file mode 100644
index 7ec8cecd92c..00000000000
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_mixer }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-mixer";
-  version = "0.6.1";
-  sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_mixer ];
-  meta = {
-    description = "Binding to libSDL_mixer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
deleted file mode 100644
index 77c3434216a..00000000000
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL, SDL_ttf }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL-ttf";
-  version = "0.6.2";
-  sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a";
-  buildDepends = [ SDL ];
-  extraLibraries = [ SDL_ttf ];
-  meta = {
-    description = "Binding to libSDL_ttf";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
deleted file mode 100644
index 6eca4791fcf..00000000000
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL }:
-
-cabal.mkDerivation (self: {
-  pname = "SDL";
-  version = "0.6.5";
-  sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
-  extraLibraries = [ SDL ];
-  meta = {
-    description = "Binding to libSDL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
deleted file mode 100644
index 2a9c98ef67a..00000000000
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "SHA";
-  version = "1.6.4.1";
-  sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary ];
-  meta = {
-    description = "Implementations of the SHA suite of message digest functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SHA2/default.nix b/pkgs/development/libraries/haskell/SHA2/default.nix
deleted file mode 100644
index 769192146ae..00000000000
--- a/pkgs/development/libraries/haskell/SHA2/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, AES, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "SHA2";
-  version = "0.2.5";
-  sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
-  buildDepends = [ AES monadsTf transformers ];
-  meta = {
-    description = "Fast, incremental SHA hashing for bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
deleted file mode 100644
index c070ab8dcaa..00000000000
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, hsemail, network }:
-
-cabal.mkDerivation (self: {
-  pname = "SMTPClient";
-  version = "1.1.0";
-  sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
-  buildDepends = [ extensibleExceptions hsemail network ];
-  meta = {
-    description = "A simple SMTP client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/STMonadTrans/default.nix b/pkgs/development/libraries/haskell/STMonadTrans/default.nix
deleted file mode 100644
index 34ef6152cd2..00000000000
--- a/pkgs/development/libraries/haskell/STMonadTrans/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "STMonadTrans";
-  version = "0.3.2";
-  sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "A monad transformer version of the ST monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
deleted file mode 100644
index a4bb78eca68..00000000000
--- a/pkgs/development/libraries/haskell/SVGFonts/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass
-, diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "SVGFonts";
-  version = "1.4.0.3";
-  sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
-  buildDepends = [
-    attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
-    split text tuple vector vectorSpace xml
-  ];
-  meta = {
-    description = "Fonts from the SVG-Font format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
deleted file mode 100644
index 577af377488..00000000000
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "SafeSemaphore";
-  version = "0.10.1";
-  sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit ];
-  meta = {
-    homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
-    description = "Much safer replacement for QSemN, QSem, and SampleVar";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
deleted file mode 100644
index 1715d62b02b..00000000000
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "Shellac";
-  version = "0.9.5.2";
-  sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://rwd.rdockins.name/shellac/home/";
-    description = "A framework for creating shell envinronments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
deleted file mode 100644
index b4bd9b44e3f..00000000000
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "StateVar";
-  version = "1.0.1.0";
-  sha256 = "02n2sxxkr0ydc77dc3amwp5jrw289d2s2z55rhrmhxxg1c7lp5js";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/StateVar";
-    description = "State variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
deleted file mode 100644
index 2fa2a91efe8..00000000000
--- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "Strafunski-StrategyLib";
-  version = "5.0.0.4";
-  sha256 = "0miffjc8li5l1jarmz8l34z5mx3q68pyxghsi1lbda51bzz3wy1g";
-  buildDepends = [ mtl syb ];
-  jailbreak = true;
-  meta = {
-    description = "Library for strategic programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
deleted file mode 100644
index 3e1c1b7b32e..00000000000
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lazysmallcheck, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "Stream";
-  version = "0.4.7.1";
-  sha256 = "08h0h6pwvfcj92n7mk5za36x9agpqnax12cjlvd68zwghjf9qxy3";
-  buildDepends = [ lazysmallcheck QuickCheck ];
-  meta = {
-    description = "A library for manipulating infinite lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix
deleted file mode 100644
index 9c2638302a5..00000000000
--- a/pkgs/development/libraries/haskell/TCache/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashtables, mtl, RefSerialize, stm, text }:
-
-cabal.mkDerivation (self: {
-  pname = "TCache";
-  version = "0.12.0";
-  sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
-  buildDepends = [ hashtables mtl RefSerialize stm text ];
-  meta = {
-    description = "A Transactional cache with user-defined persistence";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
deleted file mode 100644
index 396f2366d15..00000000000
--- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HaXml, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "TableAlgebra";
-  version = "0.7.1";
-  sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
-  buildDepends = [ HaXml mtl ];
-  meta = {
-    description = "Ferry Table Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
deleted file mode 100644
index 8b5869caae9..00000000000
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Tensor";
-  version = "1.1.0.0";
-  sha256 = "1vn409805p5b47v5mf7rk0gypqag5bn1pzlsmsp9blr3jyj6dgph";
-  meta = {
-    homepage = "https://github.com/haskell-opengl/Tensor";
-    description = "Tensor data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix
deleted file mode 100644
index bbd5f45f9ca..00000000000
--- a/pkgs/development/libraries/haskell/Thrift/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HTTP, network }:
-
-cabal.mkDerivation (self: {
-  pname = "Thrift";
-  version = "0.6.0.1";
-  sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
-  buildDepends = [ binary HTTP network ];
-  meta = {
-    homepage = "http://thrift.apache.org";
-    description = "Haskell bindings for the Apache Thrift RPC system";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix
deleted file mode 100644
index de5f41ab384..00000000000
--- a/pkgs/development/libraries/haskell/TypeCompose/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "TypeCompose";
-  version = "0.9.10";
-  sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
-  meta = {
-    homepage = "https://github.com/conal/TypeCompose";
-    description = "Type composition classes & instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix
deleted file mode 100644
index c776686509b..00000000000
--- a/pkgs/development/libraries/haskell/Unixutils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, pureMD5, regexTdfa, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "Unixutils";
-  version = "1.52";
-  sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
-  buildDepends = [ filepath pureMD5 regexTdfa zlib ];
-  meta = {
-    homepage = "https://github.com/seereason/haskell-unixutils";
-    description = "A crude interface between Haskell and Unix-like operating systems";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
deleted file mode 100644
index eab20222769..00000000000
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Vec";
-  version = "1.0.5";
-  sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
-  meta = {
-    homepage = "http://github.net/sedillard/Vec";
-    description = "Fixed-length lists and low-dimensional linear algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix
deleted file mode 100644
index 6082f5e76cf..00000000000
--- a/pkgs/development/libraries/haskell/WAVE/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parseargs }:
-
-cabal.mkDerivation (self: {
-  pname = "WAVE";
-  version = "0.1.3";
-  sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parseargs ];
-  meta = {
-    homepage = "http://github.com/BartMassey/WAVE";
-    description = "WAVE audio file IO library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix
deleted file mode 100644
index 7dd6f298576..00000000000
--- a/pkgs/development/libraries/haskell/Workflow/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, exceptions, extensibleExceptions, mtl
-, RefSerialize, stm, TCache, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Workflow";
-  version = "0.8.1";
-  sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l";
-  buildDepends = [
-    binary exceptions extensibleExceptions mtl RefSerialize stm TCache
-    vector
-  ];
-  meta = {
-    description = "Workflow patterns over a monad for thread state logging & recovery";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
deleted file mode 100644
index df9ddb1e277..00000000000
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11
-}:
-
-cabal.mkDerivation (self: {
-  pname = "X11-xft";
-  version = "0.3.1";
-  sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
-  buildDepends = [ utf8String X11 ];
-  extraLibraries = [ fontconfig freetype pkgconfig ];
-  pkgconfigDepends = [ libXft ];
-  configureFlags = "--extra-include-dirs=${freetype}/include/freetype2";
-  meta = {
-    description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
deleted file mode 100644
index fbd5e2c0c7b..00000000000
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr
-, libXrender
-}:
-
-cabal.mkDerivation (self: {
-  pname = "X11";
-  version = "1.6.1.2";
-  sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
-  buildDepends = [ dataDefault ];
-  extraLibraries = [
-    libX11 libXext libXinerama libXrandr libXrender
-  ];
-  meta = {
-    homepage = "https://github.com/haskell-pkg-janitors/X11";
-    description = "A binding to the X11 graphics library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix
deleted file mode 100644
index 5ae451f8163..00000000000
--- a/pkgs/development/libraries/haskell/Yampa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "Yampa";
-  version = "0.9.6";
-  sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Yampa";
-    description = "Library for programming hybrid systems";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
deleted file mode 100644
index a5d171f177b..00000000000
--- a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, HUnit, random, testFramework
-, testFrameworkHunit, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-deque-tests";
-  version = "0.3";
-  sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
-  buildDepends = [
-    abstractDeque HUnit random testFramework testFrameworkHunit time
-  ];
-  testDepends = [
-    abstractDeque HUnit random testFramework testFrameworkHunit time
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "A test-suite for any queue or double-ended queue satisfying an interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
deleted file mode 100644
index 0bd1a7c5936..00000000000
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-deque";
-  version = "0.3";
-  sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
-  buildDepends = [ random time ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Abstract, parameterized interface to mutable Deques";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix
deleted file mode 100644
index 9c7319297ee..00000000000
--- a/pkgs/development/libraries/haskell/abstract-par/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "abstract-par";
-  version = "0.3.3";
-  sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "Type classes generalizing the functionality of the 'monad-par' library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
deleted file mode 100644
index 3bb444eec68..00000000000
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath
-, hashable, hashtables, languageCQuote, mainlandPretty, mtl
-, SafeSemaphore, srcloc, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-cuda";
-  version = "0.14.0.0";
-  sha256 = "1qms1w5rjjd77lldds2ljj9zr15dybnsaq8vxfyb5a4diq12bmi5";
-  buildDepends = [
-    accelerate binary cryptohash cuda fclabels filepath hashable
-    hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc
-    text transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-cuda/";
-    description = "Accelerate backend for NVIDIA GPUs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
deleted file mode 100644
index fcd4bb744dd..00000000000
--- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo
-, attoparsec, bmp, bytestringLexing, cereal, criterion, ekg
-, fclabels, filepath, gloss, glossAccelerate, glossRasterAccelerate
-, HUnit, mwcRandom, primitive, QuickCheck, random, repa, repaIo
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, vector, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-examples";
-  version = "0.14.0.0";
-  sha256 = "01hxww3ypjlcfimkvf7gxl2g7msad2yw1d6m0h4kkfqvpx84nfwr";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    accelerate accelerateCuda accelerateFft accelerateIo attoparsec bmp
-    bytestringLexing cereal criterion ekg fclabels filepath gloss
-    glossAccelerate glossRasterAccelerate HUnit mwcRandom primitive
-    QuickCheck random repa repaIo testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector vectorAlgorithms
-  ];
-  configureFlags = "-f-opencl";
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-examples";
-    description = "Examples using the Accelerate library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix
deleted file mode 100644
index e2f4fade736..00000000000
--- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, cuda, cufft }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-fft";
-  version = "0.14.0.0";
-  sha256 = "1rsrgrqn1gdds2wvv1mgzd3yg2mvbkgnj63ygjyzsk9j00wavd1g";
-  buildDepends = [ accelerate accelerateCuda cuda cufft ];
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-fft";
-    description = "FFT using the Accelerate library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix
deleted file mode 100644
index b8131da6c08..00000000000
--- a/pkgs/development/libraries/haskell/accelerate-io/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, bmp, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate-io";
-  version = "0.14.0.0";
-  sha256 = "1vvjmsfaz5xbvvb4x2fym43xvcjv41baxlfhlycgizaca4yw8w9h";
-  buildDepends = [ accelerate bmp repa vector ];
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate-io";
-    description = "Read and write Accelerate arrays in various formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix
deleted file mode 100644
index 5ab212a58a1..00000000000
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fclabels, hashable, hashtables, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "accelerate";
-  version = "0.14.0.0";
-  sha256 = "0b6mnv5l2vrbljak2yx9akpsyqc0qg1il54w0rlfm29fgqknlhjh";
-  buildDepends = [
-    fclabels hashable hashtables unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/AccelerateHS/accelerate/";
-    description = "An embedded language for accelerated array processing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
deleted file mode 100644
index ab2e682fdc8..00000000000
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, extensibleExceptions, filepath, mtl, network
-, safecopy, stm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "acid-state";
-  version = "0.12.3";
-  sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1";
-  buildDepends = [
-    cereal extensibleExceptions filepath mtl network safecopy stm
-  ];
-  meta = {
-    homepage = "http://acid-state.seize.it/";
-    description = "Add ACID guarantees to any serializable Haskell data structure";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
deleted file mode 100644
index 6b2a9856a90..00000000000
--- a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "acme-lookofdisapproval";
-  version = "0.1";
-  sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
-  meta = {
-    homepage = "https://github.com/llelf/acme-lookofdisapproval";
-    description = "Express your disapproval";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
deleted file mode 100644
index 02764c108f8..00000000000
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, newtype, QuickCheck, semigroupoids, semigroups
-, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "active";
-  version = "0.1.0.17";
-  sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb";
-  buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
-  testDepends = [
-    newtype QuickCheck semigroupoids semigroups vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Abstractions for animation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
deleted file mode 100644
index 72c53b5178a..00000000000
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataReify, doctest, erf, filepath, free, nats
-, reflection, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ad";
-  version = "4.2.1.1";
-  sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka";
-  buildDepends = [
-    comonad dataReify erf free nats reflection tagged transformers
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/ad";
-    description = "Automatic Differentiation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
deleted file mode 100644
index f02aa9df5dd..00000000000
--- a/pkgs/development/libraries/haskell/adjunctions/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, free, mtl
-, profunctors, semigroupoids, semigroups, tagged, transformers
-, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "adjunctions";
-  version = "4.2";
-  sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i";
-  buildDepends = [
-    comonad contravariant distributive free mtl profunctors
-    semigroupoids semigroups tagged transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/adjunctions/";
-    description = "Adjunctions and representable functors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
deleted file mode 100644
index 8e1959c401c..00000000000
--- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, cmdargs, text, unorderedContainers
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-pretty";
-  version = "0.7.2";
-  sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec cmdargs text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/informatikr/aeson-pretty";
-    description = "JSON pretty-printing library and command-line tool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
deleted file mode 100644
index d7c86d853fa..00000000000
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-qq";
-  version = "0.7.4";
-  sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
-  buildDepends = [ aeson haskellSrcMeta parsec text vector ];
-  testDepends = [ aeson haskellSrcMeta hspec parsec text vector ];
-  meta = {
-    homepage = "http://github.com/zalora/aeson-qq";
-    description = "JSON quasiquoter for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
deleted file mode 100644
index ee0df96618c..00000000000
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, scientific, text }:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-utils";
-  version = "0.2.2.1";
-  sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd";
-  buildDepends = [ aeson attoparsec scientific text ];
-  jailbreak = true;
-  meta = {
-    description = "Utilities for working with Aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
deleted file mode 100644
index 5dca4bc9062..00000000000
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
-, mtl, QuickCheck, scientific, syb, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.7.0.4";
-  sha256 = "009grccll41mkf7rarpcrn06l8vc0q0y8l4j9nbdfcl89153rj2k";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
-    text time unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/aeson";
-    description = "Fast JSON parsing and encoding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
deleted file mode 100644
index 0625dcf1913..00000000000
--- a/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
-, mtl, QuickCheck, scientific, syb, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.8.0.2";
-  sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
-    text time unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/aeson";
-    description = "Fast JSON parsing and encoding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix
deleted file mode 100644
index 2044c8ad872..00000000000
--- a/pkgs/development/libraries/haskell/algebra/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, distributive, mtl, nats, semigroupoids
-, semigroups, tagged, transformers, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "algebra";
-  version = "4.2";
-  sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
-  buildDepends = [
-    adjunctions distributive mtl nats semigroupoids semigroups tagged
-    transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/algebra/";
-    description = "Constructive abstract algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix
deleted file mode 100644
index 84f1485856f..00000000000
--- a/pkgs/development/libraries/haskell/alsa-core/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaLib, extensibleExceptions }:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-core";
-  version = "0.5.0.1";
-  sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
-  buildDepends = [ extensibleExceptions ];
-  pkgconfigDepends = [ alsaLib ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/ALSA";
-    description = "Binding to the ALSA Library API (Exceptions)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
deleted file mode 100644
index 0e097223f84..00000000000
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaCore, alsaLib, c2hs }:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-mixer";
-  version = "0.2.0.2";
-  sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
-  buildDepends = [ alsaCore ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ alsaLib ];
-  meta = {
-    homepage = "https://github.com/ttuegel/alsa-mixer";
-    description = "Bindings to the ALSA simple mixer API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
deleted file mode 100644
index e1ac0ea257e..00000000000
--- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alsaCore, alsaLib, extensibleExceptions, sampleFrame
-, storableRecord
-}:
-
-cabal.mkDerivation (self: {
-  pname = "alsa-pcm";
-  version = "0.6.0.3";
-  sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    alsaCore extensibleExceptions sampleFrame storableRecord
-  ];
-  pkgconfigDepends = [ alsaLib ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/ALSA";
-    description = "Binding to the ALSA Library API (PCM audio)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
deleted file mode 100644
index d91d4e1bdb8..00000000000
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, clock, connection, dataBinaryIeee754, hspec
-, hspecExpectations, monadControl, network, networkUri, split, text
-, vector, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "amqp";
-  version = "0.10.1";
-  sha256 = "1a2d17h1zhd2yv1zhd0vvr4g1v6nr188gwv12qwljs1v9y4jkbmc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary clock connection dataBinaryIeee754 monadControl network
-    networkUri split text vector xml
-  ];
-  testDepends = [
-    binary clock connection dataBinaryIeee754 hspec hspecExpectations
-    network split text vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/hreinhardt/amqp";
-    description = "Client library for AMQP servers (currently only RabbitMQ)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
deleted file mode 100644
index efefdc78f0d..00000000000
--- a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "annotated-wl-pprint";
-  version = "0.5.3";
-  sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
-  meta = {
-    homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
-    description = "The Wadler/Leijen Pretty Printer, with annotation support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
deleted file mode 100644
index 26fbb43ec04..00000000000
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ansi-terminal";
-  version = "0.6.2.1";
-  sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/feuerbach/ansi-terminal";
-    description = "Simple ANSI terminal support, with Windows compatibility";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
deleted file mode 100644
index d79f0bc979d..00000000000
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal }:
-
-cabal.mkDerivation (self: {
-  pname = "ansi-wl-pprint";
-  version = "0.6.7.1";
-  sha256 = "1by11bg1bd7z18hqgayk0w76hy5n63kmdl14gainlvfgr9jw506r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ ansiTerminal ];
-  meta = {
-    homepage = "http://github.com/batterseapower/ansi-wl-pprint";
-    description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix
deleted file mode 100644
index ef135f57766..00000000000
--- a/pkgs/development/libraries/haskell/appar/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "appar";
-  version = "0.1.4";
-  sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
-  meta = {
-    description = "A simple applicative parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/applicative-quoters/default.nix b/pkgs/development/libraries/haskell/applicative-quoters/default.nix
deleted file mode 100644
index 84bd2e1e438..00000000000
--- a/pkgs/development/libraries/haskell/applicative-quoters/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta }:
-
-cabal.mkDerivation (self: {
-  pname = "applicative-quoters";
-  version = "0.1.0.8";
-  sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
-  buildDepends = [ haskellSrcMeta ];
-  meta = {
-    description = "Quasiquoters for idiom brackets and an applicative do-notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix
deleted file mode 100644
index 2d282fae022..00000000000
--- a/pkgs/development/libraries/haskell/ariadne/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, bert, Cabal, dataLens, dataLensFd, dataLensTemplate
-, filepath, haskellNames, haskellPackages, haskellSrcExts, hseCpp
-, hslogger, mtl, stm, tagged, tasty, tastyHunit, transformers
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ariadne";
-  version = "0.1.2.3";
-  sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    async bert Cabal dataLens dataLensFd dataLensTemplate filepath
-    haskellNames haskellPackages haskellSrcExts hseCpp hslogger mtl stm
-    tagged transformers utf8String
-  ];
-  testDepends = [
-    bert filepath haskellSrcExts tasty tastyHunit utf8String
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/feuerbach/ariadne";
-    description = "Go-to-definition for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
deleted file mode 100644
index 91797435ceb..00000000000
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "arithmoi";
-  version = "0.4.1.1";
-  sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix";
-  buildDepends = [ mtl random ];
-  configureFlags = "-f-llvm";
-  jailbreak = true;
-  meta = {
-    homepage = "https://bitbucket.org/dafis/arithmoi";
-    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
deleted file mode 100644
index 28c691c7212..00000000000
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Stream }:
-
-cabal.mkDerivation (self: {
-  pname = "arrows";
-  version = "0.4.4.1";
-  sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
-  buildDepends = [ Stream ];
-  meta = {
-    homepage = "http://www.haskell.org/arrows/";
-    description = "Arrow classes and transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
deleted file mode 100644
index f0b9945cd62..00000000000
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-data";
-  version = "0.7.1";
-  sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal mtl text ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1-data";
-    description = "ASN1 data reader and writer in RAW, BER and DER forms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
deleted file mode 100644
index cb35f70d1b5..00000000000
--- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Types, hourglass, mtl, tasty, tastyQuickcheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-encoding";
-  version = "0.9.0";
-  sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
-  buildDepends = [ asn1Types hourglass mtl ];
-  testDepends = [
-    asn1Types hourglass mtl tasty tastyQuickcheck text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1";
-    description = "ASN1 data reader and writer in RAW, BER and DER forms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix
deleted file mode 100644
index 5d6bf33bb26..00000000000
--- a/pkgs/development/libraries/haskell/asn1-parse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-parse";
-  version = "0.9.0";
-  sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3";
-  buildDepends = [ asn1Encoding asn1Types mtl text ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1";
-    description = "Simple monadic parser for ASN1 stream types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix
deleted file mode 100644
index d2566add400..00000000000
--- a/pkgs/development/libraries/haskell/asn1-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hourglass }:
-
-cabal.mkDerivation (self: {
-  pname = "asn1-types";
-  version = "0.3.0";
-  sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
-  buildDepends = [ hourglass ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-asn1-types";
-    description = "ASN.1 types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix
deleted file mode 100644
index 2ba1b50c5ca..00000000000
--- a/pkgs/development/libraries/haskell/assert-failure/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, prettyShow, text }:
-
-cabal.mkDerivation (self: {
-  pname = "assert-failure";
-  version = "0.1.1.0";
-  sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
-  buildDepends = [ prettyShow text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/Mikolaj/assert-failure";
-    description = "Syntactic sugar improving 'assert' and 'error'";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
deleted file mode 100644
index 7a050defb4d..00000000000
--- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "async";
-  version = "2.0.1.4";
-  sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/simonmar/async";
-    description = "Run IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.6.nix b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
deleted file mode 100644
index 6c1aed15eab..00000000000
--- a/pkgs/development/libraries/haskell/async/2.0.1.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "async";
-  version = "2.0.1.6";
-  sha256 = "06fzkqjliccxqiygms7v1xff3wlkg54n9xwzv7m1yxylkzlikjkz";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/simonmar/async";
-    description = "Run IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
deleted file mode 100644
index 5a84686d3a4..00000000000
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "atomic-primops";
-  version = "0.6.1";
-  sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7";
-  buildDepends = [ primitive ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "A safe approach to CAS and other atomic ops in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix
deleted file mode 100644
index 3f95f14c35c..00000000000
--- a/pkgs/development/libraries/haskell/attempt/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, failure }:
-
-cabal.mkDerivation (self: {
-  pname = "attempt";
-  version = "0.4.0.1";
-  sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
-  buildDepends = [ failure ];
-  meta = {
-    homepage = "http://github.com/snoyberg/attempt/tree/master";
-    description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
deleted file mode 100644
index 6e69e361585..00000000000
--- a/pkgs/development/libraries/haskell/atto-lisp/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit
-, testFramework, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "atto-lisp";
-  version = "0.2.2";
-  sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
-  buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq text
-  ];
-  testDepends = [
-    attoparsec HUnit testFramework testFrameworkHunit text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/nominolo/atto-lisp";
-    description = "Efficient parsing and serialisation of S-Expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
deleted file mode 100644
index e0950ef517b..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-binary";
-  version = "0.2";
-  sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
-  buildDepends = [ attoparsec ];
-  meta = {
-    description = "Binary processing extensions to Attoparsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
deleted file mode 100644
index b2e64f272fd..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-conduit";
-  version = "1.1.0";
-  sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Consume attoparsec parsers via conduit. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
deleted file mode 100644
index be5c1b4435a..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, enumerator, text }:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec-enumerator";
-  version = "0.3.3";
-  sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
-  buildDepends = [ attoparsec enumerator text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
-    description = "Pass input from an enumerator to an Attoparsec parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
deleted file mode 100644
index f53b32d5365..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.10.4.0";
-  sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n";
-  buildDepends = [ deepseq text ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
deleted file mode 100644
index ef61d8c79a1..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.11.3.1";
-  sha256 = "0mmyab3a9mgmfxj1kc7xgxkmmcdj90ph9nzniv7bf2vyf8vhvirl";
-  buildDepends = [ deepseq scientific text ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
deleted file mode 100644
index a6083866248..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.12.1.2";
-  sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc";
-  buildDepends = [ deepseq scientific text ];
-  testDepends = [
-    deepseq QuickCheck scientific testFramework
-    testFrameworkQuickcheck2 text vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
deleted file mode 100644
index a6f46415683..00000000000
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit
-, cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random
-, RSA, SHA, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "authenticate-oauth";
-  version = "1.5";
-  sha256 = "07y9zh4v9by588k86wlyj3czivj5jlb9jk6g4j9p8j1qgbv4hpk9";
-  buildDepends = [
-    base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes
-    dataDefault httpClient httpTypes random RSA SHA time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/authenticate";
-    description = "Library to authenticate with OAuth for Haskell web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
deleted file mode 100644
index af966ebe7bf..00000000000
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
-, httpConduit, httpTypes, monadControl, networkUri, resourcet
-, tagstreamConduit, text, transformers, unorderedContainers
-, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "authenticate";
-  version = "1.3.2.10";
-  sha256 = "1dy38k5jpms3xrkw1zh7vjmx06yr5iibgh50m5i2wky2wmryqkf4";
-  buildDepends = [
-    aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
-    httpTypes monadControl networkUri resourcet tagstreamConduit text
-    transformers unorderedContainers xmlConduit
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/authenticate";
-    description = "Authentication methods for Haskell web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
deleted file mode 100644
index 3ca15089244..00000000000
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "auto-update";
-  version = "0.1.2";
-  sha256 = "0ccix41jjpqkzvnfr5md1cbhsa9fkv6dy7yw73j8dnvqbqnz1z0l";
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Efficiently run periodic, on-demand actions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aws-ec2/default.nix b/pkgs/development/libraries/haskell/aws-ec2/default.nix
deleted file mode 100644
index 8fec25eb9cb..00000000000
--- a/pkgs/development/libraries/haskell/aws-ec2/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aws, base16Bytestring, base64Bytestring
-, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit
-, httpTypes, mtl, optparseApplicative, resourcet, scientific, text
-, time, unorderedContainers, vector, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aws-ec2";
-  version = "0.2.2";
-  sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aws base16Bytestring base64Bytestring blazeBuilder byteable
-    conduitExtra cryptohash httpConduit httpTypes mtl
-    optparseApplicative resourcet scientific text time
-    unorderedContainers vector xmlConduit
-  ];
-  meta = {
-    homepage = "https://github.com/zalora/aws-ec2";
-    description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
deleted file mode 100644
index 1069c9da1e9..00000000000
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
-, blazeBuilder, byteable, caseInsensitive, cereal, conduit
-, conduitExtra, cryptohash, dataDefault, errors, filepath
-, httpClient, httpConduit, httpTypes, liftedBase, monadControl, mtl
-, network, QuickCheck, quickcheckInstances, resourcet, safe
-, scientific, tagged, tasty, tastyQuickcheck, text, time
-, transformers, transformersBase, unorderedContainers, utf8String
-, vector, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aws";
-  version = "0.11";
-  sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base16Bytestring base64Bytestring blazeBuilder
-    byteable caseInsensitive cereal conduit conduitExtra cryptohash
-    dataDefault filepath httpConduit httpTypes liftedBase monadControl
-    mtl network resourcet safe scientific tagged text time transformers
-    unorderedContainers utf8String vector xmlConduit
-  ];
-  testDepends = [
-    aeson errors httpClient liftedBase monadControl mtl QuickCheck
-    quickcheckInstances resourcet tagged tasty tastyQuickcheck text
-    time transformers transformersBase
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/aristidb/aws";
-    description = "Amazon Web Services (AWS) for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
deleted file mode 100644
index 6714ad547de..00000000000
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, errorcallEqInstance, hspec, QuickCheck, setenv }:
-
-cabal.mkDerivation (self: {
-  pname = "base-compat";
-  version = "0.5.0";
-  sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1";
-  buildDepends = [ errorcallEqInstance setenv ];
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "A compatibility layer for base";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
deleted file mode 100644
index a44cdbfa6c1..00000000000
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base-prelude";
-  version = "0.1.11";
-  sha256 = "0g6p1d3r6jbqcd8flxfbasb40ga7k90bc0q07drwhlaiadjnx1an";
-  meta = {
-    homepage = "https://github.com/nikita-volkov/base-prelude";
-    description = "The most complete prelude formed from only the \"base\" package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
deleted file mode 100644
index 1e32a6e26e0..00000000000
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base-unicode-symbols";
-  version = "0.2.2.4";
-  sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
-    description = "Unicode alternatives for common functions and operators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
deleted file mode 100644
index 36f0bf6935b..00000000000
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base16-bytestring";
-  version = "0.1.1.6";
-  sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
-  meta = {
-    homepage = "http://github.com/bos/base16-bytestring";
-    description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base32-bytestring/default.nix b/pkgs/development/libraries/haskell/base32-bytestring/default.nix
deleted file mode 100644
index d6f91424da2..00000000000
--- a/pkgs/development/libraries/haskell/base32-bytestring/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitsExtras, cpu, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "base32-bytestring";
-  version = "0.2.1.0";
-  sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
-  buildDepends = [ bitsExtras cpu ];
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/pxqr/base32-bytestring";
-    description = "Fast base32 and base32hex codec for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
deleted file mode 100644
index 39c65dd5250..00000000000
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "base64-bytestring";
-  version = "1.0.0.1";
-  sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/base64-bytestring";
-    description = "Fast base64 encoding and decoding for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
deleted file mode 100644
index 26ab4dc4924..00000000000
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "base64-string";
-  version = "0.2";
-  sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
-  meta = {
-    homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
-    description = "Base64 implementation for String's";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
deleted file mode 100644
index 5cbd6c9fe14..00000000000
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, liftedBase, ReadArgs, safe, systemFilepath, text
-, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "basic-prelude";
-  version = "0.3.10";
-  sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59";
-  buildDepends = [
-    hashable liftedBase ReadArgs safe systemFilepath text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/basic-prelude";
-    description = "An enhanced core prelude; a common foundation for alternate preludes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
deleted file mode 100644
index 44e73f609f3..00000000000
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "benchpress";
-  version = "0.2.2.6";
-  sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
-  buildDepends = [ mtl time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/tibbe/benchpress";
-    description = "Micro-benchmarking with detailed statistics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bencode/default.nix b/pkgs/development/libraries/haskell/bencode/default.nix
deleted file mode 100644
index 2d4630dc867..00000000000
--- a/pkgs/development/libraries/haskell/bencode/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "bencode";
-  version = "0.5";
-  sha256 = "018cj7h5llvnqyr1jd9nif2ig9hz8d8vmi9iax07all567yhy378";
-  buildDepends = [ binary parsec ];
-  meta = {
-    description = "Parser and printer for bencoded data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix
deleted file mode 100644
index 325343985ac..00000000000
--- a/pkgs/development/libraries/haskell/bencoding/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "bencoding";
-  version = "0.4.3.0";
-  sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
-  buildDepends = [ attoparsec deepseq mtl text ];
-  testDepends = [ attoparsec hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/cobit/bencoding";
-    description = "A library for encoding and decoding of BEncode data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
deleted file mode 100644
index 953407735e6..00000000000
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, binary, binaryConduit, conduit, conduitExtra, mtl
-, network, parsec, smallcheck, tasty, tastyHunit, tastySmallcheck
-, time, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bert";
-  version = "1.2.2.3";
-  sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq";
-  buildDepends = [
-    binary binaryConduit conduit conduitExtra mtl network parsec time
-    void
-  ];
-  testDepends = [
-    async binary network smallcheck tasty tastyHunit tastySmallcheck
-  ];
-  meta = {
-    homepage = "https://github.com/feuerbach/bert";
-    description = "BERT implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
deleted file mode 100644
index 78a34c53b37..00000000000
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids, semigroups, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "bifunctors";
-  version = "4.2";
-  sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6";
-  buildDepends = [ semigroupoids semigroups tagged ];
-  meta = {
-    homepage = "http://github.com/ekmett/bifunctors/";
-    description = "Bifunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
deleted file mode 100644
index 4a9d4aa41bc..00000000000
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bimap";
-  version = "0.2.4";
-  sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5";
-  meta = {
-    homepage = "http://code.haskell.org/bimap";
-    description = "Bidirectional mapping between two key types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
deleted file mode 100644
index c7547a7b12b..00000000000
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions
-, resourcet, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "binary-conduit";
-  version = "1.2.3";
-  sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
-  buildDepends = [ binary conduit resourcet vector ];
-  testDepends = [
-    binary conduit hspec QuickCheck quickcheckAssertions resourcet
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/qnikst/binary-conduit/";
-    description = "data serialization/deserialization conduit library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
deleted file mode 100644
index bfeef7c0cb6..00000000000
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "binary-shared";
-  version = "0.8.3";
-  sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
-  buildDepends = [ binary mtl ];
-  meta = {
-    homepage = "http://www.leksah.org";
-    description = "Sharing for the binary package";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary-strict/default.nix b/pkgs/development/libraries/haskell/binary-strict/default.nix
deleted file mode 100644
index e62fd782ad9..00000000000
--- a/pkgs/development/libraries/haskell/binary-strict/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "binary-strict";
-  version = "0.4.8.1";
-  sha256 = "07mmh4x8qjpw7w35nxcq8wayy4bagjblbwkpvh3xd38rxpdnl6pi";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/binary-low-level";
-    description = "Binary deserialisation using strict ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.2.nix b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
deleted file mode 100644
index 60eaf0e0031..00000000000
--- a/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "binary";
-  version = "0.7.2.2";
-  sha256 = "10z1b9axgfg9kb44b8sfxd5mak5qaqyjfwn4i21y37zgf7wadblr";
-  testDepends = [
-    Cabal filepath HUnit QuickCheck random testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/kolmodin/binary";
-    description = "Binary serialisation for Haskell values using lazy ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
deleted file mode 100644
index 846f5d6486d..00000000000
--- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-DSL";
-  version = "1.0.21";
-  sha256 = "0fbrl9jfkwlv66v3cv6cj51kk7jjdry0jz8k83bf4mav26123mk9";
-  meta = {
-    homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
-    description = "FFI domain specific language, on top of hsc2hs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
deleted file mode 100644
index 08e14a782bf..00000000000
--- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi
-, libXrandr, libXxf86vm, mesa, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-GLFW";
-  version = "3.0.3.3";
-  sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4";
-  buildDepends = [ bindingsDSL ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  extraLibraries = [
-    libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa
-  ];
-  doCheck = false;
-  meta = {
-    description = "Low-level bindings to GLFW OpenGL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
deleted file mode 100644
index e6f42924588..00000000000
--- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, libusb }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-libusb";
-  version = "1.4.5.0";
-  sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
-  buildDepends = [ bindingsDSL ];
-  pkgconfigDepends = [ libusb ];
-  meta = {
-    homepage = "https://github.com/basvandijk/bindings-libusb";
-    description = "Low level bindings to libusb";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
deleted file mode 100644
index 6ae304d6c75..00000000000
--- a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, portaudio }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-portaudio";
-  version = "0.1";
-  sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
-  buildDepends = [ bindingsDSL ];
-  pkgconfigDepends = [ portaudio ];
-  meta = {
-    description = "Low-level bindings to portaudio library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
deleted file mode 100644
index 49caa0e491e..00000000000
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL }:
-
-cabal.mkDerivation (self: {
-  pname = "bindings-posix";
-  version = "1.2.6";
-  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
-  buildDepends = [ bindingsDSL ];
-  meta = {
-    description = "Low level bindings to posix";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix
deleted file mode 100644
index f063622e8de..00000000000
--- a/pkgs/development/libraries/haskell/bitarray/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bitarray";
-  version = "0.0.1.1";
-  sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "Mutable and immutable bit arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
deleted file mode 100644
index 74c78cab706..00000000000
--- a/pkgs/development/libraries/haskell/bitmap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bitmap";
-  version = "0.0.2";
-  sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix
deleted file mode 100644
index f45c5a87de9..00000000000
--- a/pkgs/development/libraries/haskell/bits-atomic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bits-atomic";
-  version = "0.1.3";
-  sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Atomic bit operations on memory locations for low-level synchronization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bits-extras/default.nix b/pkgs/development/libraries/haskell/bits-extras/default.nix
deleted file mode 100644
index 3876eabfcaf..00000000000
--- a/pkgs/development/libraries/haskell/bits-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bits-extras";
-  version = "0.1.3";
-  sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
-  isLibrary = true;
-  isExecutable = true;
-  configureFlags = "--ghc-option=-lgcc_s";
-  meta = {
-    description = "Efficient high-level bit operations not found in Data.Bits";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bitset/default.nix b/pkgs/development/libraries/haskell/bitset/default.nix
deleted file mode 100644
index dfb71a978cb..00000000000
--- a/pkgs/development/libraries/haskell/bitset/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, gmp, QuickCheck, tasty, tastyQuickcheck }:
-
-cabal.mkDerivation (self: {
-  pname = "bitset";
-  version = "1.4.8";
-  sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
-  buildDepends = [ deepseq ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck ];
-  extraLibraries = [ gmp ];
-  doCheck = false;
-  meta = {
-    description = "A space-efficient set data structure";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
deleted file mode 100644
index 6797a2b950a..00000000000
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bktrees";
-  version = "0.3.1";
-  sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
-  meta = {
-    description = "A set data structure with approximate searching";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blank-canvas/default.nix b/pkgs/development/libraries/haskell/blank-canvas/default.nix
deleted file mode 100644
index 47c343f49b8..00000000000
--- a/pkgs/development/libraries/haskell/blank-canvas/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, colour, dataDefaultClass
-, httpTypes, kansasComet, scotty, stm, text, transformers, vector
-, wai, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blank-canvas";
-  version = "0.5";
-  sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
-  buildDepends = [
-    aeson base64Bytestring colour dataDefaultClass httpTypes
-    kansasComet scotty stm text transformers vector wai waiExtra warp
-  ];
-  meta = {
-    homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
-    description = "HTML5 Canvas Graphics Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
deleted file mode 100644
index 02b7950a481..00000000000
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder-conduit";
-  version = "1.1.0";
-  sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Convert streams of builders to streams of bytestrings. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
deleted file mode 100644
index a32b89e2eb7..00000000000
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, enumerator, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder-enumerator";
-  version = "0.2.0.6";
-  sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp";
-  buildDepends = [ blazeBuilder enumerator transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/meiersi/blaze-builder-enumerator";
-    description = "Enumeratees for the incremental conversion of builders to bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
deleted file mode 100644
index 4dd5376cad3..00000000000
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-builder";
-  version = "0.3.3.4";
-  sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://github.com/meiersi/blaze-builder";
-    description = "Efficient buffered output";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-from-html/default.nix b/pkgs/development/libraries/haskell/blaze-from-html/default.nix
deleted file mode 100644
index 4897e750556..00000000000
--- a/pkgs/development/libraries/haskell/blaze-from-html/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, tagsoup }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-from-html";
-  version = "0.3.2.1";
-  sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath tagsoup ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "Tool to convert HTML to BlazeHtml code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
deleted file mode 100644
index 16c967d78a2..00000000000
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-html";
-  version = "0.7.0.3";
-  sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
-  buildDepends = [ blazeBuilder blazeMarkup text ];
-  testDepends = [
-    blazeBuilder blazeMarkup HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "A blazingly fast HTML combinator library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
deleted file mode 100644
index cdea333abcd..00000000000
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-markup";
-  version = "0.6.1.1";
-  sha256 = "1ah6fgfqsmarq8g4gw81yhckz4pclb2ifxv237cqz5zhy9il4j5d";
-  buildDepends = [ blazeBuilder text ];
-  testDepends = [
-    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "http://jaspervdj.be/blaze";
-    description = "A blazingly fast markup combinator library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
deleted file mode 100644
index bf5bc4c262c..00000000000
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeMarkup, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-svg";
-  version = "0.3.4";
-  sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3";
-  buildDepends = [ blazeMarkup mtl ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/deepakjois/blaze-svg";
-    description = "SVG combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
deleted file mode 100644
index b3f3334684d..00000000000
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework
-, testFrameworkQuickcheck2, text, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-textual";
-  version = "0.2.0.9";
-  sha256 = "1gwy1pjnc2ikxfxn9c751rnydry1hmlfk13k29xnns9vwglf81f0";
-  buildDepends = [ blazeBuilder text time vector ];
-  testDepends = [
-    blazeBuilder doubleConversion QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/bos/blaze-textual";
-    description = "Fast rendering of common datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
deleted file mode 100644
index 2494f08eaac..00000000000
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bloomfilter";
-  version = "2.0.0.0";
-  sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f";
-  buildDepends = [ deepseq ];
-  # https://github.com/bos/bloomfilter/pull/8
-  preConfigure = ''
-    sed -i -e "s/0xffffffff/0x7fffffff/" Data/BloomFilter/Easy.hs
-  '';
-  testDepends = [
-    QuickCheck random testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/bos/bloomfilter";
-    description = "Pure and impure Bloom Filter implementations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
deleted file mode 100644
index 3147b139409..00000000000
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bmp";
-  version = "1.2.5.2";
-  sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.ouroborus.net/bmp";
-    description = "Read and write uncompressed BMP image files";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix
deleted file mode 100644
index f180670f9b9..00000000000
--- a/pkgs/development/libraries/haskell/bool-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bool-extras";
-  version = "0.4.0";
-  sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
-  meta = {
-    homepage = "http://tom.lokhorst.eu/bool-extras";
-    description = "A fold function for Bool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
deleted file mode 100644
index 82d45baf88a..00000000000
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "boomerang";
-  version = "1.4.5";
-  sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
-  buildDepends = [ mtl text ];
-  meta = {
-    description = "Library for invertible parsing and printing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix
deleted file mode 100644
index dd1f288a1b9..00000000000
--- a/pkgs/development/libraries/haskell/bound/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, binary, bytes, cereal, comonad, doctest
-, filepath, hashable, hashableExtras, preludeExtras, profunctors
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bound";
-  version = "1.0.4";
-  sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky";
-  buildDepends = [
-    bifunctors binary bytes cereal comonad hashable hashableExtras
-    preludeExtras profunctors transformers
-  ];
-  testDepends = [
-    doctest filepath preludeExtras transformers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/bound/";
-    description = "Making de Bruijn Succ Less";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boundingboxes/default.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix
deleted file mode 100644
index ab5cfabad44..00000000000
--- a/pkgs/development/libraries/haskell/boundingboxes/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, linear, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
-  pname = "boundingboxes";
-  version = "0.2.2";
-  sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx";
-  buildDepends = [ lens ];
-  testDepends = [
-    lens linear QuickCheck random testFramework
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fumieval/boundingboxes";
-    description = "A generic boundingbox for an arbitrary vector";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boxes/default.nix b/pkgs/development/libraries/haskell/boxes/default.nix
deleted file mode 100644
index aa2a95b621d..00000000000
--- a/pkgs/development/libraries/haskell/boxes/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, split }:
-
-cabal.mkDerivation (self: {
-  pname = "boxes";
-  version = "0.1.3";
-  sha256 = "1sia3j0x7m68j6j9n7bi1l1yg56ivpkxd95l19xl5vpkg03qizkq";
-  buildDepends = [ split ];
-  meta = {
-    description = "2D text pretty-printing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
deleted file mode 100644
index 3f7849efaf4..00000000000
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "brainfuck";
-  version = "0.1";
-  sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Brainfuck interpreter";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
deleted file mode 100644
index 2bcace9da74..00000000000
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network
-, QuickCheck, testFramework, testFrameworkQuickcheck2, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bson";
-  version = "0.3.1";
-  sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
-  buildDepends = [
-    binary cryptohash dataBinaryIeee754 mtl network text time
-  ];
-  testDepends = [
-    binary cryptohash dataBinaryIeee754 mtl network QuickCheck
-    testFramework testFrameworkQuickcheck2 text time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/mongodb-haskell/bson";
-    description = "BSON documents are JSON-like objects with a standard binary encoding";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
deleted file mode 100644
index 1e12288624f..00000000000
--- a/pkgs/development/libraries/haskell/bv/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bv";
-  version = "0.3.0";
-  sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://bitbucket.org/iago/bv-haskell";
-    description = "Bit-vector arithmetic library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix
deleted file mode 100644
index 9adc98599e5..00000000000
--- a/pkgs/development/libraries/haskell/byteable/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "byteable";
-  version = "0.1.1";
-  sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-byteable";
-    description = "Type class for sequence of bytes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytedump/default.nix b/pkgs/development/libraries/haskell/bytedump/default.nix
deleted file mode 100644
index 3031f53d839..00000000000
--- a/pkgs/development/libraries/haskell/bytedump/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytedump";
-  version = "1.0";
-  sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-bytedump";
-    description = "Flexible byte dump helpers for human readers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
deleted file mode 100644
index 123625233fc..00000000000
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "byteorder";
-  version = "1.0.4";
-  sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
-  meta = {
-    homepage = "http://community.haskell.org/~aslatter/code/byteorder";
-    description = "Exposes the native endianness or byte ordering of the system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix
deleted file mode 100644
index 1ad3446bd0c..00000000000
--- a/pkgs/development/libraries/haskell/bytes/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, doctest, filepath, mtl, text, time
-, transformers, transformersCompat, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "bytes";
-  version = "0.14.1.2";
-  sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d";
-  buildDepends = [
-    binary cereal mtl text time transformers transformersCompat void
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/analytics/bytes";
-    description = "Sharing code for serialization between binary and cereal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
deleted file mode 100644
index bcc0f3d0a76..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-lexing";
-  version = "0.4.3.2";
-  sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05";
-  buildTools = [ alex ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Parse and produce literals efficiently from strict or lazy bytestrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
deleted file mode 100644
index 1be3a48144c..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-mmap";
-  version = "0.2.2";
-  sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
-    description = "mmap support for strict ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
deleted file mode 100644
index c311fbe1738..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-nums";
-  version = "0.3.6";
-  sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/solidsnack/bytestring-nums";
-    description = "Parse numeric literals from ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
deleted file mode 100644
index 33d6a17b029..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, terminalProgressBar, time }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-progress";
-  version = "1.0.3";
-  sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
-  buildDepends = [ terminalProgressBar time ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/acw/bytestring-progress";
-    description = "A library for tracking the consumption of a lazy ByteString";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix
deleted file mode 100644
index c36bf611ab4..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-show/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-show";
-  version = "0.3.5.6";
-  sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "Efficient conversion of values into readable byte strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
deleted file mode 100644
index da84b55cc0f..00000000000
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bytestring-trie";
-  version = "0.2.4";
-  sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "An efficient finite map from (byte)strings to values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bzlib/default.nix b/pkgs/development/libraries/haskell/bzlib/default.nix
deleted file mode 100644
index 9699cd8cad6..00000000000
--- a/pkgs/development/libraries/haskell/bzlib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bzip2 }:
-
-cabal.mkDerivation (self: {
-  pname = "bzlib";
-  version = "0.5.0.4";
-  sha256 = "1vf37y7wknrihf7hipd6lihkmn7sszbgfb325my52yzbjs3baccd";
-  extraLibraries = [ bzip2 ];
-  meta = {
-    description = "Compression and decompression in the bzip2 format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
deleted file mode 100644
index ba535cd13b2..00000000000
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
-, strict, systemFileio, systemFilepath, tasty, tastyGolden, text
-, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-cargs";
-  version = "0.7.5";
-  sha256 = "0z17s4w9wlmdqbzh0c1jwqfp4d6599hqv0r4dzm9djb0x8vj327k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal cabalLenses cmdargs either lens strict systemFileio
-    systemFilepath text transformers unorderedContainers
-  ];
-  testDepends = [ filepath tasty tastyGolden ];
-  jailbreak = true;
-  meta = {
-    description = "A command line program for extracting compiler arguments from a cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
deleted file mode 100644
index 2b1dcdd6558..00000000000
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-file-th";
-  version = "0.2.3";
-  sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
-  buildDepends = [ Cabal ];
-  meta = {
-    homepage = "http://github.com/nkpart/cabal-file-th";
-    description = "Template Haskell expressions for reading fields from a project's cabal file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
deleted file mode 100644
index 256cba3734c..00000000000
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, lens, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-lenses";
-  version = "0.4.2";
-  sha256 = "0vsicvk979qznm3b174r6d5wkkyhpqx8gxjs5jw9na2jhimzjcjf";
-  buildDepends = [ Cabal lens unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    description = "Lenses and traversals for the Cabal library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
deleted file mode 100644
index f147fe4b281..00000000000
--- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, fgl, filepath, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-macosx";
-  version = "0.2.3";
-  sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ Cabal fgl filepath parsec text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/gimbo/cabal-macosx";
-    description = "Cabal support for creating Mac OSX application bundles";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabalg/default.nix b/pkgs/development/libraries/haskell/cabalg/default.nix
deleted file mode 100644
index 62dea42b3d5..00000000000
--- a/pkgs/development/libraries/haskell/cabalg/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "cabalg";
-  version = "0.2.9";
-  sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    description = "alias for cabal install from given git repo";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ dmalikov ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
deleted file mode 100644
index 8f64f23585c..00000000000
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text
-, utf8String, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cairo";
-  version = "0.13.0.5";
-  sha256 = "0ak6hzfrcyxajx7qybsmd5g26blqb6zxvv8r2a8bnylvm5sdj70r";
-  buildDepends = [ mtl text utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ cairo libc pkgconfig zlib ];
-  pkgconfigDepends = [ cairo ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Cairo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/call/default.nix b/pkgs/development/libraries/haskell/call/default.nix
deleted file mode 100644
index c11a07ae94c..00000000000
--- a/pkgs/development/libraries/haskell/call/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsPortaudio, boundingboxes, cleanUnions, colors
-, controlBool, deepseq, distributive, elevator, filepath, freetype2
-, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens, linear
-, minioperational, mtl, objective, OpenGL, OpenGLRaw, random
-, reflection, text, transformers, vector, WAVE
-}:
-
-cabal.mkDerivation (self: {
-  pname = "call";
-  version = "0.1.1.2";
-  sha256 = "1g96asydq0lc07xf2c709zdv99r6ljs5a7jm6fvlyjswqnbrwy9s";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    bindingsPortaudio boundingboxes cleanUnions colors controlBool
-    deepseq distributive elevator filepath freetype2 GLFWB hashable
-    JuicyPixels JuicyPixelsUtil lens linear minioperational mtl
-    objective OpenGL OpenGLRaw random reflection text transformers
-    vector WAVE
-  ];
-  meta = {
-    homepage = "https://github.com/fumieval/call";
-    description = "The call game engine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/carray/default.nix b/pkgs/development/libraries/haskell/carray/default.nix
deleted file mode 100644
index 42fbad8b07d..00000000000
--- a/pkgs/development/libraries/haskell/carray/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, ixShapable, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "carray";
-  version = "0.1.5.2";
-  sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0";
-  buildDepends = [ binary ixShapable syb ];
-  meta = {
-    description = "A C-compatible array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
deleted file mode 100644
index d0b40e42d48..00000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.0.0.1";
-  sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix
deleted file mode 100644
index 650c45ada96..00000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.0.0.2";
-  sha256 = "11cczwg11y6pfsidj1i052rhri98sgg2qzf0ixgjq1gywakjx5f2";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
deleted file mode 100644
index 96b5bc114a3..00000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.2.0.1";
-  sha256 = "1hnckzi6yq3332fx4b140lwa9p6x69rlpaw6y1pmldj2h9nsxl6m";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
deleted file mode 100644
index 0ae9782a33b..00000000000
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cassava";
-  version = "0.4.2.0";
-  sha256 = "1v1izdjd4maqrlpm4cf2xpackpjp1i4vg1s7mzq90dwa6r9572x3";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq text unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/tibbe/cassava";
-    description = "A CSV parsing and encoding library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix
deleted file mode 100644
index 0f923d37738..00000000000
--- a/pkgs/development/libraries/haskell/categories/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, void }:
-
-cabal.mkDerivation (self: {
-  pname = "categories";
-  version = "1.0.6";
-  sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy";
-  buildDepends = [ void ];
-  meta = {
-    homepage = "http://github.com/ekmett/categories";
-    description = "Categories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
deleted file mode 100644
index e99557b7989..00000000000
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "cautious-file";
-  version = "1.0.2";
-  sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
-  buildDepends = [ filepath ];
-  doCheck = false;
-  meta = {
-    description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
deleted file mode 100644
index baad2943358..00000000000
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cereal-conduit";
-  version = "0.7.2.3";
-  sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
-  buildDepends = [ cereal conduit resourcet transformers ];
-  testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
deleted file mode 100644
index 906222c3bbb..00000000000
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cereal";
-  version = "0.4.1.0";
-  sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb";
-  meta = {
-    description = "A binary serialization library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
deleted file mode 100644
index 5c5c82196ff..00000000000
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl
-, pem, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "certificate";
-  version = "1.3.9";
-  sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "Certificates and Key Reader/Writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
deleted file mode 100644
index c1c284ad70c..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.5";
-  sha256 = "1zdgdzkrzclf492pb9px5a490mxfxl5c1099axcxxm9wlpmf49ji";
-  buildDepends = [ mtl network parsec xhtml ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/cgi/";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
deleted file mode 100644
index 2bacef96e08..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.2.0.0";
-  sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d";
-  buildDepends = [ exceptions mtl network networkUri parsec xhtml ];
-  meta = {
-    homepage = "https://github.com/cheecheeo/haskell-cgi";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix
deleted file mode 100644
index 91f7920fcea..00000000000
--- a/pkgs/development/libraries/haskell/cgrep/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, cmdargs, dlist, either, filepath, mtl
-, regexPosix, safe, split, stm, stringsearch, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cgrep";
-  version = "6.4.9";
-  sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal cmdargs dlist either filepath mtl regexPosix safe
-    split stm stringsearch unorderedContainers
-  ];
-  meta = {
-    homepage = "http://awgn.github.io/cgrep/";
-    description = "Command line tool";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
deleted file mode 100644
index 1b37fd77bd9..00000000000
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroups, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "charset";
-  version = "0.3.7";
-  sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6";
-  buildDepends = [ semigroups unorderedContainers ];
-  meta = {
-    homepage = "http://github.com/ekmett/charset";
-    description = "Fast unicode character sets based on complemented PATRICIA tries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
deleted file mode 100644
index 39571e4a87c..00000000000
--- a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "charsetdetect-ae";
-  version = "1.0.1";
-  sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
-  meta = {
-    homepage = "http://github.com/Aelve/charsetdetect-ae";
-    description = "Character set detection using Mozilla's Universal Character Set Detector";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chaselev-deque/default.nix b/pkgs/development/libraries/haskell/chaselev-deque/default.nix
deleted file mode 100644
index 0b271ce5f68..00000000000
--- a/pkgs/development/libraries/haskell/chaselev-deque/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractDequeTests, atomicPrimops
-, bitsAtomic, HUnit, testFramework, testFrameworkHunit
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chaselev-deque";
-  version = "0.5.0.3";
-  sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6";
-  buildDepends = [
-    abstractDeque atomicPrimops bitsAtomic transformers vector
-  ];
-  testDepends = [
-    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
-    testFrameworkHunit vector
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix
deleted file mode 100644
index 7d96433a588..00000000000
--- a/pkgs/development/libraries/haskell/cheapskate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text
-, uniplate, wai, waiExtra, xssSanitize
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cheapskate";
-  version = "0.1.0.2";
-  sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai
-    waiExtra xssSanitize
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jgm/cheapskate";
-    description = "Experimental markdown processor";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix
deleted file mode 100644
index 65f9d20a19a..00000000000
--- a/pkgs/development/libraries/haskell/checkers/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "checkers";
-  version = "0.4.1";
-  sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr";
-  buildDepends = [ QuickCheck random ];
-  meta = {
-    description = "Check properties on standard classes and data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
deleted file mode 100644
index 498bcaf2bf6..00000000000
--- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "chell-quickcheck";
-  version = "0.2.4";
-  sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd";
-  buildDepends = [ chell QuickCheck random ];
-  meta = {
-    homepage = "https://john-millikin.com/software/chell/";
-    description = "QuickCheck support for the Chell testing library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix
deleted file mode 100644
index 2b6c4e61bf9..00000000000
--- a/pkgs/development/libraries/haskell/chell/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, options, patience, random, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chell";
-  version = "0.4";
-  sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng";
-  buildDepends = [
-    ansiTerminal options patience random text transformers
-  ];
-  meta = {
-    homepage = "https://john-millikin.com/software/chell/";
-    description = "A simple and intuitive library for automated testing";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix
deleted file mode 100644
index 2db35213a1a..00000000000
--- a/pkgs/development/libraries/haskell/chunked-data/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath
-, text, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "chunked-data";
-  version = "0.1.0.1";
-  sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r";
-  buildDepends = [
-    blazeBuilder monoTraversable semigroups systemFilepath text
-    transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/chunked-data";
-    description = "Typeclasses for dealing with various chunked data representations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
deleted file mode 100644
index 32c4b878cff..00000000000
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-aes";
-  version = "0.2.9";
-  sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq";
-  buildDepends = [ byteable cryptoCipherTypes securemem ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cipher-aes";
-    description = "Fast AES cipher implementation with advanced mode of operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
deleted file mode 100644
index ce925361143..00000000000
--- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-aes128";
-  version = "0.6.4";
-  sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal cryptoApi tagged ];
-  meta = {
-    homepage = "https://github.com/TomMD/cipher-aes128";
-    description = "AES and common modes using AES-NI when available";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
deleted file mode 100644
index 3f2619c70e8..00000000000
--- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-blowfish";
-  version = "0.0.3";
-  sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
-  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Blowfish cipher";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
deleted file mode 100644
index 7e83f50568d..00000000000
--- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-camellia";
-  version = "0.0.2";
-  sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
-  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Camellia block cipher primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
deleted file mode 100644
index 7309586e1c6..00000000000
--- a/pkgs/development/libraries/haskell/cipher-des/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, securemem, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-des";
-  version = "0.0.6";
-  sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5";
-  buildDepends = [ byteable cryptoCipherTypes securemem ];
-  testDepends = [
-    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-    testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "DES and 3DES primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
deleted file mode 100644
index 4951584e395..00000000000
--- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
-, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cipher-rc4";
-  version = "0.1.4";
-  sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
-  buildDepends = [ byteable cryptoCipherTypes ];
-  testDepends = [
-    cryptoCipherTests cryptoCipherTypes QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cipher-rc4";
-    description = "Fast RC4 cipher implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
deleted file mode 100644
index 82ee642a9ba..00000000000
--- a/pkgs/development/libraries/haskell/circle-packing/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "circle-packing";
-  version = "0.1.0.3";
-  sha256 = "1df284n181ny3i7ajx0j6x5grxw404zzz6y8iybmh5qgba1537g2";
-  meta = {
-    description = "Simple heuristic for packing discs of varying radii in a circle";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
deleted file mode 100644
index 5f7cce6b060..00000000000
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network
-, pandocTypes, parsec, syb, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "citeproc-hs";
-  version = "0.3.9";
-  sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg";
-  buildDepends = [
-    filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
-    syb time utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";
-    description = "A Citation Style Language implementation in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clash-lib/default.nix b/pkgs/development/libraries/haskell/clash-lib/default.nix
deleted file mode 100644
index 40860d38911..00000000000
--- a/pkgs/development/libraries/haskell/clash-lib/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, concurrentSupply, contravariant
-, deepseq, errors, fgl, filepath, hashable, lens, ListLike, mtl
-, text, time, transformers, unbound, unorderedContainers
-, uuParsinglib, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "clash-lib";
-  version = "0.4";
-  sha256 = "1c3bxjm356cs7wf49zlazbv44bw06rs81akmsfzkfccrl7gjy7yc";
-  buildDepends = [
-    aeson attoparsec concurrentSupply contravariant deepseq errors fgl
-    filepath hashable lens ListLike mtl text time transformers unbound
-    unorderedContainers uuParsinglib wlPprintText
-  ];
-  meta = {
-    homepage = "http://christiaanb.github.io/clash2";
-    description = "CAES Language for Synchronous Hardware - As a Library";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clash-prelude/default.nix b/pkgs/development/libraries/haskell/clash-prelude/default.nix
deleted file mode 100644
index b463b957e87..00000000000
--- a/pkgs/development/libraries/haskell/clash-prelude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, thLift }:
-
-cabal.mkDerivation (self: {
-  pname = "clash-prelude";
-  version = "0.6.0.1";
-  sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7";
-  buildDepends = [ dataDefault thLift ];
-  meta = {
-    homepage = "http://christiaanb.github.io/clash2/";
-    description = "CAES Language for Synchronous Hardware - Prelude library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
deleted file mode 100644
index 3c2d5c6655f..00000000000
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, classyPrelude, conduit, conduitCombinators, hspec
-, monadControl, QuickCheck, resourcet, systemFileio, transformers
-, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude-conduit";
-  version = "0.10.2";
-  sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l";
-  buildDepends = [
-    classyPrelude conduit conduitCombinators monadControl resourcet
-    systemFileio transformers void
-  ];
-  testDepends = [ conduit hspec QuickCheck transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "conduit instances for classy-prelude";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix b/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
deleted file mode 100644
index d615a6e63b5..00000000000
--- a/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, classyPrelude, classyPreludeConduit, dataDefault
-, httpConduit, httpTypes, persistent, yesod, yesodNewsfeed
-, yesodStatic
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude-yesod";
-  version = "0.10.2";
-  sha256 = "1jzf26rj9m8mdhhag66h5zbh91c7ff3jn1q1ghmah12dj9y06137";
-  buildDepends = [
-    aeson classyPrelude classyPreludeConduit dataDefault httpConduit
-    httpTypes persistent yesod yesodNewsfeed yesodStatic
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "Provide a classy prelude including common Yesod functionality";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
deleted file mode 100644
index 4cd9dc1dba3..00000000000
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basicPrelude, bifunctors, chunkedData, enclosedExceptions
-, exceptions, hashable, hspec, liftedBase, monoTraversable, mtl
-, primitive, QuickCheck, semigroups, stm, systemFilepath, text
-, time, transformers, unorderedContainers, vector, vectorInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "classy-prelude";
-  version = "0.10.2";
-  sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k";
-  buildDepends = [
-    basicPrelude bifunctors chunkedData enclosedExceptions exceptions
-    hashable liftedBase monoTraversable mtl primitive semigroups stm
-    systemFilepath text time transformers unorderedContainers vector
-    vectorInstances
-  ];
-  testDepends = [
-    hspec QuickCheck transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/classy-prelude";
-    description = "A typeclass-based Prelude";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix
deleted file mode 100644
index 4e1b617c0b6..00000000000
--- a/pkgs/development/libraries/haskell/clay/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "clay";
-  version = "0.10";
-  sha256 = "0xw7j9v2cfs4874l5n852b38m6v2mpkbr93dxxfkp2kwmqkjbl5v";
-  buildDepends = [ mtl text ];
-  testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://fvisser.nl/clay";
-    description = "CSS preprocessor as embedded Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix
deleted file mode 100644
index 9ec71da8eec..00000000000
--- a/pkgs/development/libraries/haskell/clean-unions/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "clean-unions";
-  version = "0.1.1";
-  sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
-  meta = {
-    homepage = "https://github.com/fumieval/clean-unions";
-    description = "Open unions without need for Typeable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
deleted file mode 100644
index 6fcecac9eb5..00000000000
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
-, cryptoRandom, entropy, hspec, HUnit, QuickCheck, setenv, skein
-, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "clientsession";
-  version = "0.9.1.1";
-  sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
-    entropy setenv skein tagged
-  ];
-  testDepends = [ cereal hspec HUnit QuickCheck transformers ];
-  meta = {
-    homepage = "http://github.com/yesodweb/clientsession/tree/master";
-    description = "Securely store session data in a client-side cookie";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix
deleted file mode 100644
index e97195cb5fc..00000000000
--- a/pkgs/development/libraries/haskell/clock/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "clock";
-  version = "0.4.1.3";
-  sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d";
-  meta = {
-    homepage = "http://corsis.github.com/clock/";
-    description = "High-resolution clock functions: monotonic, realtime, cputime";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
deleted file mode 100644
index c4253944c6d..00000000000
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cmdargs";
-  version = "0.10.12";
-  sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath transformers ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/cmdargs/";
-    description = "Command line argument processing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
deleted file mode 100644
index 2cfe86e2eab..00000000000
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, split, syb, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "cmdlib";
-  version = "0.3.5";
-  sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl split syb transformers ];
-  meta = {
-    description = "a library for command line parsing & online help";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix
deleted file mode 100644
index aa83ae1a0ec..00000000000
--- a/pkgs/development/libraries/haskell/cmdtheline/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit
-, transformers, fetchpatch
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cmdtheline";
-  version = "0.2.3";
-  sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
-  doCheck = false;
-  patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ];
-  buildDepends = [ filepath parsec transformers ];
-  testDepends = [
-    filepath HUnit parsec testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    homepage = "http://github.com/eli-frey/cmdtheline";
-    description = "Declarative command-line option parsing and documentation library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
deleted file mode 100644
index 92cc3f0f9d8..00000000000
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "code-builder";
-  version = "0.1.3";
-  sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
-  meta = {
-    description = "Simple system for generating code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix
deleted file mode 100644
index 567e68b562d..00000000000
--- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libdevil }:
-
-cabal.mkDerivation (self: {
-  pname = "Codec-Image-DevIL";
-  version = "0.2.3";
-  sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
-  extraLibraries = [ libdevil ];
-  meta = {
-    description = "An FFI interface to the DevIL library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
deleted file mode 100644
index ad207329f2d..00000000000
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "colorize-haskell";
-  version = "1.0.1";
-  sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ ansiTerminal haskellLexer ];
-  meta = {
-    homepage = "http://github.com/yav/colorize-haskell";
-    description = "Highligt Haskell source";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix
deleted file mode 100644
index 167637863ef..00000000000
--- a/pkgs/development/libraries/haskell/colors/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, profunctors }:
-
-cabal.mkDerivation (self: {
-  pname = "colors";
-  version = "0.2.0.1";
-  sha256 = "0xl7hdp1di8gl0g28vz2lm6pbj7hihdkfnr18843016736hll4qn";
-  buildDepends = [ profunctors ];
-  meta = {
-    homepage = "https://github.com/fumieval/colors";
-    description = "A type for colors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
deleted file mode 100644
index 748e62b1d94..00000000000
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "colour";
-  version = "2.3.3";
-  sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Colour";
-    description = "A model for human colour/color perception";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/command-qq/default.nix b/pkgs/development/libraries/haskell/command-qq/default.nix
deleted file mode 100644
index 961506b6a81..00000000000
--- a/pkgs/development/libraries/haskell/command-qq/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "command-qq";
-  version = "0.3.0.0";
-  sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
-  buildDepends = [ text ];
-  testDepends = [ doctest hspec text ];
-  doCheck = false;
-  meta = {
-    homepage = "http://biegunka.github.io/command-qq/";
-    description = "Quasiquoters for external commands";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
deleted file mode 100644
index f44f299522d..00000000000
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad }:
-
-cabal.mkDerivation (self: {
-  pname = "comonad-transformers";
-  version = "4.0";
-  sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
-  buildDepends = [ comonad ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/comonad-transformers/";
-    description = "This package has been merged into comonad 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
deleted file mode 100644
index 36a0db0b9cc..00000000000
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, distributive, doctest, filepath, semigroups
-, tagged, transformers, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "comonad";
-  version = "4.2.2";
-  sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8";
-  buildDepends = [
-    contravariant distributive semigroups tagged transformers
-    transformersCompat
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/comonad/";
-    description = "Comonads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
deleted file mode 100644
index 8c009b8b501..00000000000
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad }:
-
-cabal.mkDerivation (self: {
-  pname = "comonads-fd";
-  version = "4.0";
-  sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
-  buildDepends = [ comonad ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/comonads-fd/";
-    description = "This package has been merged into comonad 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
deleted file mode 100644
index a0a6959b4b1..00000000000
--- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "compact-string-fix";
-  version = "0.3.2";
-  sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
-  meta = {
-    homepage = "http://twan.home.fmf.nl/compact-string/";
-    description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compdata-param/default.nix b/pkgs/development/libraries/haskell/compdata-param/default.nix
deleted file mode 100644
index 2ab1ecd9131..00000000000
--- a/pkgs/development/libraries/haskell/compdata-param/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, compdata, HUnit, mtl, testFramework, testFrameworkHunit
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compdata-param";
-  version = "0.8.0.2";
-  sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
-  buildDepends = [ compdata mtl transformers ];
-  testDepends = [
-    compdata HUnit mtl testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    description = "Parametric Compositional Data Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix
deleted file mode 100644
index ecaec5c4dd0..00000000000
--- a/pkgs/development/libraries/haskell/compdata/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns
-, transformers, treeView
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compdata";
-  version = "0.9";
-  sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc";
-  buildDepends = [
-    deepseq derive mtl QuickCheck thExpandSyns transformers treeView
-  ];
-  testDepends = [
-    deepseq derive HUnit mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns
-    transformers
-  ];
-  meta = {
-    description = "Compositional Data Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/composition/default.nix b/pkgs/development/libraries/haskell/composition/default.nix
deleted file mode 100644
index bf86e11cc81..00000000000
--- a/pkgs/development/libraries/haskell/composition/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "composition";
-  version = "1.0.1.0";
-  sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
-  meta = {
-    homepage = "http://patch-tag.com/r/DanBurton/composition/home";
-    description = "Combinators for unorthodox function composition";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix
deleted file mode 100644
index 9ef921a616f..00000000000
--- a/pkgs/development/libraries/haskell/compressed/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, fingertree, hashable, keys, pointed, reducers
-, semigroupoids, semigroups, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "compressed";
-  version = "3.10";
-  sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
-  buildDepends = [
-    comonad fingertree hashable keys pointed reducers semigroupoids
-    semigroups unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/compressed/";
-    description = "Compressed containers and reducers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix
deleted file mode 100644
index 9762ffc5fc8..00000000000
--- a/pkgs/development/libraries/haskell/concatenative/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "concatenative";
-  version = "1.0.1";
-  sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
-  meta = {
-    homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
-    description = "A library for postfix control flow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
deleted file mode 100644
index 24e2569ad0e..00000000000
--- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashable, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "concrete-typerep";
-  version = "0.1.0.2";
-  sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
-  buildDepends = [ binary hashable ];
-  testDepends = [
-    binary hashable QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Binary and Hashable instances for TypeRep";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
deleted file mode 100644
index 69c1d1edddc..00000000000
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, HUnit, random, stm, testFramework
-, testFrameworkHunit, unboundedDelays
-}:
-
-cabal.mkDerivation (self: {
-  pname = "concurrent-extra";
-  version = "0.7.0.9";
-  sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
-  buildDepends = [ stm unboundedDelays ];
-  testDepends = [
-    async HUnit random stm testFramework testFrameworkHunit
-    unboundedDelays
-  ];
-  meta = {
-    homepage = "https://github.com/basvandijk/concurrent-extra";
-    description = "Extra concurrency primitives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/concurrent-supply/default.nix b/pkgs/development/libraries/haskell/concurrent-supply/default.nix
deleted file mode 100644
index 7b91f2f018b..00000000000
--- a/pkgs/development/libraries/haskell/concurrent-supply/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "concurrent-supply";
-  version = "0.1.7";
-  sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c";
-  buildDepends = [ hashable ];
-  meta = {
-    homepage = "http://github.com/ekmett/concurrent-supply/";
-    description = "A fast concurrent unique identifier supply with a pure API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix
deleted file mode 100644
index 4846e5cb61f..00000000000
--- a/pkgs/development/libraries/haskell/cond/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cond";
-  version = "0.4.1.1";
-  sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
-  meta = {
-    homepage = "https://github.com/kallisti-dev/cond";
-    description = "Basic conditional and boolean operators with monadic variants";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
deleted file mode 100644
index 0f237e12cb0..00000000000
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
-, conduitExtra, hspec, monadControl, monoTraversable, mtl
-, mwcRandom, primitive, QuickCheck, resourcet, safe, silently
-, systemFileio, systemFilepath, text, transformers
-, transformersBase, unixCompat, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit-combinators";
-  version = "0.3.0.4";
-  sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm";
-  buildDepends = [
-    base16Bytestring base64Bytestring chunkedData conduit conduitExtra
-    monadControl monoTraversable mwcRandom primitive resourcet
-    systemFileio systemFilepath text transformers transformersBase
-    unixCompat vector void
-  ];
-  testDepends = [
-    base16Bytestring base64Bytestring chunkedData conduit hspec
-    monoTraversable mtl mwcRandom QuickCheck safe silently
-    systemFilepath text transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/conduit-combinators";
-    description = "Commonly used conduit functions, for both chunked and unchunked data";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
deleted file mode 100644
index 8a551de3516..00000000000
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions
-, filepath, hspec, monadControl, network, primitive, resourcet, stm
-, streamingCommons, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit-extra";
-  version = "1.1.5";
-  sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p";
-  buildDepends = [
-    attoparsec blazeBuilder conduit filepath monadControl network
-    primitive resourcet stm streamingCommons text transformers
-    transformersBase
-  ];
-  testDepends = [
-    async attoparsec blazeBuilder conduit exceptions hspec resourcet
-    stm text transformers transformersBase
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Batteries included conduit: adapters for common libraries";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
deleted file mode 100644
index d0683175482..00000000000
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hspec, liftedBase, mmorph, mtl, QuickCheck
-, resourcet, safe, transformers, transformersBase, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "conduit";
-  version = "1.2.3.1";
-  sha256 = "04n330f9iad6asmry81aqvb7wyh7b962d6pvcfnpm327z4llnvbq";
-  buildDepends = [
-    exceptions liftedBase mmorph mtl resourcet transformers
-    transformersBase void
-  ];
-  testDepends = [
-    exceptions hspec mtl QuickCheck resourcet safe transformers void
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Streaming data processing library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
deleted file mode 100644
index 3ea53f686c9..00000000000
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, hashable, HUnit, testFramework
-, testFrameworkHunit, text, unixCompat, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "configurator";
-  version = "0.3.0.0";
-  sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
-  buildDepends = [
-    attoparsec hashable text unixCompat unorderedContainers
-  ];
-  testDepends = [
-    filepath HUnit testFramework testFrameworkHunit text
-  ];
-  meta = {
-    homepage = "http://github.com/bos/configurator";
-    description = "Configuration management";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
deleted file mode 100644
index 8b2380767f3..00000000000
--- a/pkgs/development/libraries/haskell/connection/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509
-, x509Store, x509System, x509Validation
-}:
-
-cabal.mkDerivation (self: {
-  pname = "connection";
-  version = "0.2.3";
-  sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb";
-  buildDepends = [
-    cprngAes dataDefaultClass network socks tls x509 x509Store
-    x509System x509Validation
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-connection";
-    description = "Simple and easy network connections API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
deleted file mode 100644
index 3f1b196ef27..00000000000
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, newtype }:
-
-cabal.mkDerivation (self: {
-  pname = "constraints";
-  version = "0.4";
-  sha256 = "0nnplylzbcw884jgsd4i46z75dkiyx4166j5fym5zdnwhyj75sp5";
-  buildDepends = [ newtype ];
-  meta = {
-    homepage = "http://github.com/ekmett/constraints/";
-    description = "Constraint manipulation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
deleted file mode 100644
index 2ec057f6a96..00000000000
--- a/pkgs/development/libraries/haskell/continued-fractions/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "continued-fractions";
-  version = "0.9.1.1";
-  sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
-  meta = {
-    homepage = "/dev/null";
-    description = "Continued fractions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
deleted file mode 100644
index 73a874c0a15..00000000000
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroups, tagged, transformers, transformersCompat, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "contravariant";
-  version = "1.2";
-  sha256 = "0gzk9b3xig48jvqz9983a7kziyb2n9z329kn6cqw1k0p8w2h3l8f";
-  buildDepends = [
-    semigroups tagged transformers transformersCompat void
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/contravariant/";
-    description = "Contravariant functors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix
deleted file mode 100644
index 12f9b287d1b..00000000000
--- a/pkgs/development/libraries/haskell/control-bool/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "control-bool";
-  version = "0.2.1";
-  sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
-  meta = {
-    homepage = "https://github.com/fumieval/control-bool";
-    description = "Useful combinators for boolean expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix
deleted file mode 100644
index e2768a9cf55..00000000000
--- a/pkgs/development/libraries/haskell/control-monad-free/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-free";
-  version = "0.5.3";
-  sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-  buildDepends = [ deepseq transformers ];
-  meta = {
-    homepage = "http://github.com/pepeiborra/control-monad-free";
-    description = "Free monads and monad transformers";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix
deleted file mode 100644
index 40d7e5a1e33..00000000000
--- a/pkgs/development/libraries/haskell/control-monad-loop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-loop";
-  version = "0.1";
-  sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
-  buildDepends = [ transformers transformersBase ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
-    description = "Simple monad transformer for imperative-style loops";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
deleted file mode 100644
index 63f7fa81c9d..00000000000
--- a/pkgs/development/libraries/haskell/converge/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "converge";
-  version = "0.1.0.1";
-  sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
-  meta = {
-    homepage = "/dev/null";
-    description = "Limit operations for converging sequences";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
deleted file mode 100644
index fd8f6dac3a8..00000000000
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "convertible";
-  version = "1.1.0.0";
-  sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl text time ];
-  meta = {
-    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
-    description = "Typeclasses and instances for converting between types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
deleted file mode 100644
index abbafafa529..00000000000
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
-, tasty, tastyHunit, tastyQuickcheck, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cookie";
-  version = "0.4.1.4";
-  sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d";
-  buildDepends = [ blazeBuilder dataDefault deepseq text time ];
-  testDepends = [
-    blazeBuilder HUnit QuickCheck tasty tastyHunit tastyQuickcheck text
-    time
-  ];
-  doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
-  meta = {
-    homepage = "http://github.com/snoyberg/cookie";
-    description = "HTTP cookie parsing and rendering";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix
deleted file mode 100644
index e3ba619c6aa..00000000000
--- a/pkgs/development/libraries/haskell/coroutine-object/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, either, lens, mtl, safecopy, transformers
-, transformersFree, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "coroutine-object";
-  version = "0.3";
-  sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
-  buildDepends = [
-    cereal either lens mtl safecopy transformers transformersFree uuid
-  ];
-  meta = {
-    description = "Object-oriented programming realization using coroutine";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
deleted file mode 100644
index 632647e2182..00000000000
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cipherAes, cryptoRandom }:
-
-cabal.mkDerivation (self: {
-  pname = "cprng-aes";
-  version = "0.6.1";
-  sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
-  buildDepends = [ byteable cipherAes cryptoRandom ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cprng-aes";
-    description = "Crypto Pseudo Random Number Generator using AES in counter mode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix
deleted file mode 100644
index d10ecaa0059..00000000000
--- a/pkgs/development/libraries/haskell/cpu/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "cpu";
-  version = "0.1.2";
-  sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cpu";
-    description = "Cpu information and properties helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
deleted file mode 100644
index 01ea0557565..00000000000
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ansiWlPprint, binary, cassava, deepseq, either
-, filepath, Glob, hastache, HUnit, mtl, mwcRandom
-, optparseApplicative, parsec, QuickCheck, statistics
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time, transformers, vector, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "criterion";
-  version = "1.0.2.0";
-  sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson ansiWlPprint binary cassava deepseq either filepath Glob
-    hastache mtl mwcRandom optparseApplicative parsec statistics text
-    time transformers vector vectorAlgorithms
-  ];
-  testDepends = [
-    HUnit QuickCheck statistics testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.serpentine.com/criterion";
-    description = "Robust, reliable performance measurement and analysis";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
deleted file mode 100644
index 2a83b248674..00000000000
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, entropy, tagged, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-api";
-  version = "0.13.2";
-  sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
-  buildDepends = [ cereal entropy tagged transformers ];
-  meta = {
-    homepage = "https://github.com/TomMD/crypto-api";
-    description = "A generic interface for cryptographic operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
deleted file mode 100644
index 04b1b191878..00000000000
--- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
-, securemem, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-cipher-tests";
-  version = "0.0.11";
-  sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz";
-  buildDepends = [
-    byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  testDepends = [
-    byteable cryptoCipherTypes HUnit mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Generic cryptography cipher tests";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
deleted file mode 100644
index 63431431bf7..00000000000
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, securemem }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-cipher-types";
-  version = "0.0.9";
-  sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
-  buildDepends = [ byteable securemem ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Generic cryptography cipher types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
deleted file mode 100644
index c7c3f2590a7..00000000000
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, conduit, conduitExtra, cryptoApi, cryptocipher
-, cryptohashCryptoapi, hspec, resourcet, skein, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-conduit";
-  version = "0.5.5";
-  sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
-  buildDepends = [
-    cereal conduit conduitExtra cryptoApi resourcet transformers
-  ];
-  testDepends = [
-    cereal conduit conduitExtra cryptoApi cryptocipher
-    cryptohashCryptoapi hspec skein transformers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/prowdsponsor/crypto-conduit";
-    description = "Conduit interface for cryptographic operations (from crypto-api)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
deleted file mode 100644
index d101d9af197..00000000000
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-numbers";
-  version = "0.2.3";
-  sha256 = "0nx2mlf40127j7vas7liqy2yzfg4alfaxcjilcxk99kavpaanzgp";
-  buildDepends = [ cryptoRandom vector ];
-  testDepends = [
-    byteable cryptoRandom HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-numbers";
-    description = "Cryptographic numbers: functions and algorithms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
deleted file mode 100644
index 6c0060e52a8..00000000000
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Types }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-pubkey-types";
-  version = "0.4.2.3";
-  sha256 = "1isfyr1ly9hv8idslpjbyc9hhgb1zqd9gfc1s4kvwy4gcdsvrx52";
-  buildDepends = [ asn1Types ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
-    description = "Generic cryptography Public keys algorithm types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
deleted file mode 100644
index a8979fef315..00000000000
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes
-, cryptoRandom, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-pubkey";
-  version = "0.2.5";
-  sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq";
-  buildDepends = [
-    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
-  ];
-  testDepends = [
-    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-pubkey";
-    description = "Public Key cryptography";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
deleted file mode 100644
index 674c2e87013..00000000000
--- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, entropy }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-random-api";
-  version = "0.2.0";
-  sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
-  buildDepends = [ entropy ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-random-api";
-    description = "Simple random generators API for cryptography related code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
deleted file mode 100644
index c7053cbf1e3..00000000000
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, securemem, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-random";
-  version = "0.0.8";
-  sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv";
-  buildDepends = [ securemem vector ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-random";
-    description = "Simple cryptographic random related types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
deleted file mode 100644
index 6f9c05f544b..00000000000
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
-, cipherRc4, cryptoCipherTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptocipher";
-  version = "0.6.2";
-  sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l";
-  buildDepends = [
-    cipherAes cipherBlowfish cipherCamellia cipherDes cipherRc4
-    cryptoCipherTypes
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-    description = "Symmetrical block and stream ciphers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
deleted file mode 100644
index c9476bae647..00000000000
--- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, cryptohash, resourcet, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash-conduit";
-  version = "0.1.1";
-  sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
-  buildDepends = [
-    conduit conduitExtra cryptohash resourcet transformers
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
-    description = "cryptohash conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
deleted file mode 100644
index a1ff03e4c49..00000000000
--- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, cryptohash, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash-cryptoapi";
-  version = "0.1.3";
-  sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
-  buildDepends = [ cereal cryptoApi cryptohash tagged ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
-    description = "Crypto-api interfaces for cryptohash";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
deleted file mode 100644
index 5d143dfc9e8..00000000000
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit
-, tastyQuickcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptohash";
-  version = "0.11.6";
-  sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s";
-  buildDepends = [ byteable ];
-  testDepends = [
-    byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptohash";
-    description = "collection of crypto hashes, fast, pure and practical";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
deleted file mode 100644
index dcc2146313d..00000000000
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, hspec, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "css-text";
-  version = "0.1.2.1";
-  sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
-  buildDepends = [ attoparsec text ];
-  testDepends = [ attoparsec hspec QuickCheck text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "CSS parser and renderer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix
deleted file mode 100644
index f0c01481dbd..00000000000
--- a/pkgs/development/libraries/haskell/csv-conduit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit
-, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl
-, primitive, resourcet, testFramework, testFrameworkHunit, text
-, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "csv-conduit";
-  version = "0.6.3";
-  sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec attoparsecConduit blazeBuilder conduit conduitExtra
-    dataDefault mmorph monadControl mtl primitive resourcet text
-    transformers unorderedContainers vector
-  ];
-  testDepends = [
-    HUnit mtl primitive testFramework testFrameworkHunit text
-    transformers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ozataman/csv-conduit";
-    description = "A flexible, fast, conduit-based CSV parser library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
deleted file mode 100644
index e3908008aa7..00000000000
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "csv";
-  version = "0.1.2";
-  sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
-  buildDepends = [ filepath parsec ];
-  meta = {
-    description = "CSV loader and dumper";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
deleted file mode 100644
index 25eced2e810..00000000000
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cudatoolkit, nvidia_x11 }:
-
-cabal.mkDerivation (self: {
-  pname = "cuda";
-  version = "0.6.5.1";
-  sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y";
-  isLibrary = true;
-  isExecutable = true;
-  buildTools = [ c2hs ];
-  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.cc ];
-  doCheck = false;
-  # Perhaps this should be the default in cabal.nix ...
-  #
-  # The cudatoolkit provides both 64 and 32-bit versions of the
-  # library. GHC's linker fails if the wrong version is found first.
-  # We solve this by eliminating lib64 from the path on 32-bit
-  # platforms and putting lib64 first on 64-bit platforms.
-  libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib";
-  configurePhase = ''
-    for i in Setup.hs Setup.lhs; do
-      test -f $i && ghc --make $i
-    done
-    for p in $extraBuildInputs $propagatedNativeBuildInputs; do
-      if [ -d "$p/include" ]; then
-        extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
-      fi
-      for d in $libPaths; do
-        if [ -d "$p/$d" ]; then
-          extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
-        fi
-      done
-    done
-    ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags
-  '';
-  meta = {
-    homepage = "https://github.com/tmcdonell/cuda";
-    description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
deleted file mode 100644
index dfcf9bec757..00000000000
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cuda }:
-
-cabal.mkDerivation (self: {
-  pname = "cufft";
-  version = "0.1.1.0";
-  sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h";
-  buildDepends = [ cuda ];
-  buildTools = [ c2hs ];
-  meta = {
-    homepage = "http://github.com/robeverest/cufft";
-    description = "Haskell bindings for the CUFFT library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
deleted file mode 100644
index 82bdd707ea7..00000000000
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, curl }:
-
-cabal.mkDerivation (self: {
-  pname = "curl";
-  version = "1.3.8";
-  sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
-  extraLibraries = [ curl ];
-  meta = {
-    description = "Haskell binding to libcurl";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/daemons/default.nix b/pkgs/development/libraries/haskell/daemons/default.nix
deleted file mode 100644
index 1ec84449dd3..00000000000
--- a/pkgs/development/libraries/haskell/daemons/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, filepath, HUnit, network, pipes
-, testFramework, testFrameworkHunit, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "daemons";
-  version = "0.2.1";
-  sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal dataDefault filepath network pipes transformers
-  ];
-  testDepends = [
-    dataDefault HUnit testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/scvalex/daemons";
-    description = "Daemons in Haskell made fun and easy";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
deleted file mode 100644
index 2f514295786..00000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-mtl";
-  version = "0.2.0.4";
-  sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
-  buildDepends = [ dataAccessor mtl ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Use Accessor to access state in mtl State monad class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
deleted file mode 100644
index 5b3a54d7220..00000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-template";
-  version = "0.2.1.11";
-  sha256 = "1n2slv287zp6pabqb7xbfi296dbikw5a4ivqmnas0c4nxikqkayx";
-  buildDepends = [ dataAccessor utilityHt ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Utilities for accessing and manipulating fields of records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
deleted file mode 100644
index c25d8d98cb9..00000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor-transformers";
-  version = "0.2.1.6";
-  sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
-  buildDepends = [ dataAccessor transformers ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Use Accessor to access state in transformers State monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
deleted file mode 100644
index f80a8fc0fe8..00000000000
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-accessor";
-  version = "0.2.2.6";
-  sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Record_access";
-    description = "Utilities for accessing and manipulating fields of records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
deleted file mode 100644
index 8e11a9ef85d..00000000000
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "data-binary-ieee754";
-  version = "0.4.4";
-  sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "https://john-millikin.com/software/data-binary-ieee754/";
-    description = "Parser/Serialiser for IEEE-754 floating-point values";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix
deleted file mode 100644
index 790e22d5cfa..00000000000
--- a/pkgs/development/libraries/haskell/data-checked/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "data-checked";
-  version = "0.3";
-  sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/mvv/data-checked";
-    description = "Type-indexed runtime-checked properties";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix
deleted file mode 100644
index 646f73a2aa9..00000000000
--- a/pkgs/development/libraries/haskell/data-default-class/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-class";
-  version = "0.0.1";
-  sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
-  meta = {
-    description = "A class for types with a default value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
deleted file mode 100644
index 992a5e012dd..00000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-base";
-  version = "0.0.1";
-  sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in base";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
deleted file mode 100644
index 49752fd5055..00000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-containers";
-  version = "0.0.1";
-  sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in containers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
deleted file mode 100644
index 753d91b8a4d..00000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-dlist";
-  version = "0.0.1";
-  sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
-  buildDepends = [ dataDefaultClass dlist ];
-  meta = {
-    description = "Default instances for types in dlist";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
deleted file mode 100644
index 0da8199f3ae..00000000000
--- a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass }:
-
-cabal.mkDerivation (self: {
-  pname = "data-default-instances-old-locale";
-  version = "0.0.1";
-  sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
-  buildDepends = [ dataDefaultClass ];
-  meta = {
-    description = "Default instances for types in old-locale";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
deleted file mode 100644
index 549cb24a689..00000000000
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, dataDefaultInstancesBase
-, dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-default";
-  version = "0.5.3";
-  sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
-  buildDepends = [
-    dataDefaultClass dataDefaultInstancesBase
-    dataDefaultInstancesContainers dataDefaultInstancesDlist
-    dataDefaultInstancesOldLocale
-  ];
-  meta = {
-    description = "A class for types with a default value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix
deleted file mode 100644
index 73fa4488d9f..00000000000
--- a/pkgs/development/libraries/haskell/data-fin/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection
-, smallcheck, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-fin";
-  version = "0.1.1.3";
-  sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
-  buildDepends = [
-    lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
-    tagged
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Finite totally ordered sets";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-fix/default.nix b/pkgs/development/libraries/haskell/data-fix/default.nix
deleted file mode 100644
index ab029a7d1c9..00000000000
--- a/pkgs/development/libraries/haskell/data-fix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-fix";
-  version = "0.0.1";
-  sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
-  meta = {
-    homepage = "https://github.com/anton-k/data-fix";
-    description = "Fixpoint data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-flags/default.nix b/pkgs/development/libraries/haskell/data-flags/default.nix
deleted file mode 100644
index ed2c5b682ce..00000000000
--- a/pkgs/development/libraries/haskell/data-flags/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-flags";
-  version = "0.0.3.1";
-  sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
-  meta = {
-    description = "A package for working with bit masks and flags in general";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-hash/default.nix b/pkgs/development/libraries/haskell/data-hash/default.nix
deleted file mode 100644
index a2c6adeedf9..00000000000
--- a/pkgs/development/libraries/haskell/data-hash/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
-
-cabal.mkDerivation (self: {
-  pname = "data-hash";
-  version = "0.2.0.0";
-  sha256 = "1bfsbc4fkg3jqgbgka1mg6k1fizynvvxbhf2zb0x1apgr579mcrm";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Combinators for building fast hashing functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
deleted file mode 100644
index c9e3ddb3dde..00000000000
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-inttrie";
-  version = "0.1.0";
-  sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
-  meta = {
-    homepage = "http://github.com/luqui/data-inttrie";
-    description = "A lazy, infinite trie of integers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-fd/default.nix b/pkgs/development/libraries/haskell/data-lens-fd/default.nix
deleted file mode 100644
index 85935a5ebda..00000000000
--- a/pkgs/development/libraries/haskell/data-lens-fd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataLens, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-fd";
-  version = "2.0.5";
-  sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
-  buildDepends = [ comonad dataLens mtl transformers ];
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens-fd/";
-    description = "Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix
deleted file mode 100644
index 017e5e706db..00000000000
--- a/pkgs/development/libraries/haskell/data-lens-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-light";
-  version = "0.1.2.1";
-  sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "https://github.com/feuerbach/data-lens-light";
-    description = "Simple lenses, minimum dependencies";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
deleted file mode 100644
index d167e8051cd..00000000000
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataLens }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens-template";
-  version = "2.1.8";
-  sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
-  buildDepends = [ dataLens ];
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens-template/";
-    description = "Utilities for Data.Lens";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
deleted file mode 100644
index b65a41f048e..00000000000
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, semigroupoids, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "data-lens";
-  version = "2.10.5";
-  sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90";
-  buildDepends = [ comonad semigroupoids transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/roconnor/data-lens/";
-    description = "Used to be Haskell 98 Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
deleted file mode 100644
index 2588a396dc0..00000000000
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataInttrie }:
-
-cabal.mkDerivation (self: {
-  pname = "data-memocombinators";
-  version = "0.5.1";
-  sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
-  buildDepends = [ dataInttrie ];
-  meta = {
-    homepage = "http://github.com/luqui/data-memocombinators";
-    description = "Combinators for building memo tables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix
deleted file mode 100644
index 3db8f1ef067..00000000000
--- a/pkgs/development/libraries/haskell/data-ordlist/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-ordlist";
-  version = "0.4.7.0";
-  sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
-  meta = {
-    description = "Set and bag operations on ordered lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix
deleted file mode 100644
index d082cbae510..00000000000
--- a/pkgs/development/libraries/haskell/data-pprint/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, mtl, parallel, time }:
-
-cabal.mkDerivation (self: {
-  pname = "data-pprint";
-  version = "0.2.3";
-  sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y";
-  buildDepends = [ deepseq mtl parallel time ];
-  jailbreak = true;
-  meta = {
-    description = "Prettyprint and compare Data values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix
deleted file mode 100644
index 00c2dc1b48c..00000000000
--- a/pkgs/development/libraries/haskell/data-reify/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "data-reify";
-  version = "0.6";
-  sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
-    description = "Reify a recursive data structure into an explicit graph";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
deleted file mode 100644
index dcb0e97bdb2..00000000000
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dataenc";
-  version = "0.14.0.7";
-  sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
-  isLibrary = true;
-  isExecutable = true;
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
-    description = "Data encoding library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix
deleted file mode 100644
index bacf480a262..00000000000
--- a/pkgs/development/libraries/haskell/date-cache/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "date-cache";
-  version = "0.3.0";
-  sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
-  meta = {
-    description = "Date cacher";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
deleted file mode 100644
index d337f4ee227..00000000000
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "datetime";
-  version = "0.2.1";
-  sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg";
-  buildDepends = [ QuickCheck time ];
-  meta = {
-    homepage = "http://github.com/esessoms/datetime";
-    description = "Utilities to make Data.Time.* easier to use.";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix
deleted file mode 100644
index 7a97a76c6b2..00000000000
--- a/pkgs/development/libraries/haskell/dbmigrations/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, fgl, filepath, HDBC, HDBCPostgresql
-, HDBCSqlite3, HUnit, mtl, random, text, time, yamlLight
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dbmigrations";
-  version = "0.8";
-  sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl
-    random text time yamlLight
-  ];
-  jailbreak = true;
-  meta = {
-    description = "An implementation of relational database \"migrations\"";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
deleted file mode 100644
index dc88a613350..00000000000
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax
-, network, parsec, QuickCheck, random, text, transformers, vector
-, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dbus";
-  version = "0.10.9";
-  sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb";
-  buildDepends = [
-    cereal libxmlSax network parsec random text transformers vector
-    xmlTypes
-  ];
-  testDepends = [
-    cereal chell chellQuickcheck filepath libxmlSax network parsec
-    QuickCheck random text transformers vector xmlTypes
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-dbus/";
-    description = "A client library for the D-Bus IPC system";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq-generics/default.nix b/pkgs/development/libraries/haskell/deepseq-generics/default.nix
deleted file mode 100644
index 0ee12f4b465..00000000000
--- a/pkgs/development/libraries/haskell/deepseq-generics/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq-generics";
-  version = "0.1.1.1";
-  sha256 = "1icc2gxsbnjjl150msnyysvr9r14kb6s2gm3izrj5a3mwf6l7s08";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "https://github.com/hvr/deepseq-generics";
-    description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
deleted file mode 100644
index 1d34e12a844..00000000000
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq-th";
-  version = "0.1.0.4";
-  sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Template Haskell based deriver for optimised NFData instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
deleted file mode 100644
index 340d7fb3bf2..00000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.2.0.1";
-  sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d";
-  meta = {
-    description = "Deep evaluation of data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix
deleted file mode 100644
index 99ce96c8846..00000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.3.0.2";
-  sha256 = "09jnfz5158s4fvlfjbz44vb5jsvflagmsrgbk846arymwym6b7bp";
-  meta = {
-    description = "Deep evaluation of data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix
deleted file mode 100644
index 0270139c383..00000000000
--- a/pkgs/development/libraries/haskell/dependent-map/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dependentSum }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-map";
-  version = "0.1.1.2";
-  sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn";
-  buildDepends = [ dependentSum ];
-  meta = {
-    homepage = "https://github.com/mokus0/dependent-map";
-    description = "Dependent finite maps (partial dependent products)";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix
deleted file mode 100644
index 614a3fdf72d..00000000000
--- a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dependentSum, thExtras }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-sum-template";
-  version = "0.0.0.1";
-  sha256 = "16p6ckl6ml8lgy42mvivnqphfd73cg8chms3fxid66gv4fif68zl";
-  buildDepends = [ dependentSum thExtras ];
-  meta = {
-    homepage = "/dev/null";
-    description = "Template Haskell code to generate instances of classes in dependent-sum package";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix
deleted file mode 100644
index 9f0922a8dfa..00000000000
--- a/pkgs/development/libraries/haskell/dependent-sum/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dependent-sum";
-  version = "0.2.1.0";
-  sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
-  meta = {
-    homepage = "https://github.com/mokus0/dependent-sum";
-    description = "Dependent sum type";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
deleted file mode 100644
index 5b8c5297316..00000000000
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, syb, transformers, uniplate }:
-
-cabal.mkDerivation (self: {
-  pname = "derive";
-  version = "2.5.18";
-  sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath haskellSrcExts syb transformers uniplate
-  ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/derive/";
-    description = "A program and library to derive instances for data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
deleted file mode 100644
index c14b43a4bc3..00000000000
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "derp";
-  version = "0.1.6";
-  sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
-  meta = {
-    description = "Derivative Parsing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/default.nix b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
deleted file mode 100644
index 40e1cf45796..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/builder/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeSvg, cmdargs, diagramsCairo, diagramsLib
-, diagramsPostscript, diagramsSvg, exceptions, filepath, hashable
-, haskellSrcExts, hint, lens, mtl, split, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-builder";
-  version = "0.6.0.2";
-  sha256 = "18avlhwywhrxlf1cyp9fdiy0i3gy12k4i28cymllmmyx78fv59q5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeSvg cmdargs diagramsCairo diagramsLib diagramsPostscript
-    diagramsSvg exceptions filepath hashable haskellSrcExts hint lens
-    mtl split transformers
-  ];
-  configureFlags = "-fcairo -fsvg -fps -frasterific";
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "hint-based build service for the diagrams graphics EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
deleted file mode 100644
index 3fbc8c3f2b0..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  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];
-  }
-  ­~~~
-
-  WARNING:
-  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.
-*/
-
-{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper,
-  extraPackages ? (self: []) }:
-let
-  # Used same technique such as xmonad
-  w = ghcWithPackages
-    (self: [ diagramsBuilder ] ++ extraPackages self);
-  wrappedGhc = w.override { ignoreCollisions = true; };
-in
-stdenv.mkDerivation {
-  name = diagramsBuilder.name + "-wrapper";
-  buildInputs = [ makeWrapper ];
-  buildCommand = ''
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-
-    makeWrapper \
-    "${diagramsBuilder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
-    --set NIX_GHC ${wrappedGhc}/bin/ghc \
-    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
-  '';
-  preferLocalBuild = true;
-  meta = diagramsBuilder.meta;
-}
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
deleted file mode 100644
index 24c26e052d9..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
-, filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative
-, pango, split, statestack, time, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-cairo";
-  version = "1.2.0.4";
-  sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq";
-  buildDepends = [
-    cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    hashable JuicyPixels lens mtl optparseApplicative pango split
-    statestack time transformers vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Cairo backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
deleted file mode 100644
index 78ed983650f..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, arithmoi, circlePacking, colour, dataDefault
-, dataDefaultClass, diagramsCore, diagramsLib, forceLayout, HUnit
-, lens, MonadRandom, mtl, parsec, QuickCheck, semigroups, split
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-contrib";
-  version = "1.1.2.4";
-  sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w";
-  buildDepends = [
-    arithmoi circlePacking colour dataDefault dataDefaultClass
-    diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
-    semigroups split text vectorSpace vectorSpacePoints
-  ];
-  testDepends = [
-    diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Collection of user contributions to diagrams EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
deleted file mode 100644
index 518b5594cb6..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dualTree, lens, MemoTrie, monoidExtras, newtype
-, semigroups, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-core";
-  version = "1.2.0.4";
-  sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq";
-  buildDepends = [
-    dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
-    vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Core libraries for diagrams EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
deleted file mode 100644
index 268bdce4279..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams";
-  version = "1.2";
-  sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
-  buildDepends = [
-    diagramsContrib diagramsCore diagramsLib diagramsSvg
-  ];
-  noHaddock = true;
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Embedded domain-specific language for declarative vector graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
deleted file mode 100644
index c169c9e0e48..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/gtk.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-gtk";
-  version = "1.0.1.3";
-  sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
-  buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Backend for rendering diagrams directly to GTK windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
deleted file mode 100644
index d2e25254f67..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
-, filepath, fingertree, hashable, intervals, JuicyPixels, lens
-, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged
-, vectorSpace, vectorSpacePoints
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-lib";
-  version = "1.2.0.7";
-  sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a";
-  buildDepends = [
-    active colour dataDefaultClass diagramsCore dualTree filepath
-    fingertree hashable intervals JuicyPixels lens MemoTrie
-    monoidExtras optparseApplicative semigroups tagged vectorSpace
-    vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams";
-    description = "Embedded domain-specific language for declarative graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
deleted file mode 100644
index 841487305ef..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist
-, filepath, hashable, lens, monoidExtras, mtl, semigroups, split
-, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-postscript";
-  version = "1.1.0.3";
-  sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz";
-  buildDepends = [
-    dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
-    lens monoidExtras mtl semigroups split vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Postscript backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
deleted file mode 100644
index 8e494241f74..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
-, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
-, Rasterific, split, statestack, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-rasterific";
-  version = "0.1.0.5";
-  sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr";
-  buildDepends = [
-    dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
-    JuicyPixels lens mtl optparseApplicative Rasterific split
-    statestack time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "Rasterific backend for diagrams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
deleted file mode 100644
index 1994905c1d4..00000000000
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeMarkup, blazeSvg, colour
-, diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens
-, monoidExtras, mtl, split, time, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diagrams-svg";
-  version = "1.1.0.3";
-  sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq";
-  buildDepends = [
-    base64Bytestring blazeMarkup blazeSvg colour diagramsCore
-    diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
-    split time vectorSpace
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/diagrams/";
-    description = "SVG backend for diagrams drawing EDSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dice/default.nix b/pkgs/development/libraries/haskell/dice/default.nix
deleted file mode 100644
index 1e3b448f449..00000000000
--- a/pkgs/development/libraries/haskell/dice/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, randomFu, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "dice";
-  version = "0.1";
-  sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parsec randomFu transformers ];
-  meta = {
-    description = "Simplistic D&D style dice-rolling system";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix
deleted file mode 100644
index d13b7af776b..00000000000
--- a/pkgs/development/libraries/haskell/diff3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "diff3";
-  version = "0.2.0.3";
-  sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
-  buildDepends = [ Diff ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/diff3.git";
-    description = "Perform a 3-way difference of documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digest-pure/default.nix b/pkgs/development/libraries/haskell/digest-pure/default.nix
deleted file mode 100644
index a36483bf2f7..00000000000
--- a/pkgs/development/libraries/haskell/digest-pure/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, digest, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "digest-pure";
-  version = "0.0.3";
-  sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
-  testDepends = [ digest QuickCheck ];
-  meta = {
-    homepage = "http://github.com/danieldk/digest-pure";
-    description = "Pure hash functions for bytestrings";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
deleted file mode 100644
index 6b1f2077ca6..00000000000
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "digest";
-  version = "0.0.1.2";
-  sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
deleted file mode 100644
index 819d4690da5..00000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
-, safe, scientific, tasty, tastyHunit, text, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-aeson";
-  version = "1.1.12.1";
-  sha256 = "1jwrlmavwjq3bf8ylazi91mwl47n5pdh3lipv4p7v0gq45dm3hg9";
-  buildDepends = [
-    aeson digestiveFunctors lens lensAeson safe text vector
-  ];
-  testDepends = [
-    aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/digestive-functors-aeson";
-    description = "Run digestive-functors forms against JSON";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
deleted file mode 100644
index 29ed0504806..00000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, digestiveFunctors, heist, mtl, text, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-heist";
-  version = "0.8.6.1";
-  sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb";
-  buildDepends = [
-    blazeBuilder digestiveFunctors heist mtl text xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "Heist frontend for the digestive-functors library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
deleted file mode 100644
index 71d1a6448fa..00000000000
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, digestiveFunctors, filepath, mtl, snapCore, text }:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors-snap";
-  version = "0.6.1.0";
-  sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
-  buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "Snap backend for the digestive-functors library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
deleted file mode 100644
index 03448a3fe67..00000000000
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "digestive-functors";
-  version = "0.7.1.1";
-  sha256 = "161461y8gil2922gx6kdc59g50ywk9nk74gkxl0yrwvz80a118c9";
-  buildDepends = [ mtl text time ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jaspervdj/digestive-functors";
-    description = "A practical formlet library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix
deleted file mode 100644
index 16f4e665f93..00000000000
--- a/pkgs/development/libraries/haskell/digits/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "digits";
-  version = "0.2";
-  sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    description = "Converts integers to lists of digits and back";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
deleted file mode 100644
index b6e3f40f937..00000000000
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, numtypeTf, time }:
-
-cabal.mkDerivation (self: {
-  pname = "dimensional-tf";
-  version = "0.3.0.1";
-  sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
-  buildDepends = [ numtypeTf time ];
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Statically checked physical dimensions, implemented using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
deleted file mode 100644
index 9be32b5596a..00000000000
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, numtype, time }:
-
-cabal.mkDerivation (self: {
-  pname = "dimensional";
-  version = "0.13.0.1";
-  sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6";
-  buildDepends = [ numtype time ];
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Statically checked physical dimensions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
deleted file mode 100644
index c3be0f888ac..00000000000
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, HUnit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "direct-sqlite";
-  version = "2.3.14";
-  sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w";
-  buildDepends = [ text ];
-  testDepends = [ base16Bytestring HUnit text ];
-  meta = {
-    homepage = "https://github.com/IreneKnapp/direct-sqlite";
-    description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
deleted file mode 100644
index 2cc9682dccb..00000000000
--- a/pkgs/development/libraries/haskell/directory-layout/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, commandQq, doctest, filepath, free, hspec, lens
-, semigroups, temporary, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "directory-layout";
-  version = "0.7.4.1";
-  sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
-  buildDepends = [
-    commandQq filepath free hspec lens semigroups text transformers
-    unorderedContainers
-  ];
-  testDepends = [
-    commandQq doctest filepath free hspec lens semigroups temporary
-    text transformers unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    description = "Directory layout DSL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
deleted file mode 100644
index d4bff085005..00000000000
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "directory-tree";
-  version = "0.12.0";
-  sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
-  buildDepends = [ filepath ];
-  testDepends = [ filepath ];
-  meta = {
-    homepage = "http://brandon.si/code/directory-tree-module-released/";
-    description = "A simple directory-like tree datatype, with useful IO functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
deleted file mode 100644
index d8de329a7de..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributedProcess, monadControl, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-monad-control";
-  version = "0.5.1";
-  sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
-  buildDepends = [
-    distributedProcess monadControl transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://haskell-distributed.github.io";
-    description = "Orphan instances for MonadBase and MonadBaseControl";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
deleted file mode 100644
index 165b09d13bf..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, distributedProcess, mtl, network, networkTransport
-, networkTransportTcp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-p2p";
-  version = "0.1.3.0";
-  sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary distributedProcess mtl network networkTransport
-    networkTransportTcp
-  ];
-  meta = {
-    homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
-    description = "Peer-to-peer node discovery for Cloud Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
deleted file mode 100644
index cb014f53a8a..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, binary, dataAccessor, deepseq
-, distributedProcess, distributedStatic, fingertree, hashable
-, HUnit, mtl, network, networkTransport, networkTransportTcp
-, QuickCheck, rematch, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-platform";
-  version = "0.1.0";
-  sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataAccessor deepseq distributedProcess fingertree hashable
-    mtl stm time transformers unorderedContainers
-  ];
-  testDepends = [
-    ansiTerminal binary dataAccessor deepseq distributedProcess
-    distributedStatic fingertree hashable HUnit mtl network
-    networkTransport networkTransportTcp QuickCheck rematch stm
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 time
-    transformers unorderedContainers
-  ];
-  hyperlinkSource = false;
-  jailbreak = true;
-  doCheck = false;
-  patchPhase = "mv Setup.hs Setup.lhs";
-  meta = {
-    homepage = "http://github.com/haskell-distributed/distributed-process-platform";
-    description = "The Cloud Haskell Application Platform";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
deleted file mode 100644
index 0232a02c8af..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable
-, mtl, networkTransport, random, rank1dynamic, stm, syb, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process";
-  version = "0.5.2";
-  sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l";
-  buildDepends = [
-    binary dataAccessor deepseq distributedStatic hashable mtl
-    networkTransport random rank1dynamic stm syb time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell-distributed.github.com/";
-    description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
deleted file mode 100644
index 4dce7cc1ded..00000000000
--- a/pkgs/development/libraries/haskell/distributed-static/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, rank1dynamic }:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-static";
-  version = "0.3.1.0";
-  sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08";
-  buildDepends = [ binary rank1dynamic ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Compositional, type-safe, polymorphic static values and closures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
deleted file mode 100644
index 9bb64ee4c59..00000000000
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, tagged, transformers
-, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributive";
-  version = "0.4.4";
-  sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
-  buildDepends = [ tagged transformers transformersCompat ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/distributive/";
-    description = "Distributive functors -- Dual to Traversable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn-ghc/default.nix b/pkgs/development/libraries/haskell/djinn-ghc/default.nix
deleted file mode 100644
index 3b5ffae42c5..00000000000
--- a/pkgs/development/libraries/haskell/djinn-ghc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, djinnLib, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn-ghc";
-  version = "0.0.2.2";
-  sha256 = "0dz5jg58si9fsc12212rxmzky09zric7b2sdj1ydmvnrjxkh9l70";
-  buildDepends = [ async djinnLib mtl transformers ];
-  meta = {
-    description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn-lib/default.nix b/pkgs/development/libraries/haskell/djinn-lib/default.nix
deleted file mode 100644
index 357ad9a4fdc..00000000000
--- a/pkgs/development/libraries/haskell/djinn-lib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn-lib";
-  version = "0.0.1.2";
-  sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://www.augustsson.net/Darcs/Djinn/";
-    description = "Generate Haskell code from a type. Library extracted from djinn package.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
deleted file mode 100644
index e922d9ff7be..00000000000
--- a/pkgs/development/libraries/haskell/djinn/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskeline, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "djinn";
-  version = "2014.9.7";
-  sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskeline mtl ];
-  meta = {
-    description = "Generate Haskell code from a type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix
deleted file mode 100644
index 29910a22381..00000000000
--- a/pkgs/development/libraries/haskell/dlist-instances/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "dlist-instances";
-  version = "0.1";
-  sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
-  buildDepends = [ dlist semigroups ];
-  meta = {
-    homepage = "https://github.com/gregwebs/dlist-instances";
-    description = "Difference lists instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
deleted file mode 100644
index bf0b73b45e6..00000000000
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "dlist";
-  version = "0.7.1";
-  sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr";
-  buildDepends = [ deepseq ];
-  testDepends = [ Cabal QuickCheck ];
-  meta = {
-    homepage = "https://github.com/spl/dlist";
-    description = "Difference lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
deleted file mode 100644
index ab74819965a..00000000000
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra
-, doctest, hspec, iproute, mtl, network, random, resourcet, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dns";
-  version = "1.4.4";
-  sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd";
-  buildDepends = [
-    attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
-    network random resourcet
-  ];
-  testDepends = [
-    attoparsec binary blazeBuilder conduit conduitExtra doctest hspec
-    iproute mtl network random resourcet word8
-  ];
-  testTarget = "spec";
-  meta = {
-    description = "DNS library in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/doctest-prop/default.nix b/pkgs/development/libraries/haskell/doctest-prop/default.nix
deleted file mode 100644
index bca82f78bcf..00000000000
--- a/pkgs/development/libraries/haskell/doctest-prop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "doctest-prop";
-  version = "0.2";
-  sha256 = "09wxkhcmh297hqnx3g4x8ff0w5dcmls9y383417rc8wawf5q288n";
-  buildDepends = [ HUnit QuickCheck ];
-  testDepends = [ doctest HUnit QuickCheck ];
-  meta = {
-    description = "Allow QuickCheck-style property testing within doctest";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
deleted file mode 100644
index af3f9e2d525..00000000000
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit
-, QuickCheck, setenv, silently, stringbuilder, syb, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "doctest";
-  version = "0.9.11.1";
-  sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ deepseq filepath ghcPaths syb transformers ];
-  testDepends = [
-    baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
-    silently stringbuilder syb transformers
-  ];
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
-  meta = {
-    homepage = "https://github.com/sol/doctest#readme";
-    description = "Test interactive Haskell examples";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix
deleted file mode 100644
index b9806ca4dc7..00000000000
--- a/pkgs/development/libraries/haskell/dom-selector/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
-, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dom-selector";
-  version = "0.2.0.1";
-  sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
-  buildDepends = [
-    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
-  ];
-  testDepends = [
-    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/nebuta/";
-    description = "DOM traversal by CSS selectors for xml-conduit package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
deleted file mode 100644
index f72b051be44..00000000000
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "dotgen";
-  version = "0.4.1";
-  sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "A simple interface for building .dot graph files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
deleted file mode 100644
index 7089c9fcd05..00000000000
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, testFramework, testFrameworkQuickcheck2, text }:
-
-cabal.mkDerivation (self: {
-  pname = "double-conversion";
-  version = "2.0.1.0";
-  sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
-  buildDepends = [ text ];
-  testDepends = [ testFramework testFrameworkQuickcheck2 text ];
-  meta = {
-    homepage = "https://github.com/bos/double-conversion";
-    description = "Fast conversion between double precision floating point and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
deleted file mode 100644
index c30cbfec691..00000000000
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, curl, feed, tagsoup, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "download-curl";
-  version = "0.1.4";
-  sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
-  buildDepends = [ curl feed tagsoup xml ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/download-curl";
-    description = "High-level file download based on URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
deleted file mode 100644
index dc9ecd7145a..00000000000
--- a/pkgs/development/libraries/haskell/download/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, feed, tagsoup, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "download";
-  version = "0.3.2";
-  sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
-  buildDepends = [ feed tagsoup xml ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/download";
-    description = "High-level file download based on URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix
deleted file mode 100644
index f0d64562d7c..00000000000
--- a/pkgs/development/libraries/haskell/dsp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "dsp";
-  version = "0.2.3";
-  sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ random ];
-  patchPhase = ''
-    sed -i -e 's|random.*<1.1,|random,|' dsp.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/DSP";
-    description = "Haskell Digital Signal Processing";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
deleted file mode 100644
index eee03fd3fba..00000000000
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "dstring";
-  version = "0.4.0.4";
-  sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
-  buildDepends = [ baseUnicodeSymbols dlist ];
-  meta = {
-    homepage = "https://github.com/basvandijk/dstring";
-    description = "Difference strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
deleted file mode 100644
index 7efdcce8526..00000000000
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monoidExtras, newtype, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "dual-tree";
-  version = "0.2.0.5";
-  sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5";
-  buildDepends = [ monoidExtras newtype semigroups ];
-  jailbreak = true;
-  meta = {
-    description = "Rose trees with cached and accumulating monoidal annotations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
deleted file mode 100644
index 066c11e5a36..00000000000
--- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate
-, haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dynamic-cabal";
-  version = "0.3.3";
-  sha256 = "0fq6q0j2fx7ygarzgsvb7scssjnrxjrq188d0habfar6bdm0vqdg";
-  buildDepends = [
-    dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
-    void
-  ];
-  testDepends = [ doctest filepath HUnit tasty tastyHunit tastyTh ];
-  meta = {
-    homepage = "http://github.com/bennofs/dynamic-cabal/";
-    description = "dynamic-cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dynamic-state/default.nix b/pkgs/development/libraries/haskell/dynamic-state/default.nix
deleted file mode 100644
index 21eb0fdab28..00000000000
--- a/pkgs/development/libraries/haskell/dynamic-state/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, concreteTyperep, hashable, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "dynamic-state";
-  version = "0.1.1.0";
-  sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n";
-  buildDepends = [
-    binary concreteTyperep hashable unorderedContainers
-  ];
-  meta = {
-    description = "Optionally serializable dynamic state keyed by type";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix
deleted file mode 100644
index 0d47a68d06d..00000000000
--- a/pkgs/development/libraries/haskell/dyre/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage
-, time, xdgBasedir
-}:
-
-cabal.mkDerivation (self: {
-  pname = "dyre";
-  version = "0.8.12";
-  sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
-  buildDepends = [
-    binary executablePath filepath ghcPaths ioStorage time xdgBasedir
-  ];
-  meta = {
-    homepage = "http://github.com/willdonnelly/dyre";
-    description = "Dynamic reconfiguration in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/easy-file/default.nix b/pkgs/development/libraries/haskell/easy-file/default.nix
deleted file mode 100644
index 8ba73d74efe..00000000000
--- a/pkgs/development/libraries/haskell/easy-file/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, time }:
-
-cabal.mkDerivation (self: {
-  pname = "easy-file";
-  version = "0.2.0";
-  sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a";
-  buildDepends = [ filepath time ];
-  meta = {
-    homepage = "http://github.com/kazu-yamamoto/easy-file";
-    description = "Cross-platform File handling";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
deleted file mode 100644
index c68e32b78df..00000000000
--- a/pkgs/development/libraries/haskell/edit-distance/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "edit-distance";
-  version = "0.2.1.2";
-  sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://github.com/batterseapower/edit-distance";
-    description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix
deleted file mode 100644
index 4458a067b1f..00000000000
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libedit }:
-
-cabal.mkDerivation (self: {
-  pname = "editline";
-  version = "0.2.1.1";
-  sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
-  extraLibraries = [ libedit ];
-  meta = {
-    homepage = "http://code.haskell.org/editline";
-    description = "Bindings to the editline library (libedit)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
deleted file mode 100644
index 70c8573ade5..00000000000
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom
-, mtl, profunctors, semigroupoids, semigroups, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "either";
-  version = "4.3.2.1";
-  sha256 = "09c1xal7d6azw0cc8mwi0ry8blysg29cmyfipdhg1b7vzyjavv22";
-  buildDepends = [
-    bifunctors exceptions free monadControl MonadRandom mtl profunctors
-    semigroupoids semigroups transformers transformersBase
-  ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
-  meta = {
-    homepage = "http://github.com/ekmett/either/";
-    description = "An either monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
deleted file mode 100644
index e4074ddd1ff..00000000000
--- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ekgCore, httpClient, lens, network, networkUri
-, text, time, unorderedContainers, vector, wreq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-bosun";
-  version = "1.0.3";
-  sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc";
-  buildDepends = [
-    aeson ekgCore httpClient lens network networkUri text time
-    unorderedContainers vector wreq
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/ekg-bosun";
-    description = "Send ekg metrics to a Bosun instance";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix
deleted file mode 100644
index 2339009a138..00000000000
--- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ekgCore, network, networkCarbon, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-carbon";
-  version = "1.0.2";
-  sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i";
-  buildDepends = [
-    ekgCore network networkCarbon text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/ekg-carbon";
-    description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix
deleted file mode 100644
index 6e2189dbadb..00000000000
--- a/pkgs/development/libraries/haskell/ekg-core/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "ekg-core";
-  version = "0.1.0.2";
-  sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg";
-  buildDepends = [ text unorderedContainers ];
-  meta = {
-    homepage = "https://github.com/tibbe/ekg-core";
-    description = "Tracking of system metrics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
deleted file mode 100644
index 05dd7d99877..00000000000
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ekgCore, filepath, network, snapCore, snapServer
-, text, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ekg";
-  version = "0.4.0.5";
-  sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0";
-  buildDepends = [
-    aeson ekgCore filepath network snapCore snapServer text time
-    transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tibbe/ekg";
-    description = "Remote monitoring of processes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
deleted file mode 100644
index 4d843bb0836..00000000000
--- a/pkgs/development/libraries/haskell/elerea/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "elerea";
-  version = "2.8.0";
-  sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
-  buildDepends = [ transformers transformersBase ];
-  meta = {
-    description = "A minimalistic FRP library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/elevator/default.nix b/pkgs/development/libraries/haskell/elevator/default.nix
deleted file mode 100644
index a93e52a0ba0..00000000000
--- a/pkgs/development/libraries/haskell/elevator/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "elevator";
-  version = "0.1.3";
-  sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535";
-  buildDepends = [ cleanUnions transformers ];
-  meta = {
-    homepage = "https://github.com/fumieval/elevator";
-    description = "Immediately lifts to a desired level";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
deleted file mode 100644
index 8f95b8ec67b..00000000000
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "email-validate";
-  version = "2.0.1";
-  sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj";
-  buildDepends = [ attoparsec ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
-    description = "Validating an email address string against RFC 5322";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
deleted file mode 100644
index a28c9fc4683..00000000000
--- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, hspec, liftedBase, monadControl
-, QuickCheck, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "enclosed-exceptions";
-  version = "1.0.1";
-  sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz";
-  buildDepends = [
-    async deepseq liftedBase monadControl transformers transformersBase
-  ];
-  testDepends = [
-    async deepseq hspec liftedBase monadControl QuickCheck transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/jcristovao/enclosed-exceptions";
-    description = "Catching all exceptions from within an enclosed computation";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
deleted file mode 100644
index 148d4f4debf..00000000000
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "encoding";
-  version = "0.7.0.2";
-  sha256 = "14l3dx7ayvp2dm37c3h7p63zfzmhwpx1hirbkm04idhi3906lxps";
-  buildDepends = [
-    binary extensibleExceptions HaXml mtl regexCompat
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/encoding/";
-    description = "A library for various character encodings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
deleted file mode 100644
index b37ef7c2bc1..00000000000
--- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsecEnumerator, engineIo, MonadCatchIOTransformers
-, snapCore, unorderedContainers, websockets, websocketsSnap
-}:
-
-cabal.mkDerivation (self: {
-  pname = "engine-io-snap";
-  version = "1.0.2";
-  sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
-  buildDepends = [
-    attoparsecEnumerator engineIo MonadCatchIOTransformers snapCore
-    unorderedContainers websockets websocketsSnap
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
deleted file mode 100644
index d275a2f2b0f..00000000000
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, attoparsec, base64Bytestring, either, free
-, monadLoops, mwcRandom, stm, stmDelay, text, transformers
-, unorderedContainers, vector, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "engine-io";
-  version = "1.2.3";
-  sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc";
-  buildDepends = [
-    aeson async attoparsec base64Bytestring either free monadLoops
-    mwcRandom stm stmDelay text transformers unorderedContainers vector
-    websockets
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    description = "A Haskell implementation of Engine.IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
deleted file mode 100644
index 3b40f5959f7..00000000000
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "entropy";
-  version = "0.3.4.1";
-  sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
-  meta = {
-    homepage = "https://github.com/TomMD/entropy";
-    description = "A platform independent entropy source";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
deleted file mode 100644
index d68222f6f7b..00000000000
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "enumerator";
-  version = "0.4.20";
-  sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
-  buildDepends = [ text transformers ];
-  meta = {
-    homepage = "https://john-millikin.com/software/enumerator/";
-    description = "Reliable, high-performance processing with left-fold enumerators";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix
deleted file mode 100644
index 9b24980b5b9..00000000000
--- a/pkgs/development/libraries/haskell/enummapset-th/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "enummapset-th";
-  version = "0.6.0.1";
-  sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "https://github.com/liyang/enummapset-th";
-    description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix
deleted file mode 100644
index 97833ea9465..00000000000
--- a/pkgs/development/libraries/haskell/enummapset/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "enummapset";
-  version = "0.5.2.0";
-  sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js";
-  buildDepends = [ deepseq ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michalt/enummapset";
-    description = "IntMap and IntSet with Enum keys/elements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix
deleted file mode 100644
index d563ce04247..00000000000
--- a/pkgs/development/libraries/haskell/enumset/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, storableRecord }:
-
-cabal.mkDerivation (self: {
-  pname = "enumset";
-  version = "0.0.4";
-  sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
-  buildDepends = [ dataAccessor storableRecord ];
-  meta = {
-    description = "Sets of enumeration values represented by machine words";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ertes ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
deleted file mode 100644
index b9562573f8f..00000000000
--- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, singletons, tagged, void }:
-
-cabal.mkDerivation (self: {
-  pname = "equational-reasoning";
-  version = "0.2.0.4";
-  sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j";
-  buildDepends = [ singletons tagged void ];
-  jailbreak = true;
-  meta = {
-    description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/default.nix
deleted file mode 100644
index 38de239b821..00000000000
--- a/pkgs/development/libraries/haskell/equivalence/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, STMonadTrans, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "equivalence";
-  version = "0.2.5";
-  sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3";
-  buildDepends = [ mtl STMonadTrans ];
-  testDepends = [
-    mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://bitbucket.org/paba/equivalence/";
-    description = "Maintaining an equivalence relation implemented as union-find using STT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
deleted file mode 100644
index 431a9b99b33..00000000000
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "erf";
-  version = "2.0.0.0";
-  sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
-  meta = {
-    description = "The error function, erf, and related functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
deleted file mode 100644
index 69949aeb575..00000000000
--- a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "errorcall-eq-instance";
-  version = "0.1.0";
-  sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk";
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "An orphan Eq instance for ErrorCall";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
deleted file mode 100644
index d61bef4102d..00000000000
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, either, safe, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "errors";
-  version = "1.4.7";
-  sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
-  buildDepends = [ either safe transformers ];
-  jailbreak = true;
-  meta = {
-    description = "Simplified error-handling";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
deleted file mode 100644
index c85ff455180..00000000000
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, hspec, HUnit, monadControl, monadLogger
-, persistent, persistentSqlite, persistentTemplate, QuickCheck
-, resourcet, tagged, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "esqueleto";
-  version = "2.1.2.1";
-  sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i";
-  buildDepends = [
-    conduit monadLogger persistent resourcet tagged text transformers
-    unorderedContainers
-  ];
-  testDepends = [
-    conduit hspec HUnit monadControl monadLogger persistent
-    persistentSqlite persistentTemplate QuickCheck resourcet text
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/prowdsponsor/esqueleto";
-    description = "Type-safe EDSL for SQL queries on persistent backends";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix
deleted file mode 100644
index 99f48cb9a28..00000000000
--- a/pkgs/development/libraries/haskell/event-list/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, nonNegative, QuickCheck, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "event-list";
-  version = "0.1.1.1";
-  sha256 = "16qrjvn8z2nlpfp3xlgwsg2abn7b33n3z673qs5k6ashfbkdy5ja";
-  buildDepends = [ nonNegative QuickCheck transformers utilityHt ];
-  testDepends = [
-    nonNegative QuickCheck random transformers utilityHt
-  ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/event-list/";
-    description = "Event lists with relative or absolute time stamps";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix
deleted file mode 100644
index 7c40662dd98..00000000000
--- a/pkgs/development/libraries/haskell/ex-pool/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hashable, stm, time, transformers, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "ex-pool";
-  version = "0.2";
-  sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
-  buildDepends = [
-    exceptions hashable stm time transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/kim/ex-pool";
-    description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
deleted file mode 100644
index 49fb11535a1..00000000000
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptionTransformers, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "exception-mtl";
-  version = "0.3.0.5";
-  sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj";
-  buildDepends = [ exceptionTransformers mtl transformers ];
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Exception monad transformer instances for mtl2 classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
deleted file mode 100644
index 2e2f828cb30..00000000000
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "exception-transformers";
-  version = "0.3.0.4";
-  sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra";
-  buildDepends = [ stm transformers ];
-  testDepends = [
-    HUnit testFramework testFrameworkHunit transformers
-  ];
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Type classes and monads for unchecked extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
deleted file mode 100644
index ef56c9909e1..00000000000
--- a/pkgs/development/libraries/haskell/exceptions/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "exceptions";
-  version = "0.6.1";
-  sha256 = "09jv5jskv48fd5la1pdvafwc9j2jxj1ncf6yxzkwcjddynbkyszm";
-  buildDepends = [ mtl transformers ];
-  testDepends = [
-    mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/exceptions/";
-    description = "Extensible optionally-pure exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix
deleted file mode 100644
index c8ec138eb63..00000000000
--- a/pkgs/development/libraries/haskell/executable-path/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "executable-path";
-  version = "0.0.3";
-  sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "Finding out the full path of the executable";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/exhaustive/default.nix b/pkgs/development/libraries/haskell/exhaustive/default.nix
deleted file mode 100644
index bd77f9f8f11..00000000000
--- a/pkgs/development/libraries/haskell/exhaustive/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, genericsSop, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "exhaustive";
-  version = "1.1.0";
-  sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl";
-  buildDepends = [ genericsSop transformers ];
-  meta = {
-    homepage = "http://github.com/ocharles/exhaustive";
-    description = "Compile time checks that a computation considers producing data through all possible constructors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
deleted file mode 100644
index 6c5c4f2b2ff..00000000000
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "explicit-exception";
-  version = "0.1.7.3";
-  sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Exception";
-    description = "Exceptions which are explicit in the type signature";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
deleted file mode 100644
index e7f1f16059d..00000000000
--- a/pkgs/development/libraries/haskell/extensible-effects/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, transformersBase
-, typeAligned, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-effects";
-  version = "1.9.0.1";
-  sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx";
-  buildDepends = [ transformers transformersBase typeAligned void ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 void
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/RobotGymnast/extensible-effects";
-    description = "An Alternative to Monad Transformers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
deleted file mode 100644
index 39969527a85..00000000000
--- a/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-exceptions";
-  version = "0.1.1.4";
-  sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
-  meta = {
-    description = "Extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix
deleted file mode 100644
index 9e90fe2bb05..00000000000
--- a/pkgs/development/libraries/haskell/extra/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "extra";
-  version = "1.0";
-  sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb";
-  buildDepends = [ filepath time ];
-  testDepends = [ filepath QuickCheck time ];
-  meta = {
-    homepage = "https://github.com/ndmitchell/extra#readme";
-    description = "Extra functions I use";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
deleted file mode 100644
index 86912a2e445..00000000000
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "failure";
-  version = "0.2.0.3";
-  sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Failure";
-    description = "A simple type class for success/failure computations. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
deleted file mode 100644
index b0cd40e48fc..00000000000
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "fast-logger";
-  version = "2.2.3";
-  sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3";
-  buildDepends = [ autoUpdate blazeBuilder filepath text ];
-  testDepends = [ hspec ];
-  meta = {
-    description = "A fast logging system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fastcgi/default.nix b/pkgs/development/libraries/haskell/fastcgi/default.nix
deleted file mode 100644
index a41815250e1..00000000000
--- a/pkgs/development/libraries/haskell/fastcgi/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cgi, fcgi }:
-
-cabal.mkDerivation (self: {
-  pname = "fastcgi";
-  version = "3001.0.2.4";
-  sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
-  buildDepends = [ cgi ];
-  extraLibraries = [ fcgi ];
-  meta = {
-    description = "A Haskell library for writing FastCGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
deleted file mode 100644
index 466dd478261..00000000000
--- a/pkgs/development/libraries/haskell/fay-base/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fay }:
-
-cabal.mkDerivation (self: {
-  pname = "fay-base";
-  version = "0.19.4.1";
-  sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6";
-  buildDepends = [ fay ];
-  meta = {
-    homepage = "https://github.com/faylang/fay/";
-    description = "The base package for Fay";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    inherit (fay.meta) broken;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix
deleted file mode 100644
index 05b2505d762..00000000000
--- a/pkgs/development/libraries/haskell/fay-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fay, fayBase, text }:
-
-cabal.mkDerivation (self: {
-  pname = "fay-text";
-  version = "0.3.2";
-  sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m";
-  buildDepends = [ fay fayBase text ];
-  meta = {
-    homepage = "https://github.com/faylang/fay-text";
-    description = "Fay Text type represented as JavaScript strings";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    inherit (fay.meta) broken;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
deleted file mode 100644
index 9a268a9b34f..00000000000
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames
-, haskellPackages, haskellSrcExts, languageEcmascript, mtl
-, optparseApplicative, safe, sourcemap, split, spoon, syb, text
-, time, transformers, uniplate, unorderedContainers, utf8String
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fay";
-  version = "0.21.2.1";
-  sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson dataDefault filepath ghcPaths haskellNames haskellPackages
-    haskellSrcExts languageEcmascript mtl optparseApplicative safe
-    sourcemap split spoon syb text time transformers uniplate
-    unorderedContainers utf8String vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/faylang/fay/wiki";
-    description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
deleted file mode 100644
index b325af923d7..00000000000
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
-, cereal, conduit, conduitExtra, cryptoApi, cryptohash
-, cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes
-, HUnit, liftedBase, monadControl, monadLogger, QuickCheck
-, resourcet, text, time, transformers, transformersBase
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fb";
-  version = "1.0.8";
-  sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
-  buildDepends = [
-    aeson attoparsec base16Bytestring base64Bytestring cereal conduit
-    conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
-    httpConduit httpTypes liftedBase monadControl monadLogger resourcet
-    text time transformers transformersBase unorderedContainers
-  ];
-  testDepends = [
-    aeson conduit dataDefault hspec httpConduit HUnit liftedBase
-    monadControl QuickCheck resourcet text time transformers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/prowdsponsor/fb";
-    description = "Bindings to Facebook's API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
deleted file mode 100644
index 431a46504ee..00000000000
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "fclabels";
-  version = "2.0.2";
-  sha256 = "108ad6l8ibz44n000hlywqpqslsz1czmsal7qvbd53chmmm4xgdp";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    homepage = "https://github.com/sebastiaanvisser/fclabels";
-    description = "First class accessor labels implemented as lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fdo-notify/default.nix b/pkgs/development/libraries/haskell/fdo-notify/default.nix
deleted file mode 100644
index 170cf7b3395..00000000000
--- a/pkgs/development/libraries/haskell/fdo-notify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dbus }:
-
-cabal.mkDerivation (self: {
-  pname = "fdo-notify";
-  version = "0.3.1";
-  sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
-  buildDepends = [ dbus ];
-  meta = {
-    homepage = "http://bitbucket.org/taejo/fdo-notify/";
-    description = "Desktop Notifications client";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
deleted file mode 100644
index b7bc816b6d0..00000000000
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time, utf8String, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "feed";
-  version = "0.3.9.2";
-  sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg";
-  buildDepends = [ time utf8String xml ];
-  meta = {
-    homepage = "https://github.com/sof/feed";
-    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
deleted file mode 100644
index ea11a67d3c9..00000000000
--- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dotgen, fgl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl-visualize";
-  version = "0.1.0.1";
-  sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
-  buildDepends = [ dotgen fgl ];
-  meta = {
-    description = "Convert FGL graphs to dot (graphviz) files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix
deleted file mode 100644
index 65a67528d01..00000000000
--- a/pkgs/development/libraries/haskell/fgl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.5.0.1";
-  sha256 = "0qw70f5hfrxmrx49wx8vk2f5cam7jbpb20mp4i0ybcwdld5ncqda";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
deleted file mode 100644
index b9cd34552b2..00000000000
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "file-embed";
-  version = "0.0.7";
-  sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g";
-  buildDepends = [ filepath ];
-  testDepends = [ filepath HUnit ];
-  meta = {
-    homepage = "https://github.com/snoyberg/file-embed";
-    description = "Use Template Haskell to embed file contents directly";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
deleted file mode 100644
index e027047a9ea..00000000000
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, liftedBase, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "file-location";
-  version = "0.4.5.3";
-  sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9";
-  buildDepends = [ liftedBase transformers ];
-  testDepends = [ liftedBase transformers ];
-  meta = {
-    homepage = "https://github.com/gregwebs/FileLocation.hs";
-    description = "common functions that show file location information";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix
deleted file mode 100644
index c07ba6c2c90..00000000000
--- a/pkgs/development/libraries/haskell/filemanip/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, unixCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "filemanip";
-  version = "0.3.6.2";
-  sha256 = "03l114rhb4f6nyzs9w14i79d7kyyq9ia542alsqpbmikm9gxm4rz";
-  buildDepends = [ filepath mtl unixCompat ];
-  meta = {
-    homepage = "https://github.com/bos/filemanip";
-    description = "Expressive file and directory manipulation for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
deleted file mode 100644
index 1fa820a2c5a..00000000000
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Diff, filepath, HUnit, mtl, parsec, split, time
-, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "filestore";
-  version = "0.6.0.4";
-  sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12";
-  buildDepends = [ Diff filepath parsec split time utf8String xml ];
-  testDepends = [ Diff filepath HUnit mtl time ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Interface for versioning file stores";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
deleted file mode 100644
index 35c3302641d..00000000000
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio
-, systemFilepath, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "filesystem-conduit";
-  version = "1.0.0.2";
-  sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
-  buildDepends = [
-    conduit systemFileio systemFilepath text transformers
-  ];
-  testDepends = [
-    blazeBuilder conduit hspec QuickCheck text transformers
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Use system-filepath data types with conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix
deleted file mode 100644
index 3669d7e3649..00000000000
--- a/pkgs/development/libraries/haskell/final/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "final";
-  version = "0.1";
-  sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "http://github.com/errge/final";
-    description = "utility to add extra safety to monadic returns";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
deleted file mode 100644
index 321bb5cab8f..00000000000
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fingertree";
-  version = "0.1.0.0";
-  sha256 = "0c35sryzsijwavvw9x1pk5p99rhmp4g8pjh2ds419mlfgxc039ms";
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Generic finger-tree structure, with example instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fixed-vector/default.nix b/pkgs/development/libraries/haskell/fixed-vector/default.nix
deleted file mode 100644
index 81df126dd75..00000000000
--- a/pkgs/development/libraries/haskell/fixed-vector/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filemanip, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "fixed-vector";
-  version = "0.7.0.0";
-  sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf";
-  buildDepends = [ primitive ];
-  testDepends = [ doctest filemanip primitive ];
-  meta = {
-    description = "Generic vectors with statically known size";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fixed/default.nix b/pkgs/development/libraries/haskell/fixed/default.nix
deleted file mode 100644
index 5a1aef66051..00000000000
--- a/pkgs/development/libraries/haskell/fixed/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "fixed";
-  version = "0.2.1";
-  sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0";
-  meta = {
-    homepage = "http://github.com/ekmett/fixed";
-    description = "Signed 15.16 precision fixed point arithmetic";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
deleted file mode 100644
index 1a20983a5a5..00000000000
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, thExtras, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "flexible-defaults";
-  version = "0.0.1.1";
-  sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
-  buildDepends = [ thExtras transformers ];
-  meta = {
-    homepage = "https://github.com/mokus0/flexible-defaults";
-    description = "Generate default function implementations for complex type classes";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix
deleted file mode 100644
index 1fbdedf76be..00000000000
--- a/pkgs/development/libraries/haskell/fmlist/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "fmlist";
-  version = "0.8";
-  sha256 = "1knr9yh58fwjpkm37hvrqghlchf5qibwf9q52app6zh3ys999rrs";
-  meta = {
-    description = "FoldMap lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix
deleted file mode 100644
index 9a890587f84..00000000000
--- a/pkgs/development/libraries/haskell/focus/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "focus";
-  version = "0.1.3";
-  sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy";
-  meta = {
-    homepage = "https://github.com/nikita-volkov/focus";
-    description = "A general abstraction for manipulating elements of container data structures";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
deleted file mode 100644
index bd0cd070d11..00000000000
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive, text, transformers, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "foldl";
-  version = "1.0.7";
-  sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9";
-  buildDepends = [ primitive text transformers vector ];
-  meta = {
-    description = "Composable, streaming, and efficient left folds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix
deleted file mode 100644
index c274c774415..00000000000
--- a/pkgs/development/libraries/haskell/folds/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, deepseq, doctest, filepath, lens
-, mtl, pointed, profunctors, reflection, semigroupoids, semigroups
-, tagged, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "folds";
-  version = "0.6.2";
-  sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa";
-  buildDepends = [
-    comonad contravariant lens pointed profunctors reflection
-    semigroupoids tagged transformers vector
-  ];
-  testDepends = [ deepseq doctest filepath mtl semigroups ];
-  configureFlags = "-f-test-hlint";
-  enableSplitObjs = false;
-  meta = {
-    homepage = "http://github.com/ekmett/folds";
-    description = "Beautiful Folding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
deleted file mode 100644
index 91dfc9dca84..00000000000
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, lens, vectorSpace, vectorSpacePoints }:
-
-cabal.mkDerivation (self: {
-  pname = "force-layout";
-  version = "0.3.0.8";
-  sha256 = "00b831l94r3lx0b330ql3w551w0fwziayhsjydzbfqq335syaaxg";
-  buildDepends = [
-    dataDefaultClass lens vectorSpace vectorSpacePoints
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Simple force-directed layout";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/formatting/default.nix b/pkgs/development/libraries/haskell/formatting/default.nix
deleted file mode 100644
index 04fd9185081..00000000000
--- a/pkgs/development/libraries/haskell/formatting/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, scientific, text, textFormat, time }:
-
-cabal.mkDerivation (self: {
-  pname = "formatting";
-  version = "5.4";
-  sha256 = "017fm3pqr2nqpcqmpldr74cvb641hxvybhvnwv8a8vv4ry1vdrk9";
-  buildDepends = [ scientific text textFormat time ];
-  meta = {
-    description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix
deleted file mode 100644
index a7edf7817ba..00000000000
--- a/pkgs/development/libraries/haskell/free-game/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, boundingboxes, colors, controlBool, filepath, free
-, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
-, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
-, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "free-game";
-  version = "1.1.80";
-  sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava";
-  buildDepends = [
-    boundingboxes colors controlBool filepath free freetype2 GLFWB
-    hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
-    OpenGLRaw random reflection transformers vector void
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/fumieval/free-game";
-    description = "Create games for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
deleted file mode 100644
index 5837cc448c2..00000000000
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, comonad, distributive, mtl, preludeExtras
-, profunctors, semigroupoids, semigroups, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "free";
-  version = "4.10.0.1";
-  sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq";
-  buildDepends = [
-    bifunctors comonad distributive mtl preludeExtras profunctors
-    semigroupoids semigroups transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/free/";
-    description = "Monads for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix
deleted file mode 100644
index d5fdc8f926e..00000000000
--- a/pkgs/development/libraries/haskell/freetype2/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "freetype2";
-  version = "0.1.1";
-  sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Haskell binding for FreeType 2 library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
deleted file mode 100644
index 4db72b35234..00000000000
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
-, tastyHunit, temporaryRc, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fsnotify";
-  version = "0.1.0.3";
-  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
-  buildDepends = [
-    async hinotify systemFileio systemFilepath text time
-  ];
-  testDepends = [
-    async systemFileio systemFilepath tasty tastyHunit temporaryRc
-  ];
-  doCheck = false;
-  meta = {
-    description = "Cross platform library for file change notification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ftphs/default.nix b/pkgs/development/libraries/haskell/ftphs/default.nix
deleted file mode 100644
index ac96b094799..00000000000
--- a/pkgs/development/libraries/haskell/ftphs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hslogger, MissingH, mtl, network, parsec, regexCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "ftphs";
-  version = "1.0.9.1";
-  sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    hslogger MissingH mtl network parsec regexCompat
-  ];
-  meta = {
-    homepage = "http://software.complete.org/ftphs";
-    description = "FTP Client and Server Library";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
deleted file mode 100644
index 16f41718d0b..00000000000
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "funcmp";
-  version = "1.7";
-  sha256 = "1rna7x7lw36fv5pyq0zn4b472mh11r0bszzji13wm3byhhmzs04k";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://savannah.nongnu.org/projects/funcmp/";
-    description = "Functional MetaPost";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/functor-infix/default.nix b/pkgs/development/libraries/haskell/functor-infix/default.nix
deleted file mode 100644
index d3e6322a7cb..00000000000
--- a/pkgs/development/libraries/haskell/functor-infix/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "functor-infix";
-  version = "0.0.1";
-  sha256 = "1f8m4nxlr2il9j0ilgw91fhp6mmz5xqlhylavncqwvbcq82362dc";
-  meta = {
-    homepage = "https://github.com/fmap/functor-infix";
-    description = "Compositions of functors";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix
deleted file mode 100644
index 171a501667f..00000000000
--- a/pkgs/development/libraries/haskell/fuzzcheck/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl
-, QuickCheck, random, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "fuzzcheck";
-  version = "0.1.1";
-  sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
-  buildDepends = [
-    liftedBase monadControl QuickCheck random transformers
-  ];
-  testDepends = [ hspec hspecExpectations HUnit QuickCheck ];
-  meta = {
-    homepage = "https://github.com/fpco/fuzzcheck";
-    description = "A simple checker for stress testing monadic code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
deleted file mode 100644
index 2f55936fadf..00000000000
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, continuedFractions, converge, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "gamma";
-  version = "0.9.0.2";
-  sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
-  buildDepends = [ continuedFractions converge vector ];
-  meta = {
-    homepage = "https://github.com/mokus0/gamma";
-    description = "Gamma function and related functions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
deleted file mode 100644
index f2a534f47c8..00000000000
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "gd";
-  version = "3000.7.3";
-  sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
-  extraLibraries = [
-    expat fontconfig freetype gd libjpeg libpng zlib
-  ];
-  meta = {
-    description = "A Haskell binding to a subset of the GD graphics library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
deleted file mode 100644
index 616b5eb337d..00000000000
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "gdiff";
-  version = "1.1";
-  sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
-  meta = {
-    homepage = "https://github.com/eelco/gdiff";
-    description = "Generic diff and patch";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
deleted file mode 100644
index fc3e6c32c72..00000000000
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "generic-aeson";
-  version = "0.2.0.2";
-  sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh";
-  buildDepends = [
-    aeson attoparsec genericDeriving mtl tagged text
-    unorderedContainers vector
-  ];
-  meta = {
-    description = "Derivation of Aeson instances using GHC generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
deleted file mode 100644
index 06c54391130..00000000000
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "generic-deriving";
-  version = "1.7.0";
-  sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6";
-  meta = {
-    description = "Generic programming library for generalised deriving";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix
deleted file mode 100644
index d7724a7b1ba..00000000000
--- a/pkgs/development/libraries/haskell/generics-sop/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "generics-sop";
-  version = "0.1.0.4";
-  sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j";
-  buildDepends = [ tagged ];
-  meta = {
-    description = "Generic Programming using True Sums of Products";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [
-      aycanirican ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
deleted file mode 100644
index 87e1296330a..00000000000
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "geniplate";
-  version = "0.6.0.5";
-  sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Use Template Haskell to generate Uniplate-like functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
deleted file mode 100644
index ee92a45e87b..00000000000
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colorizeHaskell, filepath, pcreLight }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-core";
-  version = "0.5.6";
-  sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ colorizeHaskell filepath pcreLight ];
-  meta = {
-    homepage = "https://github.com/shachaf/ghc-core";
-    description = "Display GHC's core and assembly output in a pager";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
deleted file mode 100644
index 580a21bd8c6..00000000000
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-events";
-  version = "0.4.3.0";
-  sha256 = "128p651hp8v1i0iaccmfh3ap6lajcrzdihjb853s71pgnpal6izr";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary mtl ];
-  testDepends = [ binary mtl ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Library and tool for parsing .eventlog files from GHC";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
deleted file mode 100644
index a7032f5a250..00000000000
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-heap-view";
-  version = "0.5.3";
-  sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0";
-  buildDepends = [ binary transformers ];
-  testDepends = [ deepseq ];
-  postInstall = ''
-    ensureDir "$out/share/ghci"
-    ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-  '';
-  meta = {
-    description = "Extract the heap representation of Haskell values and thunks";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
deleted file mode 100644
index a2adaa2403d..00000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc
-, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts
-, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal
-, mtl, split, syb, temporary, text, time, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mod";
-  version = "5.2.1.2";
-  sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async Cabal convertible dataDefault deepseq djinnGhc filepath
-    ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl
-    monadJournal mtl split syb temporary text time transformers
-    transformersBase
-  ];
-  testDepends = [
-    Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
-    ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
-    monadJournal mtl split syb temporary text time transformers
-    transformersBase
-  ];
-  buildTools = [ emacs makeWrapper ];
-  doCheck = false;
-  configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    ensureDir "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-    wrapProgram $out/bin/ghc-mod --add-flags \
-      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
-    wrapProgram $out/bin/ghc-modi --add-flags \
-      "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
-  '';
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [
-      andres bluescreen303 ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
deleted file mode 100644
index 9ba3362000a..00000000000
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, extensibleExceptions, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mtl";
-  version = "1.2.1.0";
-  sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
-  buildDepends = [ exceptions extensibleExceptions mtl ];
-  meta = {
-    homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
-    description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
deleted file mode 100644
index 1cbfe4a19f3..00000000000
--- a/pkgs/development/libraries/haskell/ghc-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-parser";
-  version = "0.1.3.0";
-  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
-  buildTools = [ cpphs happy ];
-  patchPhase = ''
-    substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
-  '';
-  meta = {
-    homepage = "https://github.com/gibiansky/IHaskell";
-    description = "Haskell source parser from GHC";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
deleted file mode 100644
index 0a2b7dc18f3..00000000000
--- a/pkgs/development/libraries/haskell/ghc-paths/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-paths";
-  version = "0.1.0.9";
-  sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-  patches = [ ./ghc-paths-nix.patch ];
-  meta = {
-    description = "Knowledge of GHC's installation directories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch
deleted file mode 100644
index b3c75a26a03..00000000000
--- a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur ghc-paths-0.1.0.9/GHC/Paths.hs ghc-paths-0.1.0.9-new/GHC/Paths.hs
---- ghc-paths-0.1.0.9/GHC/Paths.hs	2012-12-16 13:53:45.720148396 +0100
-+++ ghc-paths-0.1.0.9-new/GHC/Paths.hs	2012-12-16 17:22:12.765576568 +0100
-@@ -1,13 +1,35 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- 
- module GHC.Paths (
-         ghc, ghc_pkg, libdir, docdir
-   ) where
- 
-+import Control.Exception as E
-+import Data.Maybe
-+import System.Environment
-+import System.IO.Unsafe
-+
-+-- Yes, there's lookupEnv now, but we want to be compatible
-+-- with older GHCs.
-+checkEnv :: String -> IO (Maybe String)
-+checkEnv var = E.catch (fmap Just (getEnv var))
-+                       (\ (e :: IOException) -> return Nothing)
-+
-+nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath
-+nixLibdir = unsafePerformIO (checkEnv "NIX_GHC_LIBDIR")
-+nixDocdir = unsafePerformIO (checkEnv "NIX_GHC_DOCDIR")
-+nixGhc    = unsafePerformIO (checkEnv "NIX_GHC")
-+nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCPKG")
-+{-# NOINLINE nixLibdir #-}
-+{-# NOINLINE nixDocdir #-}
-+{-# NOINLINE nixGhc    #-}
-+{-# NOINLINE nixGhcPkg #-}
-+
- libdir, docdir, ghc, ghc_pkg :: FilePath
- 
--libdir  = GHC_PATHS_LIBDIR
--docdir  = GHC_PATHS_DOCDIR
-+libdir  = fromMaybe GHC_PATHS_LIBDIR  nixLibdir
-+docdir  = fromMaybe GHC_PATHS_DOCDIR  nixDocdir
- 
--ghc     = GHC_PATHS_GHC
--ghc_pkg = GHC_PATHS_GHC_PKG
-+ghc     = fromMaybe GHC_PATHS_GHC     nixGhc
-+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
deleted file mode 100644
index 0c7d5c82f11..00000000000
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-syb-utils";
-  version = "0.2.2";
-  sha256 = "03r4x3a4hjivxladlw23jk8s2pgfh85lqf196ks1ngyg6ih1g6lk";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://github.com/nominolo/ghc-syb";
-    description = "Scrap Your Boilerplate utilities for the GHC API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
deleted file mode 100644
index 58caf7f3e29..00000000000
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-syb";
-  version = "0.2.0.0";
-  sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67";
-  meta = {
-    homepage = "http://github.com/nominolo/ghc-syb";
-    description = "Data and Typeable instances for the GHC API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
deleted file mode 100644
index 5a1da0848b2..00000000000
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl
-, svgcairo, text, transformers, xdot
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-vis";
-  version = "0.7.2.7";
-  sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
-  buildDepends = [
-    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
-    transformers xdot
-  ];
-  postInstall = ''
-    ensureDir "$out/share/ghci"
-    ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-  '';
-  meta = {
-    homepage = "http://felsin9.de/nnis/ghc-vis";
-    description = "Live visualization of data structures in GHCi";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
deleted file mode 100644
index 06473e161fb..00000000000
--- a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ghcjs-codemirror";
-  version = "0.0.0.1";
-  sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
-  meta = {
-    homepage = "https://github.com/ghcjs/CodeMirror";
-    description = "Installs CodeMirror JavaScript files";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghcjs-prim/default.nix b/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
deleted file mode 100644
index 04d73661e60..00000000000
--- a/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ cabal, primitive, fetchgit }:
-
-cabal.mkDerivation (self: {
-  pname = "ghcjs-prim";
-  version = "0.1.0.0";
-  src = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-prim.git;
-    rev = "8e003e1a1df10233bc3f03d7bbd7d37de13d2a84";
-    sha256 = "11k2r87s58wmpxykn61lihn4vm3x67cm1dygvdl26papifinj6pz";
-  };
-  buildDepends = [ primitive ];
-})
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
deleted file mode 100644
index c98f772f87a..00000000000
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk2hsBuildtools, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "gio";
-  version = "0.13.0.3";
-  sha256 = "15025jj6i1gpvjs46545vzmvs6ka41x15lrllqr9hd0qsyhibsf5";
-  buildDepends = [ glib mtl ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ glib ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GIO";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/git-date/default.nix b/pkgs/development/libraries/haskell/git-date/default.nix
deleted file mode 100644
index 1ee0095cd17..00000000000
--- a/pkgs/development/libraries/haskell/git-date/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "git-date";
-  version = "0.2.1";
-  sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l";
-  buildDepends = [ time utf8String ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 time utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/singpolyma/git-date-haskell";
-    description = "Bindings to the date parsing from Git";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
deleted file mode 100644
index 3e2b84a93db..00000000000
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, byteable
-, caseInsensitive, conduit, cryptohash, dataDefault, failure
-, hashable, HTTP, httpConduit, httpTypes, network, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "github";
-  version = "0.13.1";
-  sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l";
-  buildDepends = [
-    aeson attoparsec base16Bytestring byteable caseInsensitive conduit
-    cryptohash dataDefault failure hashable HTTP httpConduit httpTypes
-    network text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/github";
-    description = "Access to the Github API, v3";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
deleted file mode 100644
index d256c2f014f..00000000000
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed
-, filepath, filestore, ghcPaths, happstackServer, highlightingKate
-, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls
-, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes
-, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
-, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitit";
-  version = "0.10.6.1";
-  sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore
-    ghcPaths happstackServer highlightingKate hoauth2 hslogger
-    HStringTemplate HTTP httpClientTls httpConduit json mtl network
-    networkUri pandoc pandocTypes parsec random recaptcha safe SHA
-    split syb tagsoup text time uri url utf8String uuid xhtml xml
-    xssSanitize zlib
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gitit.net";
-    description = "Wiki using happstack, git or darcs, and pandoc";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
deleted file mode 100644
index bb7206803eb..00000000000
--- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitCombinators, exceptions, fastLogger
-, filepath, gitlib, gitlibTest, hlibgit2, hspec, hspecExpectations
-, HUnit, liftedAsync, liftedBase, missingForeign, mmorph
-, monadControl, monadLogger, monadLoops, mtl, resourcet, stm
-, stmConduit, tagged, text, textIcu, time, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib-libgit2";
-  version = "3.1.0.1";
-  sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs";
-  buildDepends = [
-    conduit conduitCombinators exceptions fastLogger filepath gitlib
-    hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl
-    monadLogger monadLoops mtl resourcet stm stmConduit tagged text
-    textIcu time transformers transformersBase
-  ];
-  testDepends = [
-    exceptions gitlib gitlibTest hspec hspecExpectations HUnit
-    monadLogger transformers
-  ];
-  meta = {
-    description = "Libgit2 backend for gitlib";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix
deleted file mode 100644
index 130a0efdcd1..00000000000
--- a/pkgs/development/libraries/haskell/gitlib-test/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitCombinators, exceptions, gitlib, hspec
-, hspecExpectations, HUnit, monadControl, tagged, text, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib-test";
-  version = "3.1.0.1";
-  sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3";
-  buildDepends = [
-    conduit conduitCombinators exceptions gitlib hspec
-    hspecExpectations HUnit monadControl tagged text time transformers
-  ];
-  meta = {
-    description = "Test library for confirming gitlib backend compliance";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gitlib/default.nix b/pkgs/development/libraries/haskell/gitlib/default.nix
deleted file mode 100644
index cfa9dd2b8e3..00000000000
--- a/pkgs/development/libraries/haskell/gitlib/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, conduit, conduitCombinators, exceptions
-, filepath, hashable, liftedAsync, liftedBase, monadControl
-, monadLogger, mtl, resourcet, semigroups, systemFilepath, tagged
-, text, time, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gitlib";
-  version = "3.1.0";
-  sha256 = "0zyym7m8bdhc4wi2jrhcmipmlq106qkd61c4y9iisgk73v2pg9f4";
-  buildDepends = [
-    base16Bytestring conduit conduitCombinators exceptions filepath
-    hashable liftedAsync liftedBase monadControl monadLogger mtl
-    resourcet semigroups systemFilepath tagged text time transformers
-    unorderedContainers
-  ];
-  meta = {
-    description = "API library for working with Git repositories";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gl/default.nix b/pkgs/development/libraries/haskell/gl/default.nix
deleted file mode 100644
index 05c7a68d0c3..00000000000
--- a/pkgs/development/libraries/haskell/gl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, fixed, half, hxt, mesa, split, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gl";
-  version = "0.6.1";
-  sha256 = "0wqsbwnp69g6vz5irf65zv1nx4vnlwcm771jxzk70r2wzi2vsg3y";
-  buildDepends = [ filepath fixed half hxt split transformers ];
-  extraLibraries = [ mesa ];
-  noHaddock = true;
-  meta = {
-    description = "Complete OpenGL raw bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
deleted file mode 100644
index 27af64b973d..00000000000
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade
-, pkgconfig
-}:
-
-cabal.mkDerivation (self: {
-  pname = "glade";
-  version = "0.12.5.0";
-  sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
-  buildDepends = [ glib gtk ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ gtkC libglade ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the glade library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
deleted file mode 100644
index 872364fe985..00000000000
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "glib";
-  version = "0.13.0.6";
-  sha256 = "1hn3l0vrz76gmk7bjhs4nw68izf29k0pxm92l0zih7wq5ny4lhrv";
-  buildDepends = [ text utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GLIB library for Gtk2Hs";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
deleted file mode 100644
index 172d5f31526..00000000000
--- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, gloss }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-accelerate";
-  version = "1.8.15.0";
-  sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0";
-  buildDepends = [ accelerate accelerateCuda gloss ];
-  meta = {
-    description = "Extras to interface Gloss and Accelerate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix
deleted file mode 100644
index 58adb03fc78..00000000000
--- a/pkgs/development/libraries/haskell/gloss-banana/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gloss, reactiveBanana }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-banana";
-  version = "0.1.0.4";
-  sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
-  buildDepends = [ gloss reactiveBanana ];
-  meta = {
-    homepage = "https://github.com/Twey/gloss-banana";
-    description = "An Interface for gloss in terms of a reactive-banana Behavior";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ twey ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
deleted file mode 100644
index 1a21c2632ee..00000000000
--- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, accelerate, accelerateCuda, gloss, glossAccelerate }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-raster-accelerate";
-  version = "1.8.15.0";
-  sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10";
-  buildDepends = [ accelerate accelerateCuda gloss glossAccelerate ];
-  meta = {
-    description = "Parallel rendering of raster images using Accelerate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix
deleted file mode 100644
index 16316b16590..00000000000
--- a/pkgs/development/libraries/haskell/gloss-raster/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gloss, glossRendering, llvm, repa }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-raster";
-  version = "1.9.2.1";
-  sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw";
-  buildDepends = [ gloss glossRendering repa ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://gloss.ouroborus.net";
-    description = "Parallel rendering of raster images";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix
deleted file mode 100644
index 190993e44fc..00000000000
--- a/pkgs/development/libraries/haskell/gloss-rendering/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bmp, GLUT, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss-rendering";
-  version = "1.9.2.1";
-  sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k";
-  buildDepends = [ bmp GLUT OpenGL ];
-  meta = {
-    description = "Gloss picture data types and rendering functions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
deleted file mode 100644
index da6eb98776f..00000000000
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bmp, glossRendering, GLUT, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "gloss";
-  version = "1.9.2.1";
-  sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
-  buildDepends = [ bmp glossRendering GLUT OpenGL ];
-  meta = {
-    homepage = "http://gloss.ouroborus.net";
-    description = "Painless 2D vector graphics, animations and simulations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix
deleted file mode 100644
index 50289f33408..00000000000
--- a/pkgs/development/libraries/haskell/glpk-hs/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, glpk, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "glpk-hs";
-  version = "0.3.4";
-  sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm";
-  buildDepends = [ deepseq mtl ];
-  extraLibraries = [ glpk ];
-  meta = {
-    description = "Comprehensive GLPK linear programming bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
deleted file mode 100644
index 8bedf0d4186..00000000000
--- a/pkgs/development/libraries/haskell/gnuidn/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, libidn, text }:
-
-cabal.mkDerivation (self: {
-  pname = "gnuidn";
-  version = "0.2.1";
-  sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
-  buildDepends = [ text ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ libidn ];
-  pkgconfigDepends = [ libidn ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gnuidn/";
-    description = "Bindings for GNU IDN";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix
deleted file mode 100644
index dc152661049..00000000000
--- a/pkgs/development/libraries/haskell/gnuplot/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath
-, temporary, time, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gnuplot";
-  version = "0.5.2.2";
-  sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataAccessor dataAccessorTransformers deepseq filepath temporary
-    time transformers utilityHt
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
-    description = "2D and 3D plots using gnuplot";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
deleted file mode 100644
index 5d8ee9b61df..00000000000
--- a/pkgs/development/libraries/haskell/gnutls/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gnutls, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gnutls";
-  version = "0.1.5";
-  sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp";
-  buildDepends = [ monadsTf transformers ];
-  extraLibraries = [ gnutls ];
-  pkgconfigDepends = [ gnutls ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gnutls/";
-    description = "Bindings for GNU libgnutls";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
deleted file mode 100644
index f38bc24d246..00000000000
--- a/pkgs/development/libraries/haskell/graph-wrapper/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "graph-wrapper";
-  version = "0.2.4.3";
-  sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
-  meta = {
-    homepage = "http://www.github.com/batterseapower/graph-wrapper";
-    description = "A wrapper around the standard Data.Graph with a less awkward interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graphscc/default.nix b/pkgs/development/libraries/haskell/graphscc/default.nix
deleted file mode 100644
index 2124bd0b254..00000000000
--- a/pkgs/development/libraries/haskell/graphscc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "GraphSCC";
-  version = "1.0.4";
-  sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
-  meta = {
-    description = "Tarjan's algorithm for computing the strongly connected components of a graph";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
deleted file mode 100644
index c50e0403bd6..00000000000
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck
-, systemGraphviz, temporary, text, transformers, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "graphviz";
-  version = "2999.17.0.1";
-  sha256 = "0s6l1mlqvllrlx7vc06lgcs68ajhfk98awm63ab1dkqmcnj23ixv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    colour dlist fgl filepath polyparse temporary text transformers
-    wlPprintText
-  ];
-  testDepends = [ fgl filepath QuickCheck systemGraphviz text ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/graphviz/";
-    description = "Bindings to Graphviz for graph visualisation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/greencard/default.nix b/pkgs/development/libraries/haskell/greencard/default.nix
deleted file mode 100644
index 530c3be1505..00000000000
--- a/pkgs/development/libraries/haskell/greencard/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "greencard";
-  version = "3.0.4.2";
-  sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/sof/greencard";
-    description = "GreenCard, a foreign function pre-processor for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/grid/default.nix b/pkgs/development/libraries/haskell/grid/default.nix
deleted file mode 100644
index 8826d3ca2b5..00000000000
--- a/pkgs/development/libraries/haskell/grid/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "grid";
-  version = "7.6.7";
-  sha256 = "1sdm47y9hbqn40bfi4fssnbrhksca7gdkgpqvz1gd2lqs729i1nf";
-  buildDepends = [ cereal ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/mhwombat/grid";
-    description = "Tools for working with regular grids (graphs, lattices)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groom/default.nix b/pkgs/development/libraries/haskell/groom/default.nix
deleted file mode 100644
index 41853b763f4..00000000000
--- a/pkgs/development/libraries/haskell/groom/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts }:
-
-cabal.mkDerivation (self: {
-  pname = "groom";
-  version = "0.1.2";
-  sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
-  buildDepends = [ haskellSrcExts ];
-  meta = {
-    description = "Pretty printing for well-behaved Show instances";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
deleted file mode 100644
index 1f0c73c00db..00000000000
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "groupoids";
-  version = "4.0";
-  sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
-  buildDepends = [ semigroupoids ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/ekmett/groupoids/";
-    description = "This package has been absorbed into semigroupoids 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix
deleted file mode 100644
index 4f9fb3f67ae..00000000000
--- a/pkgs/development/libraries/haskell/groups/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "groups";
-  version = "0.4.0.0";
-  sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k";
-  meta = {
-    description = "Haskell 98 groups";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix
deleted file mode 100644
index da0ab99d976..00000000000
--- a/pkgs/development/libraries/haskell/gsasl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsasl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "gsasl";
-  version = "0.3.5";
-  sha256 = "1797rs6syrgs82akbj7nkmj0nni4w83fhwrl1zy2l3jqkcacvbm3";
-  buildDepends = [ transformers ];
-  pkgconfigDepends = [ gsasl ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-gsasl/";
-    description = "Bindings for GNU libgsasl";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
deleted file mode 100644
index 53613255c32..00000000000
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, x11 }:
-
-cabal.mkDerivation (self: {
-  pname = "gtk-traymanager";
-  version = "0.1.5";
-  sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
-  buildDepends = [ glib gtk ];
-  pkgconfigDepends = [ gtk x11 ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/travitch/gtk-traymanager";
-    description = "A wrapper around the eggtraymanager library for Linux system trays";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
deleted file mode 100644
index effbd57f799..00000000000
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
-, pkgconfig, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtk";
-  version = "0.13.3";
-  sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7";
-  buildDepends = [ cairo gio glib mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib gtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Gtk+ graphical user interface library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
deleted file mode 100644
index 9fabf287166..00000000000
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, filepath, happy, hashtables, random }:
-
-cabal.mkDerivation (self: {
-  pname = "gtk2hs-buildtools";
-  version = "0.13.0.3";
-  sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath hashtables random ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix
deleted file mode 100644
index d39adf4e5e4..00000000000
--- a/pkgs/development/libraries/haskell/gtk3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gio, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtk3";
-  version = "0.13.3";
-  sha256 = "0246d4dxgmfvq7g8avswjry2rh5lfj1kzcf0vqwchgvlvcfhgzlh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cairo gio glib mtl pango text time transformers ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ glib gtk3 ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Gtk+ graphical user interface library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix
deleted file mode 100644
index 481e2ade84a..00000000000
--- a/pkgs/development/libraries/haskell/gtkglext/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango
-, pangox_compat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtkglext";
-  version = "0.12.5.0";
-  sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-  buildDepends = [ glib gtk pango ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ gtkglext pangox_compat ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GTK+ OpenGL Extension";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
deleted file mode 100644
index d3f0f3136f8..00000000000
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
-, pkgconfig, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtksourceview2";
-  version = "0.13.1.1";
-  sha256 = "09439drmwfy5bqni1clcn0nng30irn9x43fjak9jljggg1yij9xw";
-  buildDepends = [ glib gtk mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ gtksourceview ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GtkSourceView library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
deleted file mode 100644
index 5cbad954c31..00000000000
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, networkUri
-, random, regexCompat, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hS3";
-  version = "0.5.9";
-  sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Crypto dataenc HTTP hxt MissingH network networkUri random
-    regexCompat utf8String
-  ];
-  meta = {
-    homepage = "http://gregheartsfield.com/hS3/";
-    description = "Interface to Amazon's Simple Storage Service (S3)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
deleted file mode 100644
index e4243def8b4..00000000000
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, tar, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "hackage-db";
-  version = "1.11";
-  sha256 = "14jjy3i5pjdcw2cx3n5ipg72zahvy9vh87vlcgnz44slw8av6dcq";
-  buildDepends = [ Cabal filepath tar utf8String ];
-  meta = {
-    homepage = "http://github.com/peti/hackage-db";
-    description = "access Hackage's package database via Data.Map";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix
deleted file mode 100644
index d2dc35b1ffd..00000000000
--- a/pkgs/development/libraries/haskell/haddock-api/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, filepath, ghcPaths, haddockLibrary, xhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haddock-api";
-  version = "2.15.0.1";
-  sha256 = "1s25wykd5ka9chi67s07zy1jyd4pxs72d6lcpj7551izcs2l86sm";
-  buildDepends = [
-    Cabal deepseq filepath ghcPaths haddockLibrary xhtml
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haddock/";
-    description = "A documentation-generation tool for Haskell libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix
deleted file mode 100644
index a7041b3ba28..00000000000
--- a/pkgs/development/libraries/haskell/haddock-library/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, deepseq, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "haddock-library";
-  version = "1.1.1";
-  sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m";
-  buildDepends = [ deepseq ];
-  testDepends = [ baseCompat deepseq hspec QuickCheck ];
-  meta = {
-    homepage = "http://www.haskell.org/haddock/";
-    description = "Library exposing some functionality of Haddock";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
deleted file mode 100644
index 7eeacd238ba..00000000000
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash
-, dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes
-, HUnit, lrucache, mtl, network, networkUri, pandoc, pandocCiteproc
-, parsec, QuickCheck, random, regexBase, regexTdfa, snapCore
-, snapServer, systemFilepath, tagsoup, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, utillinux
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hakyll";
-  version = "4.6.1.1";
-  sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
-    filepath fsnotify httpConduit httpTypes lrucache mtl network
-    networkUri pandoc pandocCiteproc parsec random regexBase regexTdfa
-    snapCore snapServer systemFilepath tagsoup text time
-  ];
-  testDepends = [
-    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
-    filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
-    networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase
-    regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jaspervdj.be/hakyll";
-    description = "A static website compiler library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/half/default.nix b/pkgs/development/libraries/haskell/half/default.nix
deleted file mode 100644
index e113f6730d9..00000000000
--- a/pkgs/development/libraries/haskell/half/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "half";
-  version = "0.2.0.1";
-  sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
-  meta = {
-    homepage = "http://github.com/ekmett/half";
-    description = "Half-precision floating-point";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
deleted file mode 100644
index c897eb036bd..00000000000
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "hamlet";
-  version = "1.2.0";
-  sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Haml-like template files that are compile-time checked (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix
deleted file mode 100644
index b96c68297cb..00000000000
--- a/pkgs/development/libraries/haskell/handa-gdata/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs
-, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json
-, network, pureMD5, random, regexPosix, resourcet, split, time
-, unixCompat, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "handa-gdata";
-  version = "0.7.0.1";
-  sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring binary caseInsensitive cmdargs dataDefault
-    filepath GenericPretty HTTP httpConduit json network pureMD5 random
-    regexPosix resourcet split time unixCompat utf8String xml
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://code.google.com/p/hgdata";
-    description = "Library and command-line utility for accessing Google services and APIs";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
deleted file mode 100644
index e16092fe523..00000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cgi, fastcgi, happstackServer, mtl, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-fastcgi";
-  version = "0.1.5";
-  sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
-  buildDepends = [ cgi fastcgi happstackServer mtl utf8String ];
-  meta = {
-    description = "Happstack extension for use with FastCGI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
deleted file mode 100644
index 3567b418ba3..00000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, shakespeare, text }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-hamlet";
-  version = "7.0.4";
-  sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
-  buildDepends = [ happstackServer shakespeare text ];
-  meta = {
-    homepage = "http://www.happstack.com/";
-    description = "Support for Hamlet HTML templates in Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
deleted file mode 100644
index d0d4de909ef..00000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-lite";
-  version = "7.3.6";
-  sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
-  buildDepends = [ happstackServer mtl text ];
-  meta = {
-    homepage = "http://www.happstack.com/";
-    description = "Happstack minus the useless stuff";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
deleted file mode 100644
index 15a1e90414e..00000000000
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
-, filepath, hslogger, html, HUnit, monadControl, mtl, network
-, networkUri, parsec, sendfile, syb, systemFilepath, text, threads
-, time, timeCompat, transformers, transformersBase, utf8String
-, xhtml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "happstack-server";
-  version = "7.4.0";
-  sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
-  buildDepends = [
-    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
-    html monadControl mtl network networkUri parsec sendfile syb
-    systemFilepath text threads time timeCompat transformers
-    transformersBase utf8String xhtml zlib
-  ];
-  testDepends = [ HUnit parsec zlib ];
-  meta = {
-    homepage = "http://happstack.com";
-    description = "Web related tools and services";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashable-extras/default.nix b/pkgs/development/libraries/haskell/hashable-extras/default.nix
deleted file mode 100644
index 70868a2e83a..00000000000
--- a/pkgs/development/libraries/haskell/hashable-extras/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, filepath, genericDeriving, hashable
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashable-extras";
-  version = "0.2.0.1";
-  sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s";
-  buildDepends = [
-    bifunctors genericDeriving hashable transformers
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/analytics/hashable-extras/";
-    description = "Higher-rank Hashable";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix
deleted file mode 100644
index ba2690e6ce8..00000000000
--- a/pkgs/development/libraries/haskell/hashable/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashable";
-  version = "1.2.3.0";
-  sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi";
-  buildDepends = [ text ];
-  testDepends = [
-    HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/tibbe/hashable";
-    description = "A class for types that can be converted to a hash value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
deleted file mode 100644
index b7e6af904fe..00000000000
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataenc, extensibleExceptions, filepath, mmap, mtl
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashed-storage";
-  version = "0.5.11";
-  sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataenc extensibleExceptions filepath mmap mtl zlib
-  ];
-  doCheck = false;
-  meta = {
-    description = "Hashed file storage support code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
deleted file mode 100644
index ddccebeb48d..00000000000
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchgit, hashable, primitive, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hashtables";
-  version = "1.2.0.1";
-  src = fetchgit {
-    url = "git://github.com/gregorycollins/hashtables.git";
-    sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129";
-    rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0";
-  };
-  buildDepends = [ hashable primitive vector ];
-  meta = {
-    homepage = "http://github.com/gregorycollins/hashtables";
-    description = "Mutable hash tables in the ST monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hask/default.nix b/pkgs/development/libraries/haskell/hask/default.nix
deleted file mode 100644
index 3162a4fb7e4..00000000000
--- a/pkgs/development/libraries/haskell/hask/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, reflection, tagged, transformers, void }:
-
-cabal.mkDerivation (self: {
-  pname = "hask";
-  version = "0";
-  sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
-  buildDepends = [ constraints reflection tagged transformers void ];
-  meta = {
-    homepage = "http://github.com/ekmett/hask";
-    description = "Categories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
deleted file mode 100644
index 1b1519c4326..00000000000
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskeline, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "haskeline-class";
-  version = "0.6.2";
-  sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
-  buildDepends = [ haskeline mtl ];
-  meta = {
-    homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
-    description = "Class interface for working with Haskeline";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
deleted file mode 100644
index f8f4d5ed998..00000000000
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, terminfo, transformers, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "haskeline";
-  version = "0.7.1.3";
-  sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi";
-  buildDepends = [ filepath terminfo transformers utf8String ];
-  configureFlags = "-fterminfo";
-  jailbreak = true;
-  meta = {
-    homepage = "http://trac.haskell.org/haskeline";
-    description = "A command-line interface for user input, written in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix
deleted file mode 100644
index 7ca03476110..00000000000
--- a/pkgs/development/libraries/haskell/haskell-generate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, haskellSrcExts, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-generate";
-  version = "0.2.2";
-  sha256 = "1wdfs28p195szg6jxq0qbyj4jdbqnsp9frgjnp25mzf14y9i1yid";
-  buildDepends = [ haskellSrcExts transformers ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/bennofs/haskell-generate/";
-    description = "haskell-generate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
deleted file mode 100644
index 2e81d757095..00000000000
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-lexer";
-  version = "1.0";
-  sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86";
-  meta = {
-    description = "A fully compliant Haskell 98 lexer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
deleted file mode 100644
index b7d9bf99148..00000000000
--- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, cereal, extensibleExceptions, mpi }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-mpi";
-  version = "1.2.1";
-  sha256 = "1d3xlwz3sx1m7iyf67cfr1vsp3w4iz9mmqvmvdiblj4569hxblr5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cereal extensibleExceptions ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ mpi ];
-  meta = {
-    homepage = "http://github.com/bjpop/haskell-mpi";
-    description = "Distributed parallel programming in Haskell using MPI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
deleted file mode 100644
index 5185c1037a8..00000000000
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, Cabal, dataLensLight, filemanip, filepath
-, haskellPackages, haskellSrcExts, hseCpp, mtl, prettyShow, tagged
-, tasty, tastyGolden, transformers, traverseWithClass, typeEq
-, uniplate, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-names";
-  version = "0.5.0";
-  sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr";
-  buildDepends = [
-    aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts
-    hseCpp mtl tagged transformers traverseWithClass typeEq uniplate
-  ];
-  testDepends = [
-    aeson Cabal filemanip filepath haskellPackages haskellSrcExts
-    hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass
-    uniplate utf8String
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://documentup.com/haskell-suite/haskell-names";
-    description = "Name resolution library for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix
deleted file mode 100644
index a23c6691a66..00000000000
--- a/pkgs/development/libraries/haskell/haskell-packages/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, Cabal, deepseq, filepath, haskellSrcExts, hseCpp
-, mtl, optparseApplicative, tagged, transformers
-, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-packages";
-  version = "0.2.4.3";
-  sha256 = "0s1z5zzl53nmjnrlf1czri634h8fksbgkqvvz8hpwa60wsaf4dxn";
-  buildDepends = [
-    aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl
-    optparseApplicative tagged transformers transformersCompat
-  ];
-  meta = {
-    homepage = "http://documentup.com/haskell-suite/haskell-packages";
-    description = "Haskell suite library for package management and integration with Cabal";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
deleted file mode 100644
index 93e07dede85..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filemanip, filepath, happy, mtl, smallcheck, syb
-, tasty, tastyGolden, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.15.0.1";
-  sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
-  buildDepends = [ cpphs ];
-  testDepends = [
-    filemanip filepath mtl smallcheck syb tasty tastyGolden
-    tastySmallcheck
-  ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "https://github.com/haskell-suite/haskell-src-exts";
-    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
deleted file mode 100644
index d837c2f689b..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, filepath, happy, mtl, smallcheck, syb, tasty
-, tastyGolden, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.16.0.1";
-  sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
-  buildDepends = [ cpphs ];
-  testDepends = [
-    filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck
-  ];
-  buildTools = [ happy ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell-suite/haskell-src-exts";
-    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
deleted file mode 100644
index e43c0430be7..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, syb, thOrphans, uniplate }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-meta";
-  version = "0.6.0.8";
-  sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk";
-  buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
-  jailbreak = true;
-  meta = {
-    description = "Parse source to template-haskell abstract syntax";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
deleted file mode 100644
index 428715ac07b..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src";
-  version = "1.0.1.6";
-  sha256 = "1vscvbsly7k0zqb7fi6bm38dfacyl8qgmv0h25fqkn95c0v5dif7";
-  buildDepends = [ syb ];
-  buildTools = [ happy ];
-  meta = {
-    description = "Support for manipulating Haskell source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
deleted file mode 100644
index d732a465580..00000000000
--- a/pkgs/development/libraries/haskell/haskelldb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "haskelldb";
-  version = "2.2.4";
-  sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
-  buildDepends = [ mtl time ];
-  meta = {
-    homepage = "https://github.com/m4dc4p/haskelldb";
-    description = "A library of combinators for generating and executing SQL statements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix
deleted file mode 100644
index c659d3966f0..00000000000
--- a/pkgs/development/libraries/haskell/haskintex/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, haskellSrcExts, HaTeX, hint, parsec
-, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskintex";
-  version = "0.5.0.2";
-  sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary filepath haskellSrcExts HaTeX hint parsec text transformers
-  ];
-  meta = {
-    homepage = "http://daniel-diaz.github.io/projects/haskintex";
-    description = "Haskell Evaluation inside of LaTeX code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix
deleted file mode 100644
index 7d13d6e797b..00000000000
--- a/pkgs/development/libraries/haskell/haskoin/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, binary, byteable, cryptohash, deepseq
-, either, HUnit, jsonRpc, mtl, pbkdf, QuickCheck, split
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskoin";
-  version = "0.1.0.2";
-  sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
-  buildDepends = [
-    aeson binary byteable cryptohash deepseq either jsonRpc mtl pbkdf
-    split text
-  ];
-  testDepends = [
-    aeson async binary byteable cryptohash deepseq either HUnit jsonRpc
-    mtl pbkdf QuickCheck split testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/haskoin/haskoin";
-    description = "Implementation of the Bitcoin protocol";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
deleted file mode 100644
index 7f1e29a8c6c..00000000000
--- a/pkgs/development/libraries/haskell/haskore/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi
-, nonNegative, parsec, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haskore";
-  version = "0.2.0.5";
-  sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataAccessor eventList haskellSrc markovChain midi nonNegative
-    parsec random transformers utilityHt
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Haskore";
-    description = "The Haskore Computer Music System";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
deleted file mode 100644
index bb26f635f62..00000000000
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text
-, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hastache";
-  version = "0.6.0";
-  sha256 = "1z609mhsc875ba3k6mlmlqpmqlwgxpav2asnf83yzq1q7bfs0cxh";
-  buildDepends = [
-    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
-  ];
-  testDepends = [ HUnit mtl syb text ];
-  meta = {
-    homepage = "http://github.com/lymar/hastache";
-    description = "Haskell implementation of Mustache templates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
deleted file mode 100644
index f2cf3d24f87..00000000000
--- a/pkgs/development/libraries/haskell/haste-compiler/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
-, dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl
-, network, networkUri, random, shellmate, systemFileio, tar
-, transformers, utf8String, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haste-compiler";
-  version = "0.4.3";
-  sha256 = "1wkb6a1jwmpjr0jlz5fjq652jz6a6agg0a5pfazyfpdznvd4mm62";
-  isLibrary = true;
-  isExecutable = true;
-  noHaddock = true;
-  buildDepends = [
-    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either
-    filepath ghcPaths HTTP monadsTf mtl network networkUri random
-    shellmate systemFileio tar transformers utf8String websockets
-  ];
-  configureFlags = "-fportable";
-  meta = {
-    homepage = "http://haste-lang.org/";
-    description = "Haskell To ECMAScript compiler";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix
deleted file mode 100644
index 221a7fe647b..00000000000
--- a/pkgs/development/libraries/haskell/haste-perch/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hasteCompiler, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "haste-perch";
-  version = "0.1.0.4";
-  sha256 = "12ssfik7v671727yxplz44gwgy9i815l44r4z3x066ndcqglr306";
-  buildDepends = [ hasteCompiler transformers ];
-  meta = {
-    homepage = "https://github.com/agocorona/haste-perch";
-    description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxl/default.nix b/pkgs/development/libraries/haskell/haxl/default.nix
deleted file mode 100644
index f257df7f1e0..00000000000
--- a/pkgs/development/libraries/haskell/haxl/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, filepath, hashable, HUnit, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haxl";
-  version = "0.1.0.0";
-  sha256 = "1spkcvsy0p3ksxapaz93db09y2jsswr5k6qs6cvxmwxxhbnswv36";
-  buildDepends = [
-    aeson filepath hashable HUnit text time unorderedContainers vector
-  ];
-  testDepends = [ aeson hashable HUnit text unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/facebook/Haxl";
-    description = "A Haskell library for efficient, concurrent, and concise data access";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
deleted file mode 100644
index 7d7e8282e28..00000000000
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haxr }:
-
-cabal.mkDerivation (self: {
-  pname = "haxr-th";
-  version = "3000.5";
-  sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
-  buildDepends = [ haxr ];
-  meta = {
-    homepage = "http://www.haskell.org/haxr/";
-    description = "Automatic deriving of XML-RPC structs for Haskell records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
deleted file mode 100644
index 708959b0045..00000000000
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network
-, networkUri, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "haxr";
-  version = "3000.10.3.1";
-  sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm";
-  buildDepends = [
-    base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri
-    time utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/HaXR";
-    description = "XML-RPC client and server library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
deleted file mode 100644
index c08f9e79bf0..00000000000
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, doctest, either, filepath, free, lens, mmorph
-, monadControl, mtl, optparseApplicative, randomShuffle, split, stm
-, tagged, tasty, temporary, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hcltest";
-  version = "0.3.6";
-  sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd";
-  buildDepends = [
-    dlist either filepath free lens mmorph monadControl mtl
-    optparseApplicative randomShuffle split stm tagged tasty temporary
-    text transformers transformersBase
-  ];
-  testDepends = [ doctest filepath ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/bennofs/hcltest/";
-    description = "A testing library for command line applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix
deleted file mode 100644
index 1fdca2c4f9a..00000000000
--- a/pkgs/development/libraries/haskell/hdaemonize/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, hsyslog, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hdaemonize";
-  version = "0.5.0.0";
-  sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv";
-  buildDepends = [ extensibleExceptions filepath hsyslog mtl ];
-  meta = {
-    homepage = "http://github.com/madhadron/hdaemonize";
-    description = "Library to handle the details of writing daemons for UNIX";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix
deleted file mode 100644
index 47cf3fee865..00000000000
--- a/pkgs/development/libraries/haskell/hedis/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl
-, network, resourcePool, testFramework, testFrameworkHunit, time
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hedis";
-  version = "0.6.5";
-  sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh";
-  buildDepends = [
-    attoparsec BoundedChan bytestringLexing mtl network resourcePool
-    time vector
-  ];
-  testDepends = [ HUnit mtl testFramework testFrameworkHunit time ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/informatikr/hedis";
-    description = "Client library for the Redis datastore: supports full command set, pipelining";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
deleted file mode 100644
index 9927e65cfc3..00000000000
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
-, dlist, errors, filepath, hashable, mapSyntax
-, MonadCatchIOTransformers, mtl, random, text, time, transformers
-, unorderedContainers, vector, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "heist";
-  version = "0.14.0.1";
-  sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
-    filepath hashable mapSyntax MonadCatchIOTransformers mtl random
-    text time transformers unorderedContainers vector xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "An Haskell template system supporting both HTML5 and XML";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix
deleted file mode 100644
index a7a1527cd1d..00000000000
--- a/pkgs/development/libraries/haskell/here/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "here";
-  version = "1.2.6";
-  sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif";
-  buildDepends = [ haskellSrcMeta mtl parsec ];
-  meta = {
-    homepage = "https://github.com/tmhedberg/here";
-    description = "Here docs & interpolated strings via quasiquotation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/heredoc/default.nix b/pkgs/development/libraries/haskell/heredoc/default.nix
deleted file mode 100644
index 13f417c8f98..00000000000
--- a/pkgs/development/libraries/haskell/heredoc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "heredoc";
-  version = "0.2.0.0";
-  sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
-  meta = {
-    homepage = "http://hackage.haskell.org/package/heredoc";
-    description = "multi-line string / here document using QuasiQuotes";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hex/default.nix b/pkgs/development/libraries/haskell/hex/default.nix
deleted file mode 100644
index 235d617e96b..00000000000
--- a/pkgs/development/libraries/haskell/hex/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hex";
-  version = "0.1.2";
-  sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
-  meta = {
-    description = "Convert strings into hexadecimal and back";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
deleted file mode 100644
index 63e92de9424..00000000000
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, List, text, transformers, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "hexpat";
-  version = "0.20.7";
-  sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08";
-  buildDepends = [ deepseq List text transformers utf8String ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Hexpat/";
-    description = "XML parser/formatter based on expat";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix
deleted file mode 100644
index 019815fd57c..00000000000
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hflags";
-  version = "0.4";
-  sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://github.com/errge/hflags";
-    description = "Command line flag parser, very similar to Google's gflags";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hfsevents/default.nix b/pkgs/development/libraries/haskell/hfsevents/default.nix
deleted file mode 100644
index 30ec31e60e2..00000000000
--- a/pkgs/development/libraries/haskell/hfsevents/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hfsevents";
-  version = "0.1.5";
-  sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
-  buildDepends = [ cereal mtl text ];
-  meta = {
-    homepage = "http://github.com/luite/hfsevents";
-    description = "File/folder watching for OS X";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.darwin;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hgal/default.nix b/pkgs/development/libraries/haskell/hgal/default.nix
deleted file mode 100644
index a301f935da9..00000000000
--- a/pkgs/development/libraries/haskell/hgal/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hgal";
-  version = "2.0.0.2";
-  sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "library for computation automorphism group and canonical labelling of a graph";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix
deleted file mode 100644
index 0384325c2d7..00000000000
--- a/pkgs/development/libraries/haskell/hi/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, hspec, HUnit, parsec, split, template
-, temporaryRc, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hi";
-  version = "0.0.8.2";
-  sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath parsec split template temporaryRc text time
-  ];
-  testDepends = [
-    doctest filepath hspec HUnit parsec split template temporaryRc text
-    time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fujimura/hi";
-    description = "Generate scaffold for cabal project";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
deleted file mode 100644
index a25a37741d3..00000000000
--- a/pkgs/development/libraries/haskell/higher-leveldb/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, hspec, leveldbHaskell, liftedBase
-, monadControl, mtl, resourcet, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "higher-leveldb";
-  version = "0.2.1.0";
-  sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
-  buildDepends = [
-    cereal dataDefault leveldbHaskell liftedBase monadControl mtl
-    resourcet transformers transformersBase
-  ];
-  testDepends = [
-    cereal hspec leveldbHaskell liftedBase monadControl mtl resourcet
-    transformers transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/jeremyjh/higher-leveldb";
-    description = "A rich monadic API for working with leveldb databases";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
deleted file mode 100644
index d5ee69f5f0d..00000000000
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, Diff, filepath, mtl, parsec, regexPcre
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "highlighting-kate";
-  version = "0.5.11";
-  sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml filepath mtl parsec regexPcre utf8String
-  ];
-  testDepends = [ blazeHtml Diff filepath ];
-  prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
-  meta = {
-    homepage = "http://github.com/jgm/highlighting-kate";
-    description = "Syntax highlighting";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix
deleted file mode 100644
index ea5e13a1b5f..00000000000
--- a/pkgs/development/libraries/haskell/hindent/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hindent";
-  version = "4.0";
-  sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ];
-  testDepends = [
-    dataDefault haskellSrcExts hspec monadLoops mtl text
-  ];
-  doCheck = false;
-  meta = {
-    description = "Extensible Haskell pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
deleted file mode 100644
index 2513922781b..00000000000
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hinotify";
-  version = "0.3.7";
-  sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
-  meta = {
-    homepage = "https://github.com/kolmodin/hinotify.git";
-    description = "Haskell binding to inotify";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
deleted file mode 100644
index ce0eec94488..00000000000
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, extensibleExceptions, filepath, ghcMtl
-, ghcPaths, HUnit, mtl, random, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hint";
-  version = "0.4.2.1";
-  sha256 = "0nc545y1v3s1897f3ims7m37wnn288xyz1zb9sxqs6immdxyly0g";
-  buildDepends = [
-    exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
-    utf8String
-  ];
-  testDepends = [
-    exceptions extensibleExceptions filepath HUnit mtl
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/jcpetruzza/hint";
-    description = "Runtime Haskell interpreter (GHC API wrapper)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
deleted file mode 100644
index 08ff35ca8aa..00000000000
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl
-, parsec, patience, QuickCheck, random, systemFileio
-, systemFilepath, testFramework, testFrameworkQuickcheck2
-, unixCompat, vector, zlib, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hit";
-  version = "0.6.2";
-  sha256 = "07lfjbn48v8ykkyj15diy4a9kpgzc93gv0l1rdfcacl3f26a97hs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec cryptohash hourglass mtl parsec patience random
-    systemFileio systemFilepath unixCompat vector zlib zlibBindings
-  ];
-  testDepends = [
-    bytedump hourglass HUnit QuickCheck testFramework
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hit";
-    description = "Git operations in haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
deleted file mode 100644
index 5ee8f2d4f88..00000000000
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript
-, optparseApplicative, QuickCheck, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hjsmin";
-  version = "0.1.4.7";
-  sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder languageJavascript optparseApplicative text
-  ];
-  testDepends = [
-    blazeBuilder Cabal HUnit languageJavascript QuickCheck
-    testFramework testFrameworkHunit text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/alanz/hjsmin";
-    description = "Haskell implementation of a javascript minifier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
deleted file mode 100644
index 350b384ef00..00000000000
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeMarkup, cmdargs, csv, Decimal, filepath, HUnit, mtl
-, parsec, prettyShow, regexpr, regexTdfa, safe, split
-, testFramework, testFrameworkHunit, time, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-lib";
-  version = "0.24";
-  sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns";
-  buildDepends = [
-    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe split time transformers
-    utf8String
-  ];
-  testDepends = [
-    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe split testFramework
-    testFrameworkHunit time transformers
-  ];
-  meta = {
-    homepage = "http://hledger.org";
-    description = "Core data types, parsers and utilities for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger-web/build-fix.patch b/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
deleted file mode 100644
index 45862bf1679..00000000000
--- a/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Only in hledger-web-0.22.4: dist
-diff -urw hledger-web-0.22.4-orig/Hledger/Web/Main.hs hledger-web-0.22.4/Hledger/Web/Main.hs
---- hledger-web-0.22.4-orig/Hledger/Web/Main.hs	2014-04-07 13:00:41.168884350 +0200
-+++ hledger-web-0.22.4/Hledger/Web/Main.hs	2014-04-07 13:14:46.584599468 +0200
-@@ -15,7 +15,8 @@
- -- import Yesod.Default.Main   (defaultMain)
- import Settings            --  (parseExtra)
- import Application          (makeApplication)
--import Data.Conduit.Network (HostPreference(HostIPv4))
-+import Data.String
-+import Data.Conduit.Network
- import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
- import Network.Wai.Handler.Launch (runUrlPort)
- --
-@@ -65,7 +66,7 @@
-   app <- makeApplication opts j' AppConfig{appEnv = Development
-                                           ,appPort = p
-                                           ,appRoot = pack u
--                                          ,appHost = HostIPv4
-+                                          ,appHost = fromString "*4"
-                                           ,appExtra = Extra "" Nothing staticRoot
-                                           }
-   if server_ opts
-diff -urw hledger-web-0.22.4-orig/hledger-web.cabal hledger-web-0.22.4/hledger-web.cabal
---- hledger-web-0.22.4-orig/hledger-web.cabal	2014-04-07 13:00:41.168884350 +0200
-+++ hledger-web-0.22.4/hledger-web.cabal	2014-04-07 13:16:26.376772344 +0200
-@@ -128,7 +128,7 @@
-                    , http-conduit
-                    , http-client          >= 0.2 && < 0.3
-                    , HUnit
--                   , network-conduit
-+                   , network-conduit, conduit-extra
-                    , old-locale
-                    , parsec
-                    , regexpr              >= 0.5.1
-@@ -220,7 +220,7 @@
-                    , http-conduit
-                    , http-client          >= 0.2 && < 0.3
-                    , HUnit
--                   , network-conduit
-+                   , network-conduit, conduit-extra
-                    , old-locale
-                    , parsec
-                    , regexpr              >= 0.5.1
-Only in hledger-web-0.22.4: Setup
-Only in hledger-web-0.22.4: Setup.hi
-Only in hledger-web-0.22.4: Setup.o
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
deleted file mode 100644
index ae5de9c757b..00000000000
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, conduitExtra, dataDefault, filepath, hjsmin, hledger, hledgerLib
-, hspec, httpClient, httpConduit, HUnit, json, networkConduit
-, parsec, regexpr, safe, shakespeare, text, time, transformers, wai
-, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
-, yesodStatic, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger-web";
-  version = "0.24";
-  sha256 = "0dwqrq31yf0kw3rk06f1ny2670w2qw83bvvqwp87g4xky5v69xpi";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeHtml blazeMarkup clientsession cmdargs conduitExtra
-    dataDefault filepath hjsmin hledger hledgerLib httpClient
-    httpConduit HUnit json networkConduit parsec regexpr safe
-    shakespeare text time transformers wai waiExtra waiHandlerLaunch
-    warp yaml yesod yesodCore yesodStatic
-  ];
-  testDepends = [ hspec yesod yesodTest ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://hledger.org";
-    description = "A web interface for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
deleted file mode 100644
index a53cb3cc14e..00000000000
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, prettyShow, regexpr, regexTdfa, safe, shakespeare
-, shakespeareText, split, tabular, testFramework
-, testFrameworkHunit, text, time, transformers, utf8String, wizards
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hledger";
-  version = "0.24";
-  sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
-    tabular text time utf8String wizards
-  ];
-  testDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
-    tabular testFramework testFrameworkHunit text time transformers
-    wizards
-  ];
-  meta = {
-    homepage = "http://hledger.org";
-    description = "The main command-line interface for the hledger accounting tool";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hlibgit2/default.nix b/pkgs/development/libraries/haskell/hlibgit2/default.nix
deleted file mode 100644
index 3798d3082a7..00000000000
--- a/pkgs/development/libraries/haskell/hlibgit2/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, git, openssl, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "hlibgit2";
-  version = "0.18.0.13";
-  sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz";
-  buildDepends = [ bindingsDSL zlib ];
-  testDepends = [ git ];
-  extraLibraries = [ openssl ];
-  meta = {
-    description = "Low-level bindings to libgit2";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
deleted file mode 100644
index 501d84a596f..00000000000
--- a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsl, hmatrix, random, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix-gsl";
-  version = "0.16.0.2";
-  sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym";
-  buildDepends = [ hmatrix random vector ];
-  pkgconfigDepends = [ gsl ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Numerical computation";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
deleted file mode 100644
index c6e9f3dbbbf..00000000000
--- a/pkgs/development/libraries/haskell/hmatrix-special/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gsl, hmatrix, hmatrixGsl }:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix-special";
-  version = "0.3.0.1";
-  sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
-  buildDepends = [ hmatrix hmatrixGsl ];
-  extraLibraries = [ gsl ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Interface to GSL special functions";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
deleted file mode 100644
index afc5833d5e2..00000000000
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blas, deepseq, liblapack, random, split
-, storableComplex, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hmatrix";
-  version = "0.16.1.0";
-  sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h";
-  buildDepends = [
-    binary deepseq random split storableComplex vector
-  ];
-  extraLibraries = [ blas liblapack ];
-  meta = {
-    homepage = "https://github.com/albertoruiz/hmatrix";
-    description = "Numeric Linear Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
deleted file mode 100644
index 8ccbfad945c..00000000000
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptoPubkeyTypes, curl, dataenc, entropy, mtl
-, random, RSA, SHA, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoauth";
-  version = "0.3.5";
-  sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp";
-  buildDepends = [
-    binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA
-    time utf8String
-  ];
-  meta = {
-    description = "A Haskell implementation of OAuth 1.0a protocol.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
deleted file mode 100644
index ec88bb0f174..00000000000
--- a/pkgs/development/libraries/haskell/hoauth2/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, bytestringShow, httpConduit, httpTypes
-, monadControl, mtl, random, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoauth2";
-  version = "0.4.3";
-  sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson bytestringShow httpConduit httpTypes monadControl mtl random
-    text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/freizl/hoauth2";
-    description = "hoauth2";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
deleted file mode 100644
index 1fa7c558731..00000000000
--- a/pkgs/development/libraries/haskell/holy-project/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, ansiTerminal, Cabal, filepath, hastache
-, httpConduit, HUnit, lens, lensAeson, QuickCheck, random
-, smallcheck, split, syb, tasty, tastyHunit, tastyQuickcheck
-, tastySmallcheck, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "holy-project";
-  version = "0.1.1.1";
-  sha256 = "0vb4mlz6gb01aadm2b8kgvgnrwwvl6q4ndx6xldi0xi3rm22xkwj";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens
-    lensAeson QuickCheck random smallcheck split syb tasty tastyHunit
-    tastyQuickcheck tastySmallcheck text time
-  ];
-  testDepends = [
-    Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck
-    tastySmallcheck
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/yogsototh/holy-project";
-    description = "Start your Haskell project with cabal, git and tests";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
deleted file mode 100644
index 8e74edc8e6a..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-builder";
-  version = "0.3";
-  sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9";
-  buildDepends = [
-    blazeBuilder doubleConversion hoodleTypes lens strict text
-  ];
-  meta = {
-    description = "text builder for hoodle file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix
deleted file mode 100644
index e63b68261d4..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-core/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
-, cairo, cereal, configurator, coroutineObject, dbus, Diff, dyre
-, either, errors, filepath, fsnotify, gd, gtk, hoodleBuilder
-, hoodleParser, hoodleRender, hoodleTypes, lens, libX11, libXi
-, monadLoops, mtl, network, networkInfo, networkSimple, pango
-, poppler, pureMD5, stm, strict, svgcairo, systemFilepath, text
-, time, transformers, transformersFree, unorderedContainers, uuid
-, vector, xournalParser
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-core";
-  version = "0.14";
-  sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8";
-  buildDepends = [
-    aeson aesonPretty attoparsec base64Bytestring binary cairo cereal
-    configurator coroutineObject dbus Diff dyre either errors filepath
-    fsnotify gd gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes
-    lens monadLoops mtl network networkInfo networkSimple pango poppler
-    pureMD5 stm strict svgcairo systemFilepath text time transformers
-    transformersFree unorderedContainers uuid vector xournalParser
-  ];
-  extraLibraries = [ libX11 libXi ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Core library for hoodle";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-extra/default.nix b/pkgs/development/libraries/haskell/hoodle-extra/default.nix
deleted file mode 100644
index c26932f1017..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-extra/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
-, cmdargs, conduit, either, filepath, hoodleParser, hoodleTypes
-, httpConduit, lens, monadLoops, mtl, networkSimple, pureMD5
-, resourcet, text, time, transformers, unorderedContainers
-, xournalParser
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-extra";
-  version = "0.1";
-  sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty attoparsec base64Bytestring binary cmdargs
-    conduit either filepath hoodleParser hoodleTypes httpConduit lens
-    monadLoops mtl networkSimple pureMD5 resourcet text time
-    transformers unorderedContainers xournalParser
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "extra hoodle tools";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
deleted file mode 100644
index 8684a754648..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text
-, transformers, xournalTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-parser";
-  version = "0.3";
-  sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i";
-  buildDepends = [
-    attoparsec either hoodleTypes lens mtl strict text transformers
-    xournalTypes
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Hoodle file parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix
deleted file mode 100644
index 71e39022251..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-render/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, cairo, filepath, gd, gtk, hoodleTypes
-, lens, monadLoops, mtl, poppler, stm, strict, svgcairo
-, transformers, unorderedContainers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-render";
-  version = "0.4";
-  sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d";
-  buildDepends = [
-    base64Bytestring cairo filepath gd gtk hoodleTypes lens monadLoops
-    mtl poppler stm strict svgcairo transformers unorderedContainers
-    uuid
-  ];
-  meta = {
-    description = "Hoodle file renderer";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix
deleted file mode 100644
index 22bc514e153..00000000000
--- a/pkgs/development/libraries/haskell/hoodle-types/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, mtl, strict, text, uuid }:
-
-cabal.mkDerivation (self: {
-  pname = "hoodle-types";
-  version = "0.3";
-  sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm";
-  buildDepends = [ cereal lens mtl strict text uuid ];
-  meta = {
-    description = "Data types for programs for hoodle file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.34.nix b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
deleted file mode 100644
index d498095f8b3..00000000000
--- a/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
-, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoogle";
-  version = "4.2.34";
-  sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-    resourcet safe shake tagsoup text time transformers uniplate vector
-    vectorAlgorithms wai warp
-  ];
-  testDepends = [ filepath ];
-  testTarget = "--test-option=--no-net";
-  meta = {
-    homepage = "http://www.haskell.org/hoogle/";
-    description = "Haskell API Search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
deleted file mode 100644
index 5b12f8d28c4..00000000000
--- a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup
-, temporary, text, time, transformers, uniplate, vector
-, vectorAlgorithms, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hoogle";
-  version = "4.2.36";
-  sha256 = "1h65pl0jfki2pcrywak9mh3hfi3wziffhb2q0xp6r4v01536zifv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-    resourcet safe shake tagsoup text time transformers uniplate vector
-    vectorAlgorithms wai warp
-  ];
-  testDepends = [ filepath temporary ];
-  testTarget = "--test-option=--no-net";
-  meta = {
-    homepage = "http://www.haskell.org/hoogle/";
-    description = "Haskell API Search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
deleted file mode 100644
index 13ea889119c..00000000000
--- a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! @shell@
-
-COMMAND=$1
-shift
-HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
-    "$COMMAND" -d @out@/share/hoogle "$@"
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
deleted file mode 100644
index 822c2bdd82e..00000000000
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-# Install not only the Hoogle library and executable, but also a local Hoogle
-# database which provides "Source" links to all specified 'packages' -- or the
-# current Haskell Platform if no custom package set is provided.
-#
-# It is intended to be used in config.nix similarly to:
-#
-# { packageOverrides = pkgs: rec {
-#
-#   haskellPackages =
-#     let callPackage = pkgs.lib.callPackageWith haskellPackages;
-#     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
-#         extension = self: super: {
-#           hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
-#             packages = with pkgs.haskellPackages; [
-#               mmorph
-#               monadControl
-#             ];
-#           };
-#         };
-#       });
-# }}
-#
-# This will build mmorph and monadControl, and have the hoogle installation
-# refer to their documentation via symlink so they are not garbage collected.
-
-{ stdenv, hoogle, rehoo
-, ghc, packages ? [ ghc.ghc ]
-}:
-
-let
-  inherit (stdenv.lib) optional;
-  wrapper = ./hoogle-local-wrapper.sh;
-in
-stdenv.mkDerivation {
-  name = "hoogle-local-0.1";
-  buildInputs = [hoogle rehoo];
-
-  phases = [ "installPhase" ];
-
-  docPackages = packages;
-  installPhase = ''
-    if [ -z "$docPackages" ]; then
-        echo "ERROR: The packages attribute has not been set"
-        exit 1
-    fi
-
-    mkdir -p $out/share/hoogle/doc
-    export HOOGLE_DOC_PATH=$out/share/hoogle/doc
-
-    cd $out/share/hoogle
-
-    function import_dbs() {
-        find $1 -name '*.txt' | while read f; do
-          newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
-          if [[ -f $f && ! -f ./$newname ]]; then
-            cp -p $f ./$newname
-            hoogle convert -d "$(dirname $f)" "./$newname"
-          fi
-        done
-    }
-
-    for i in $docPackages; do
-        findInputs $i docPackages propagated-native-build-inputs
-        findInputs $i docPackages propagated-build-inputs
-    done
-
-    for i in $docPackages; do
-      if [[ ! $i == $out ]]; then
-        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
-          if [[ -d $docdir ]]; then
-            import_dbs $docdir
-            ln -sf $docdir $out/share/hoogle/doc
-          fi
-        done
-      fi
-    done
-
-    import_dbs ${ghc}/share/doc/ghc*/html/libraries
-    ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
-
-    chmod 644 *.hoo *.txt
-    rehoo -j4 -c64 .
-
-    rm -fr downloads *.dep *.txt
-    mv default.hoo x || exit 0
-    rm -f *.hoo
-    mv x default.hoo || exit 1
-
-    if [ ! -f default.hoo ]; then
-        echo "Unable to build the default Hoogle database"
-        exit 1
-    fi
-
-    mkdir -p $out/bin
-    substitute ${wrapper} $out/bin/hoogle \
-        --subst-var out --subst-var-by shell ${stdenv.shell} \
-        --subst-var-by hoogle ${hoogle}
-    chmod +x $out/bin/hoogle
-  '';
-
-  meta = {
-    description = "A local Hoogle database";
-    platforms = ghc.meta.platforms;
-    hydraPlatforms = with stdenv.lib.platforms; none;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/haskell/hoopl/default.nix b/pkgs/development/libraries/haskell/hoopl/default.nix
deleted file mode 100644
index a0c494d67cf..00000000000
--- a/pkgs/development/libraries/haskell/hoopl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hoopl";
-  version = "3.10.0.1";
-  sha256 = "1wahcngdmb3ixny0havrddkmrhs02rzlf1d1l7g8f6pzg051mr11";
-  meta = {
-    homepage = "http://ghc.cs.tufts.edu/hoopl/";
-    description = "A library to support dataflow analysis and optimization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix
deleted file mode 100644
index 5532b56e6a1..00000000000
--- a/pkgs/development/libraries/haskell/hopenssl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, openssl }:
-
-cabal.mkDerivation (self: {
-  pname = "hopenssl";
-  version = "1.7";
-  sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
-  buildDepends = [ mtl ];
-  extraLibraries = [ openssl ];
-  meta = {
-    homepage = "http://github.com/peti/hopenssl";
-    description = "FFI bindings to OpenSSL's EVP digest interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hosc/default.nix b/pkgs/development/libraries/haskell/hosc/default.nix
deleted file mode 100644
index 2ad4d6210e2..00000000000
--- a/pkgs/development/libraries/haskell/hosc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, blazeBuilder, dataBinaryIeee754, network
-, QuickCheck, testFramework, testFrameworkQuickcheck2, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hosc";
-  version = "0.15";
-  sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
-  buildDepends = [
-    binary blazeBuilder dataBinaryIeee754 network time transformers
-  ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hosc";
-    description = "Haskell Open Sound Control";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
deleted file mode 100644
index 2131599c8a6..00000000000
--- a/pkgs/development/libraries/haskell/hostname/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hostname";
-  version = "1.0";
-  sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
-  meta = {
-    description = "A very simple package providing a cross-platform means of determining the hostname";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
deleted file mode 100644
index 92e3806b8cd..00000000000
--- a/pkgs/development/libraries/haskell/hourglass/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hourglass";
-  version = "0.2.6";
-  sha256 = "029fmx5r6krj7y7mn4b4m2lpaa3iw6vhyznrib5lhf469i1jp9m3";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq mtl tasty tastyHunit tastyQuickcheck time
-  ];
-  meta = {
-    homepage = "https://github.com/vincenthz/hs-hourglass";
-    description = "simple performant time related library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
deleted file mode 100644
index 8fbcd09e887..00000000000
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, network, time }:
-
-cabal.mkDerivation (self: {
-  pname = "hp2any-core";
-  version = "0.11.2";
-  sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
-  buildDepends = [ attoparsec filepath network time ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Hp2any";
-    description = "Heap profiling helper library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
deleted file mode 100644
index aad7c7fdca9..00000000000
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network
-, OpenGL, parseargs
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hp2any-graph";
-  version = "0.5.4.2";
-  sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    filepath GLUT hp2anyCore network OpenGL parseargs
-  ];
-  extraLibraries = [ freeglut mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Hp2any";
-    description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix
deleted file mode 100644
index c4e9ddbe2aa..00000000000
--- a/pkgs/development/libraries/haskell/hplayground/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, hasteCompiler, hastePerch, monadsTf
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hplayground";
-  version = "0.1.1.0";
-  sha256 = "03ya82lxhv7acakhl01835p3wvwr3z14jiww7wvj4bzlib8qsi8b";
-  buildDepends = [
-    dataDefault hasteCompiler hastePerch monadsTf transformers
-  ];
-  meta = {
-    homepage = "https://github.com/agocorona/hplayground";
-    description = "a client-side haskell framework that compiles to javascript with the haste compiler";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
deleted file mode 100644
index 9d7b889746e..00000000000
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "hs-bibutils";
-  version = "5.0";
-  sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
-    description = "Haskell bindings to bibutils, the bibliography conversion utilities";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
deleted file mode 100644
index c045cf8e720..00000000000
--- a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, criterion, csv, dataDefault, filepath, handaGdata
-, hsbencher, httpConduit, mtl, network, statistics, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsbencher-fusion";
-  version = "0.3.3";
-  sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    criterion csv dataDefault filepath handaGdata hsbencher httpConduit
-    mtl network statistics text time
-  ];
-  doCheck = false;
-  meta = {
-    description = "Backend for uploading benchmark data to Google Fusion Tables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix
deleted file mode 100644
index 0786aa18b3c..00000000000
--- a/pkgs/development/libraries/haskell/hsbencher/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, dataDefault, filepath, GenericPretty, HUnit
-, ioStreams, mtl, random, testFramework, testFrameworkHunit, text
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsbencher";
-  version = "1.20.0.3";
-  sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl";
-  buildDepends = [
-    async dataDefault filepath GenericPretty ioStreams mtl random time
-  ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text time ];
-  doCheck = false;
-  meta = {
-    description = "Launch and gather data from Haskell and non-Haskell benchmarks";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-db/default.nix b/pkgs/development/libraries/haskell/hsc3-db/default.nix
deleted file mode 100644
index 13a32c52863..00000000000
--- a/pkgs/development/libraries/haskell/hsc3-db/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hsc3, safe }:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-db";
-  version = "0.15";
-  sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
-  buildDepends = [ hsc3 safe ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-db";
-    description = "Haskell SuperCollider Unit Generator Database";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-dot/default.nix b/pkgs/development/libraries/haskell/hsc3-dot/default.nix
deleted file mode 100644
index 7423525e46f..00000000000
--- a/pkgs/development/libraries/haskell/hsc3-dot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hsc3 }:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-dot";
-  version = "0.15";
-  sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
-  buildDepends = [ filepath hsc3 ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-dot";
-    description = "haskell supercollider graph drawing";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-lang/default.nix b/pkgs/development/libraries/haskell/hsc3-lang/default.nix
deleted file mode 100644
index dd12067d45e..00000000000
--- a/pkgs/development/libraries/haskell/hsc3-lang/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, dataDefault, dataOrdlist, dlist, hashable
-, hmatrixSpecial, hosc, hsc3, MonadRandom, random, randomShuffle
-, split, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-lang";
-  version = "0.15";
-  sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
-  buildDepends = [
-    bifunctors dataDefault dataOrdlist dlist hashable hmatrixSpecial
-    hosc hsc3 MonadRandom random randomShuffle split transformers
-    vector
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3-lang";
-    description = "Haskell SuperCollider Language";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-process/default.nix b/pkgs/development/libraries/haskell/hsc3-process/default.nix
deleted file mode 100644
index 6b81f64b03d..00000000000
--- a/pkgs/development/libraries/haskell/hsc3-process/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, filepath, hosc, hsc3, time, timeCompat
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-process";
-  version = "0.10.0";
-  sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault filepath hosc hsc3 time timeCompat transformers
-  ];
-  meta = {
-    homepage = "https://github.com/kaoskorobase/hsc3-process";
-    description = "Create and control scsynth processes";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3-server/default.nix b/pkgs/development/libraries/haskell/hsc3-server/default.nix
deleted file mode 100644
index c8e78e4e7ea..00000000000
--- a/pkgs/development/libraries/haskell/hsc3-server/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitset, dataDefault, failure, hashtables, hosc, hsc3
-, hsc3Process, liftedBase, ListZipper, monadControl, QuickCheck
-, random, resourcet, testFramework, testFrameworkQuickcheck2
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3-server";
-  version = "0.9.2";
-  sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    bitset dataDefault failure hashtables hosc hsc3 hsc3Process
-    liftedBase ListZipper monadControl random resourcet transformers
-    transformersBase
-  ];
-  testDepends = [
-    failure QuickCheck random testFramework testFrameworkQuickcheck2
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/kaoskorobase/hsc3-server";
-    description = "SuperCollider server resource management and synchronization";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsc3/default.nix b/pkgs/development/libraries/haskell/hsc3/default.nix
deleted file mode 100644
index 6e05c01220e..00000000000
--- a/pkgs/development/libraries/haskell/hsc3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, dataOrdlist, filepath, hashable, hosc
-, network, random, safe, split, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsc3";
-  version = "0.15";
-  sha256 = "1rmxl1wcly74bjkw79zw9ydmiclk5716w75b4nz8xkqraijiafrg";
-  buildDepends = [
-    binary dataDefault dataOrdlist filepath hashable hosc network
-    random safe split transformers
-  ];
-  meta = {
-    homepage = "http://rd.slavepianos.org/t/hsc3";
-    description = "Haskell SuperCollider";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
deleted file mode 100644
index f58a8077b15..00000000000
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adns, network }:
-
-cabal.mkDerivation (self: {
-  pname = "hsdns";
-  version = "1.6.1";
-  sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
-  buildDepends = [ network ];
-  extraLibraries = [ adns ];
-  meta = {
-    homepage = "http://github.com/peti/hsdns";
-    description = "Asynchronous DNS Resolver";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hse-cpp/default.nix b/pkgs/development/libraries/haskell/hse-cpp/default.nix
deleted file mode 100644
index 49625acf68c..00000000000
--- a/pkgs/development/libraries/haskell/hse-cpp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, haskellSrcExts }:
-
-cabal.mkDerivation (self: {
-  pname = "hse-cpp";
-  version = "0.1";
-  sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
-  buildDepends = [ cpphs haskellSrcExts ];
-  meta = {
-    description = "Preprocess+parse haskell code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
deleted file mode 100644
index 2406a9c2e94..00000000000
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hsemail";
-  version = "1.7.7";
-  sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
-  buildDepends = [ mtl parsec ];
-  testDepends = [ doctest hspec parsec ];
-  meta = {
-    homepage = "http://github.com/peti/hsemail";
-    description = "Internet Message Parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
deleted file mode 100644
index cc9b8046322..00000000000
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, cmdargs, dyre, filepath, haskellSrcExts, lens
-, mtl, split, tasty, tastyGolden, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsimport";
-  version = "0.6.4";
-  sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec cmdargs dyre haskellSrcExts lens mtl split text
-  ];
-  testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
-  jailbreak = true;
-  meta = {
-    description = "A command line program for extending the import list of a Haskell source file";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
deleted file mode 100644
index 5fd6f5afd80..00000000000
--- a/pkgs/development/libraries/haskell/hsini/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hsini";
-  version = "0.3.1";
-  sha256 = "06cys4i1nsic13dkp5jgammm3qykzizlnp6wdka2vl699rvnzaaf";
-  buildDepends = [ mtl parsec ];
-  testDepends = [
-    HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Package for user configuration files (INI)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
deleted file mode 100644
index a2116051cde..00000000000
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hslogger, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hslogger-template";
-  version = "2.0.2";
-  sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
-  buildDepends = [ hslogger mtl ];
-  meta = {
-    description = "Automatic generation of hslogger functions";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix
deleted file mode 100644
index e76ff36aab5..00000000000
--- a/pkgs/development/libraries/haskell/hslua/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lua, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hslua";
-  version = "0.3.13";
-  sha256 = "02j3hrzq3dgcv4bvf4xz14qxvzlb0vlxrf7lk9wqwdy43b978mz9";
-  buildDepends = [ mtl ];
-  pkgconfigDepends = [ lua ];
-  configureFlags = "-fsystem-lua";
-  meta = {
-    description = "A Lua language interpreter embedding in Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix b/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix
deleted file mode 100644
index 7b9c9dfd402..00000000000
--- a/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, hspec, hspecExpectations, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-attoparsec";
-  version = "0.1.0.1";
-  sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v";
-  buildDepends = [ attoparsec hspecExpectations text ];
-  testDepends = [ attoparsec hspec hspecExpectations text ];
-  meta = {
-    homepage = "http://github.com/alpmestan/hspec-attoparsec";
-    description = "Utility functions for testing your attoparsec parsers with hspec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-checkers/default.nix b/pkgs/development/libraries/haskell/hspec-checkers/default.nix
deleted file mode 100644
index 7e5022e19b5..00000000000
--- a/pkgs/development/libraries/haskell/hspec-checkers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, checkers, hspec }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-checkers";
-  version = "0.1.0";
-  sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
-  buildDepends = [ checkers hspec ];
-  testDepends = [ checkers hspec ];
-  meta = {
-    description = "Allows to use checkers properties from hspec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-contrib/default.nix b/pkgs/development/libraries/haskell/hspec-contrib/default.nix
deleted file mode 100644
index 53f94edc793..00000000000
--- a/pkgs/development/libraries/haskell/hspec-contrib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecCore, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-contrib";
-  version = "0.2.0";
-  sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq";
-  buildDepends = [ hspecCore HUnit ];
-  testDepends = [ hspec hspecCore HUnit QuickCheck ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Contributed functionality for Hspec";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix
deleted file mode 100644
index 313153c55c0..00000000000
--- a/pkgs/development/libraries/haskell/hspec-core/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta
-, HUnit, QuickCheck, quickcheckIo, random, setenv, silently
-, tfRandom, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-core";
-  version = "2.1.2";
-  sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh";
-  buildDepends = [
-    ansiTerminal async deepseq hspecExpectations HUnit QuickCheck
-    quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq hspecExpectations hspecMeta HUnit
-    QuickCheck quickcheckIo random setenv silently tfRandom time
-    transformers
-  ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A Testing Framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix
deleted file mode 100644
index 8a4a79eae97..00000000000
--- a/pkgs/development/libraries/haskell/hspec-discover/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hspecMeta }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-discover";
-  version = "2.1.2";
-  sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath ];
-  testDepends = [ filepath hspecMeta ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Automatically discover and run Hspec tests";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
deleted file mode 100644
index 12ac56702df..00000000000
--- a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecExpectations, HUnit, lens, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-expectations-lens";
-  version = "0.3.0.0";
-  sha256 = "1v6j4z3gv41jlhbi8ngx7h6d78l1fazvd3bw3c67zsnlgqrvl1x5";
-  buildDepends = [ hspec hspecExpectations HUnit lens ];
-  testDepends = [ hspec lens silently ];
-  meta = {
-    homepage = "http://supki.github.io/hspec-expectations-lens/";
-    description = "Hspec expectations for the lens stuff";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
deleted file mode 100644
index a1267254f1a..00000000000
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, markdownUnlit, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-expectations";
-  version = "0.6.1";
-  sha256 = "0rr1dn39daxi4kqnbz3k21slxpscz939bx16161rr1zp4v7m1lzj";
-  buildDepends = [ HUnit ];
-  testDepends = [ hspec HUnit markdownUnlit silently ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/sol/hspec-expectations#readme";
-    description = "Catchy combinators for HUnit";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-laws/default.nix b/pkgs/development/libraries/haskell/hspec-laws/default.nix
deleted file mode 100644
index b7b2a57d534..00000000000
--- a/pkgs/development/libraries/haskell/hspec-laws/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, markdownUnlit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-laws";
-  version = "0.0.0";
-  sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
-  buildDepends = [ hspec QuickCheck ];
-  testDepends = [ hspec markdownUnlit QuickCheck ];
-  meta = {
-    description = "Document and test laws for standard type classes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
deleted file mode 100644
index 8a10a300146..00000000000
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations
-, HUnit, QuickCheck, quickcheckIo, random, setenv, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-meta";
-  version = "2.0.0";
-  sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv time transformers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A version of Hspec which is used to test Hspec itself";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
deleted file mode 100644
index cb817c6df43..00000000000
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, hspec, hspecCore, hspecExpectations
-, httpTypes, QuickCheck, text, transformers, wai, waiExtra
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec-wai";
-  version = "0.6.2";
-  sha256 = "0nia4hz41g4264mn4s5j8dn9dh0xhdf1gym92wvjmy43rhj3qpzb";
-  buildDepends = [
-    caseInsensitive hspecCore hspecExpectations httpTypes text
-    transformers wai waiExtra
-  ];
-  testDepends = [
-    caseInsensitive hspec hspecCore hspecExpectations httpTypes
-    QuickCheck text transformers wai waiExtra
-  ];
-  meta = {
-    description = "Experimental Hspec support for testing WAI applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
deleted file mode 100644
index 8f8b66b39d3..00000000000
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta
-, HUnit, QuickCheck, stringbuilder, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hspec";
-  version = "2.1.2";
-  sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py";
-  buildDepends = [
-    hspecCore hspecDiscover hspecExpectations HUnit QuickCheck
-    transformers
-  ];
-  testDepends = [ hspecCore hspecMeta stringbuilder ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "A Testing Framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
deleted file mode 100644
index c6f64c92182..00000000000
--- a/pkgs/development/libraries/haskell/hspec2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecDiscover }:
-
-cabal.mkDerivation (self: {
-  pname = "hspec2";
-  version = "0.6.1";
-  sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
-  buildDepends = [ hspec hspecDiscover ];
-  meta = {
-    homepage = "http://hspec.github.io/";
-    description = "Alpha version of Hspec 2.0";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
deleted file mode 100644
index 975fcb784d8..00000000000
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, network }:
-
-cabal.mkDerivation (self: {
-  pname = "hspread";
-  version = "0.3.3";
-  sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc";
-  buildDepends = [ binary extensibleExceptions network ];
-  meta = {
-    description = "A client library for the spread toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsshellscript/default.nix b/pkgs/development/libraries/haskell/hsshellscript/default.nix
deleted file mode 100644
index 221d3079d2b..00000000000
--- a/pkgs/development/libraries/haskell/hsshellscript/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, parsec, random }:
-
-cabal.mkDerivation (self: {
-  pname = "hsshellscript";
-  version = "3.3.2";
-  sha256 = "0rc78yx82gy7a3dxl1mn9hrj1cqhq51zq6w4nf11rzgn6106zdln";
-  buildDepends = [ parsec random ];
-  buildTools = [ c2hs ];
-  meta = {
-    homepage = "http://www.volker-wysk.de/hsshellscript/";
-    description = "Haskell for Unix shell scripting tasks";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hstatsd/default.nix b/pkgs/development/libraries/haskell/hstatsd/default.nix
deleted file mode 100644
index d19d7b38829..00000000000
--- a/pkgs/development/libraries/haskell/hstatsd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hstatsd";
-  version = "0.1";
-  sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
-  buildDepends = [ mtl network text ];
-  meta = {
-    homepage = "https://github.com/mokus0/hstatsd";
-    description = "Quick and dirty statsd interface";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
deleted file mode 100644
index 89bd035eaf1..00000000000
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest }:
-
-cabal.mkDerivation (self: {
-  pname = "hsyslog";
-  version = "2.0";
-  sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
-  testDepends = [ doctest ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "http://github.com/peti/hsyslog";
-    description = "FFI interface to syslog(3) from POSIX.1-2001";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
deleted file mode 100644
index f45fa6bb534..00000000000
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, hspec, HUnit, resourcet
-, systemFilepath, tagstreamConduit, text, transformers, xmlConduit
-, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "html-conduit";
-  version = "1.1.1.1";
-  sha256 = "1bsr0fsy7k606m477c4rxdh7j71nyrp86f1lg9wlwnbm31vrhw00";
-  buildDepends = [
-    conduit conduitExtra resourcet systemFilepath tagstreamConduit text
-    transformers xmlConduit xmlTypes
-  ];
-  testDepends = [ hspec HUnit xmlConduit ];
-  meta = {
-    homepage = "https://github.com/snoyberg/xml";
-    description = "Parse HTML documents using xml-conduit datatypes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
deleted file mode 100644
index a06b1422bc3..00000000000
--- a/pkgs/development/libraries/haskell/html/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "html";
-  version = "1.0.1.2";
-  sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
-  meta = {
-    description = "HTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
deleted file mode 100644
index 233d268e24a..00000000000
--- a/pkgs/development/libraries/haskell/http-attoparsec/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, httpTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "http-attoparsec";
-  version = "0.1.1";
-  sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
-  buildDepends = [ attoparsec httpTypes ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tlaitinen/http-attoparsec";
-    description = "Attoparsec parsers for http-types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
deleted file mode 100644
index 60c7b3c6850..00000000000
--- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient }:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-conduit";
-  version = "0.3.0";
-  sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
-  buildDepends = [ httpClient ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "Frontend support for using http-client with conduit (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
deleted file mode 100644
index 1e51404ebb0..00000000000
--- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient }:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-multipart";
-  version = "0.3.0.0";
-  sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
-  buildDepends = [ httpClient ];
-  noHaddock = true;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "Generate multipart uploads for http-client. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
deleted file mode 100644
index ca4dbbe1085..00000000000
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, connection, dataDefaultClass, hspec, httpClient, httpTypes
-, network, tls
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-client-tls";
-  version = "0.2.2";
-  sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
-  buildDepends = [
-    connection dataDefaultClass httpClient network tls
-  ];
-  testDepends = [ hspec httpClient httpTypes ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "http-client backend using the connection package and tls library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
deleted file mode 100644
index 9ab96c6dfe8..00000000000
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, base64Bytestring, blazeBuilder, caseInsensitive
-, cookie, dataDefaultClass, deepseq, exceptions, filepath, hspec
-, httpTypes, mimeTypes, monadControl, network, networkUri
-, publicsuffixlist, random, streamingCommons, text, time
-, transformers, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-client";
-  version = "0.4.6";
-  sha256 = "0zv1jncacwxxk8dj1jlicjdlfhxigpl23frq2vrp4w76d1lsa0d8";
-  buildDepends = [
-    base64Bytestring blazeBuilder caseInsensitive cookie
-    dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
-    network networkUri publicsuffixlist random streamingCommons text
-    time transformers
-  ];
-  testDepends = [
-    async base64Bytestring blazeBuilder caseInsensitive deepseq hspec
-    httpTypes monadControl network streamingCommons text time
-    transformers zlib
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/snoyberg/http-client";
-    description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-common/default.nix b/pkgs/development/libraries/haskell/http-common/default.nix
deleted file mode 100644
index 61c76e55842..00000000000
--- a/pkgs/development/libraries/haskell/http-common/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, mtl
-, network, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-common";
-  version = "0.7.2.0";
-  sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
-  buildDepends = [
-    base64Bytestring blazeBuilder caseInsensitive mtl network text
-    transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://research.operationaldynamics.com/projects/http-streams/";
-    description = "Common types for HTTP clients and servers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
deleted file mode 100644
index bb5dc9f7505..00000000000
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra
-, connection, cookie, dataDefaultClass, hspec, httpClient
-, httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl
-, network, resourcet, streamingCommons, text, time, transformers
-, utf8String, wai, waiConduit, warp, warpTls
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-conduit";
-  version = "2.1.5";
-  sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003";
-  buildDepends = [
-    conduit httpClient httpClientTls httpTypes liftedBase monadControl
-    mtl resourcet transformers
-  ];
-  testDepends = [
-    blazeBuilder caseInsensitive conduit conduitExtra connection cookie
-    dataDefaultClass hspec httpClient httpTypes HUnit liftedBase
-    network streamingCommons text time transformers utf8String wai
-    waiConduit warp warpTls
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/http-conduit";
-    description = "HTTP client package with conduit interface and HTTPS support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
deleted file mode 100644
index 4c1e149225f..00000000000
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, doctest, hspec, time }:
-
-cabal.mkDerivation (self: {
-  pname = "http-date";
-  version = "0.0.4";
-  sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5";
-  buildDepends = [ attoparsec ];
-  testDepends = [ doctest hspec time ];
-  meta = {
-    description = "HTTP Date parser/formatter";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
deleted file mode 100644
index 63d6d68745c..00000000000
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, hspec, httpTypes, QuickCheck
-, quickcheckInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-kit";
-  version = "0.5.1";
-  sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
-  buildDepends = [ caseInsensitive httpTypes ];
-  testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
-  meta = {
-    description = "A low-level HTTP library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
deleted file mode 100644
index 61f4d91d5cc..00000000000
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, blazeBuilder, caseInsensitive, conduit
-, conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit
-, httpTypes, liftedBase, monadControl, network, resourcet
-, streamingCommons, text, transformers, wai, waiLogger, warp, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-reverse-proxy";
-  version = "0.4.1.2";
-  sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy";
-  buildDepends = [
-    async blazeBuilder caseInsensitive conduit conduitExtra
-    dataDefaultClass httpClient httpTypes liftedBase monadControl
-    network resourcet streamingCommons text transformers wai waiLogger
-    word8
-  ];
-  testDepends = [
-    blazeBuilder conduit conduitExtra hspec httpConduit httpTypes
-    liftedBase network resourcet streamingCommons transformers wai warp
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fpco/http-reverse-proxy";
-    description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix
deleted file mode 100644
index ec993a8b2a5..00000000000
--- a/pkgs/development/libraries/haskell/http-streams/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring
-, blazeBuilder, caseInsensitive, HsOpenSSL, hspec
-, hspecExpectations, httpCommon, HUnit, ioStreams
-, MonadCatchIOTransformers, mtl, network, networkUri
-, opensslStreams, snapCore, snapServer, systemFileio
-, systemFilepath, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-streams";
-  version = "0.7.2.4";
-  sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz";
-  buildDepends = [
-    aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
-    HsOpenSSL httpCommon ioStreams mtl network networkUri
-    opensslStreams text transformers unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty attoparsec base64Bytestring blazeBuilder
-    caseInsensitive HsOpenSSL hspec hspecExpectations httpCommon HUnit
-    ioStreams MonadCatchIOTransformers mtl network networkUri
-    opensslStreams snapCore snapServer systemFileio systemFilepath text
-    transformers unorderedContainers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://research.operationaldynamics.com/projects/http-streams/";
-    description = "An HTTP client using io-streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
deleted file mode 100644
index f07cb5581f8..00000000000
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck
-, quickcheckInstances, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "http-types";
-  version = "0.8.6";
-  sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
-  buildDepends = [ blazeBuilder caseInsensitive text ];
-  testDepends = [
-    blazeBuilder doctest hspec QuickCheck quickcheckInstances text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/aristidb/http-types";
-    description = "Generic HTTP types for Haskell (for both client and server code)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
deleted file mode 100644
index 4a4334be732..00000000000
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, networkUri }:
-
-cabal.mkDerivation (self: {
-  pname = "httpd-shed";
-  version = "0.4.0.3";
-  sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ network networkUri ];
-  jailbreak = true;
-  meta = {
-    description = "A simple web-server with an interact style API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix
deleted file mode 100644
index 1d7d17085dc..00000000000
--- a/pkgs/development/libraries/haskell/hweblib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, mtl, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "hweblib";
-  version = "0.6.3";
-  sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy";
-  buildDepends = [ attoparsec mtl text transformers ];
-  testDepends = [ attoparsec HUnit mtl transformers ];
-  meta = {
-    homepage = "http://github.com/aycanirican/hweblib";
-    description = "Haskell Web Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
deleted file mode 100644
index 45885432767..00000000000
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-charproperties";
-  version = "9.2.0.0";
-  sha256 = "01v3j0cg9pkp18iy4s8s582qqq98r4l9jzr84x5sa2rva4cg0gpi";
-  meta = {
-    homepage = "https://github.com/UweSchmidt/hxt";
-    description = "Character properties and classes for XML and Unicode";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-http/default.nix b/pkgs/development/libraries/haskell/hxt-http/default.nix
deleted file mode 100644
index a351b68d3d4..00000000000
--- a/pkgs/development/libraries/haskell/hxt-http/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, hxt, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-http";
-  version = "9.1.5";
-  sha256 = "172y08zx9q4qvdi7k9hg9qahp6qjs24r663il6fmynaw7szsiib9";
-  buildDepends = [ HTTP hxt network parsec ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "Interface to native Haskell HTTP package HTTP";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
deleted file mode 100644
index 6ebb0ba0d89..00000000000
--- a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-pickle-utils";
-  version = "0.1.0.2";
-  sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2";
-  buildDepends = [ hxt mtl ];
-  meta = {
-    homepage = "https://github.com/silkapp/hxt-pickle-utils";
-    description = "Utility functions for using HXT picklers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
deleted file mode 100644
index 71d6765f93f..00000000000
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, hxtCharproperties, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-regex-xmlschema";
-  version = "9.2.0";
-  sha256 = "0pcbyvc71173ad0zkgpdpyyljngrk4p1jjjaw5wbwcvm4ijh44g3";
-  buildDepends = [ hxtCharproperties parsec text ];
-  testDepends = [ HUnit parsec text ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
-    description = "A regular expression library for W3C XML Schema regular expressions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix b/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix
deleted file mode 100644
index efbbb3b4e4b..00000000000
--- a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, hxtCharproperties, hxtUnicode, tagsoup }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-tagsoup";
-  version = "9.1.3";
-  sha256 = "1rp499j6w3h9xfxqyw2fn05ffq3z0wg1r9h2c205m37mb8visq77";
-  buildDepends = [ hxt hxtCharproperties hxtUnicode tagsoup ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "TagSoup parser for HXT";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
deleted file mode 100644
index 777d4315f52..00000000000
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxtCharproperties }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-unicode";
-  version = "9.0.2.2";
-  sha256 = "1iljbk7f7d4wkl592bp0vw807683sqdxfnigindkrvr9p1xvwg8r";
-  buildDepends = [ hxtCharproperties ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt-xpath/default.nix b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
deleted file mode 100644
index 9176d085859..00000000000
--- a/pkgs/development/libraries/haskell/hxt-xpath/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hxt, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "hxt-xpath";
-  version = "9.1.2.1";
-  sha256 = "0r9xzxwdqaj0arz9pv6f272dz73m83agbln9q9bclmgqys6l0kr9";
-  buildDepends = [ filepath hxt parsec ];
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "The XPath modules for HXT";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
deleted file mode 100644
index db2badaaaf2..00000000000
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, filepath, HUnit, hxtCharproperties
-, hxtRegexXmlschema, hxtUnicode, mtl, networkUri, parsec
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hxt";
-  version = "9.3.1.7";
-  sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i";
-  buildDepends = [
-    binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
-    hxtUnicode mtl networkUri parsec
-  ];
-  configureFlags = "-fnetwork-uri";
-  meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-    description = "A collection of tools for processing XML with Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
deleted file mode 100644
index ccbc4ed7b11..00000000000
--- a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "hybrid-vectors";
-  version = "0.1.2";
-  sha256 = "1scx1xr9rqdpxc1kj5zgf8w1ld1mj68hxr3nl1p352wspvpgd3qf";
-  buildDepends = [ deepseq primitive vector ];
-  meta = {
-    homepage = "http://github.com/ekmett/hybrid-vectors";
-    description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
deleted file mode 100644
index 734c7587aa9..00000000000
--- a/pkgs/development/libraries/haskell/iCalendar/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl
-, network, networkUri, parsec, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iCalendar";
-  version = "0.4.0.2";
-  sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry";
-  buildDepends = [
-    base64Bytestring caseInsensitive dataDefault mime mtl network
-    networkUri parsec text time
-  ];
-  meta = {
-    homepage = "http://github.com/tingtun/iCalendar";
-    description = "iCalendar data types, parser, and printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix
deleted file mode 100644
index a3b1144755d..00000000000
--- a/pkgs/development/libraries/haskell/idna/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, punycode, stringprep, text }:
-
-cabal.mkDerivation (self: {
-  pname = "idna";
-  version = "0.3.0";
-  sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
-  buildDepends = [ punycode stringprep text ];
-  meta = {
-    description = "Implements IDNA (RFC 3490)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
deleted file mode 100644
index de0ce49c83e..00000000000
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ieee754";
-  version = "0.7.4";
-  sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h";
-  meta = {
-    homepage = "http://github.com/patperry/hs-ieee754";
-    description = "Utilities for dealing with IEEE floating point numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
deleted file mode 100644
index e21c596fa2f..00000000000
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
-, filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
-, monadControl, mtl, network, networkUri, opml, random, resourcet
-, text, textIcu, time, timerep, tls, transformers, transformersBase
-, utf8String, xdgBasedir, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "imm";
-  version = "0.6.0.3";
-  sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async caseInsensitive cond dataDefault dyre feed filepath hslogger
-    httpConduit httpTypes lens mimeMail monadControl mtl network
-    networkUri opml random resourcet text textIcu time timerep tls
-    transformers transformersBase utf8String xdgBasedir xml
-  ];
-  meta = {
-    description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix
deleted file mode 100644
index 81331833cc4..00000000000
--- a/pkgs/development/libraries/haskell/implicit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeMarkup, blazeSvg, deepseq, filepath
-, JuicyPixels, mtl, optparseApplicative, parallel, parsec
-, storableEndian, text, unorderedContainers, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "implicit";
-  version = "0.0.3";
-  sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder blazeMarkup blazeSvg deepseq filepath JuicyPixels mtl
-    optparseApplicative parallel parsec storableEndian text
-    unorderedContainers vectorSpace
-  ];
-  meta = {
-    homepage = "https://github.com/colah/ImplicitCAD";
-    description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix
deleted file mode 100644
index 111268cc9f3..00000000000
--- a/pkgs/development/libraries/haskell/indents/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, concatenative, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "indents";
-  version = "0.3.3";
-  sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-  buildDepends = [ concatenative mtl parsec ];
-  meta = {
-    homepage = "http://patch-tag.com/r/salazar/indents";
-    description = "indentation sensitive parser-combinators for parsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indexed-free/default.nix b/pkgs/development/libraries/haskell/indexed-free/default.nix
deleted file mode 100644
index 23d2cedaa65..00000000000
--- a/pkgs/development/libraries/haskell/indexed-free/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, indexed }:
-
-cabal.mkDerivation (self: {
-  pname = "indexed-free";
-  version = "0.3.1";
-  sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
-  buildDepends = [ indexed ];
-  meta = {
-    homepage = "https://github.com/fumieval/indexed-free";
-    description = "indexed monads for free";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/indexed/default.nix b/pkgs/development/libraries/haskell/indexed/default.nix
deleted file mode 100644
index f38468a834d..00000000000
--- a/pkgs/development/libraries/haskell/indexed/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "indexed";
-  version = "0.1";
-  sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12";
-  meta = {
-    homepage = "https://github.com/reinerp/indexed";
-    description = "Haskell98 indexed functors, monads, comonads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
deleted file mode 100644
index ecb9321686c..00000000000
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "instant-generics";
-  version = "0.4.1";
-  sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
-    description = "Generic programming library with a sum of products view";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interlude/default.nix b/pkgs/development/libraries/haskell/interlude/default.nix
deleted file mode 100644
index c4c0ae2a1df..00000000000
--- a/pkgs/development/libraries/haskell/interlude/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "interlude";
-  version = "0.1.2";
-  sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
-  meta = {
-    homepage = "http://malde.org/~ketil/";
-    description = "Replaces some Prelude functions for enhanced error reporting";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/intern/default.nix b/pkgs/development/libraries/haskell/intern/default.nix
deleted file mode 100644
index 7dddb5b5f88..00000000000
--- a/pkgs/development/libraries/haskell/intern/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "intern";
-  version = "0.9.1.3";
-  sha256 = "1629m3an18m3nqxq40mg9cn0c6rma1wm3jr7kn6kqpw4xq53zvvp";
-  buildDepends = [ hashable text unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/intern/";
-    description = "Efficient hash-consing for arbitrary data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix
deleted file mode 100644
index cc62218a928..00000000000
--- a/pkgs/development/libraries/haskell/interpolate/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "interpolate";
-  version = "0.1.0";
-  sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
-  buildDepends = [ haskellSrcMeta ];
-  testDepends = [
-    haskellSrcMeta hspec QuickCheck quickcheckInstances text
-  ];
-  meta = {
-    description = "String interpolation done right";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
deleted file mode 100644
index b24a79e62d9..00000000000
--- a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcMeta, text }:
-
-cabal.mkDerivation (self: {
-  pname = "interpolatedstring-perl6";
-  version = "0.9.0";
-  sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
-  buildDepends = [ haskellSrcMeta text ];
-  meta = {
-    description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
deleted file mode 100644
index 8c552654bac..00000000000
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributive, doctest, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "intervals";
-  version = "0.7.0.1";
-  sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9";
-  buildDepends = [ distributive ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/intervals";
-    description = "Interval Arithmetic";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
deleted file mode 100644
index 1b145c943dc..00000000000
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, liftedBase, monadControl, transformers
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "io-choice";
-  version = "0.0.5";
-  sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
-  buildDepends = [
-    liftedBase monadControl transformers transformersBase
-  ];
-  testDepends = [ hspec liftedBase monadControl transformers ];
-  meta = {
-    description = "Choice for IO and lifted IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix
deleted file mode 100644
index 625d689cd40..00000000000
--- a/pkgs/development/libraries/haskell/io-memoize/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async }:
-
-cabal.mkDerivation (self: {
-  pname = "io-memoize";
-  version = "1.1.1.0";
-  sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
-  buildDepends = [ async ];
-  meta = {
-    homepage = "https://github.com/DanBurton/io-memoize";
-    description = "Memoize IO actions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
deleted file mode 100644
index 2e944b77586..00000000000
--- a/pkgs/development/libraries/haskell/io-storage/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "io-storage";
-  version = "0.3";
-  sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
-  meta = {
-    homepage = "http://github.com/willdonnelly/io-storage";
-    description = "A key-value store in the IO monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
deleted file mode 100644
index 3963add1825..00000000000
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl
-, network, primitive, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time, transformers, vector, zlib
-, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "io-streams";
-  version = "1.2.1.1";
-  sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1";
-  buildDepends = [
-    attoparsec blazeBuilder network primitive text time transformers
-    vector zlibBindings
-  ];
-  testDepends = [
-    attoparsec blazeBuilder deepseq filepath HUnit mtl network
-    primitive QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time transformers vector zlib
-    zlibBindings
-  ];
-  configureFlags = "-fNoInteractiveTests";
-  meta = {
-    description = "Simple, composable, and easy-to-use stream I/O";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix
deleted file mode 100644
index 004b504577a..00000000000
--- a/pkgs/development/libraries/haskell/ipprint/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Extra, haskellSrc }:
-
-cabal.mkDerivation (self: {
-  pname = "ipprint";
-  version = "0.5";
-  sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
-  buildDepends = [ Extra haskellSrc ];
-  meta = {
-    description = "Tiny helper for pretty-printing values in ghci console";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-
-    # Works For Me. GHC 7.8.4, 2015-01-08 
-    #broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
deleted file mode 100644
index cfb05b9f094..00000000000
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, appar, byteorder, doctest, hspec, network, QuickCheck
-, safe
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iproute";
-  version = "1.3.1";
-  sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp";
-  buildDepends = [ appar byteorder network ];
-  testDepends = [
-    appar byteorder doctest hspec network QuickCheck safe
-  ];
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/iproute/";
-    description = "IP Routing Table";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
deleted file mode 100644
index d7c101c27fb..00000000000
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec }:
-
-cabal.mkDerivation (self: {
-  pname = "irc";
-  version = "0.6.0.1";
-  sha256 = "0524phrxjv0i5qabrf4sj0zpcvkdvcivv1lg46591pmvndfhpyn4";
-  buildDepends = [ attoparsec ];
-  meta = {
-    description = "A small library for parsing IRC messages";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
deleted file mode 100644
index b0dd47468d9..00000000000
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "iteratee";
-  version = "0.8.9.6";
-  sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
-  buildDepends = [
-    exceptions ListLike monadControl parallel transformers
-    transformersBase
-  ];
-  testDepends = [
-    exceptions HUnit ListLike monadControl mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "http://www.tiresiaspress.us/haskell/iteratee";
-    description = "Iteratee-based I/O";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
deleted file mode 100644
index 7a80a14853e..00000000000
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "ivor";
-  version = "0.1.14.1";
-  sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
-  buildDepends = [ binary mtl parsec ];
-  meta = {
-    homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
-    description = "Theorem proving library based on dependent type theory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ivory/default.nix b/pkgs/development/libraries/haskell/ivory/default.nix
deleted file mode 100644
index 3e3c6c78ae1..00000000000
--- a/pkgs/development/libraries/haskell/ivory/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadLib, parsec, thLift }:
-
-cabal.mkDerivation (self: {
-  pname = "ivory";
-  version = "0.1.0.0";
-  sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
-  buildDepends = [ monadLib parsec thLift ];
-  meta = {
-    homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
-    description = "Safe embedded C programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ix-shapable/default.nix b/pkgs/development/libraries/haskell/ix-shapable/default.nix
deleted file mode 100644
index 965257832e0..00000000000
--- a/pkgs/development/libraries/haskell/ix-shapable/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ix-shapable";
-  version = "0.1.0";
-  sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
-  meta = {
-    description = "Reshape multi-dimensional arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix
deleted file mode 100644
index 24bbde7098d..00000000000
--- a/pkgs/development/libraries/haskell/ixset/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, safecopy, syb, sybWithClass }:
-
-cabal.mkDerivation (self: {
-  pname = "ixset";
-  version = "1.0.6";
-  sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
-  buildDepends = [ safecopy syb sybWithClass ];
-  meta = {
-    homepage = "http://happstack.com";
-    description = "Efficient relational queries on Haskell sets";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
deleted file mode 100644
index 1abb8fd3847..00000000000
--- a/pkgs/development/libraries/haskell/jack/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumset, eventList, explicitException, jack2, midi
-, nonNegative, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jack";
-  version = "0.7.0.3";
-  sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    enumset eventList explicitException midi nonNegative transformers
-  ];
-  pkgconfigDepends = [ jack2 ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/JACK";
-    description = "Bindings for the JACK Audio Connection Kit";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = with self.stdenv.lib.maintainers; [ ertes ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
deleted file mode 100644
index 28498da53d6..00000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, happstackServer, jmacro, jmacroRpc, mtl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc-happstack";
-  version = "0.3";
-  sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa";
-  buildDepends = [
-    aeson blazeHtml happstackServer jmacro jmacroRpc mtl
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
-    description = "Happstack backend for jmacro-rpc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
deleted file mode 100644
index 2ad9bd83d75..00000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, jmacro, jmacroRpc, mtl, snapCore }:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc-snap";
-  version = "0.3";
-  sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
-  buildDepends = [ aeson jmacro jmacroRpc mtl snapCore ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
-    description = "Snap backend for jmacro-rpc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
deleted file mode 100644
index ec2c3d8a960..00000000000
--- a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeHtml, contravariant, jmacro, mtl
-, scientific, split, text, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro-rpc";
-  version = "0.3";
-  sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw";
-  buildDepends = [
-    aeson attoparsec blazeHtml contravariant jmacro mtl scientific
-    split text unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/gershomb/jmacro";
-    description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix
deleted file mode 100644
index 9f2fee5f7da..00000000000
--- a/pkgs/development/libraries/haskell/jmacro/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, haskellSrcExts, haskellSrcMeta, mtl, parseargs
-, parsec, regexPosix, safe, syb, text, unorderedContainers, vector
-, wlPprintText
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jmacro";
-  version = "0.6.9";
-  sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson haskellSrcExts haskellSrcMeta mtl parseargs parsec regexPosix
-    safe syb text unorderedContainers vector wlPprintText
-  ];
-  meta = {
-    description = "QuasiQuotation library for programmatic generation of Javascript code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
deleted file mode 100644
index c9a408dc2a0..00000000000
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "jpeg";
-  version = "0.0.1.1";
-  sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "A library for decoding JPEG files written in pure Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/js-flot/default.nix b/pkgs/development/libraries/haskell/js-flot/default.nix
deleted file mode 100644
index 3bc570d557d..00000000000
--- a/pkgs/development/libraries/haskell/js-flot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP }:
-
-cabal.mkDerivation (self: {
-  pname = "js-flot";
-  version = "0.8.3";
-  sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
-  testDepends = [ HTTP ];
-  meta = {
-    homepage = "https://github.com/ndmitchell/js-flot#readme";
-    description = "Obtain minified flot code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix
deleted file mode 100644
index ad776b577f4..00000000000
--- a/pkgs/development/libraries/haskell/js-jquery/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP }:
-
-cabal.mkDerivation (self: {
-  pname = "js-jquery";
-  version = "1.11.1";
-  sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d";
-  testDepends = [ HTTP ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/ndmitchell/js-jquery#readme";
-    description = "Obtain minified jQuery code";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
deleted file mode 100644
index 9a9364d09d0..00000000000
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, indexed, indexedFree, lens, lensAeson, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json-assertions";
-  version = "1.0.5";
-  sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
-  buildDepends = [ aeson indexed indexedFree lens lensAeson text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/json-assertions.git";
-    description = "Test that your (Aeson) JSON encoding matches your expectations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix
deleted file mode 100644
index c7e5c3373c5..00000000000
--- a/pkgs/development/libraries/haskell/json-rpc/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, conduit, conduitExtra, deepseq, hashable
-, mtl, QuickCheck, stm, stmConduit, testFramework
-, testFrameworkQuickcheck2, text, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-rpc";
-  version = "0.2.1.1";
-  sha256 = "0h6dkb1rgd6qxzcxvqvgwilmibkdbqpjvflijwf54fx2z687fjld";
-  buildDepends = [
-    aeson async conduit conduitExtra deepseq hashable mtl stm
-    stmConduit text unorderedContainers
-  ];
-  testDepends = [
-    aeson async conduit conduitExtra deepseq hashable mtl QuickCheck
-    stm stmConduit testFramework testFrameworkQuickcheck2 text
-    unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/xenog/json-rpc";
-    description = "Fully-featured JSON-RPC 2.0 library";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
deleted file mode 100644
index cd102d35803..00000000000
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonUtils, attoparsec, genericAeson
-, genericDeriving, mtl, scientific, tagged, tasty, tastyHunit
-, tastyTh, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-schema";
-  version = "0.7.3.0";
-  sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw";
-  buildDepends = [
-    aeson genericAeson genericDeriving mtl scientific tagged text time
-    unorderedContainers vector
-  ];
-  testDepends = [
-    aeson aesonUtils attoparsec genericAeson tagged tasty tastyHunit
-    tastyTh text vector
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Types and type classes for defining JSON schemas";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
deleted file mode 100644
index 3eeb6958f83..00000000000
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json";
-  version = "0.9";
-  sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j";
-  buildDepends = [ mtl parsec syb text ];
-  meta = {
-    description = "Support for serialising Haskell to and from JSON";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix
deleted file mode 100644
index 2c6323f0bc6..00000000000
--- a/pkgs/development/libraries/haskell/jsonTypes/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "json-types";
-  version = "0.1";
-  sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
-  buildDepends = [ text ];
-  meta = {
-    description = "Basic types for representing JSON";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
deleted file mode 100644
index dfab13e9132..00000000000
--- a/pkgs/development/libraries/haskell/jwt/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, cryptohash, dataDefault
-, httpTypes, HUnit, lens, lensAeson, network, networkUri
-, QuickCheck, scientific, semigroups, tasty, tastyHunit
-, tastyQuickcheck, tastyTh, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "jwt";
-  version = "0.5.3";
-  sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
-  buildDepends = [
-    aeson base64Bytestring cryptohash dataDefault httpTypes network
-    networkUri scientific semigroups text time unorderedContainers
-    vector
-  ];
-  testDepends = [
-    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit lens
-    lensAeson network networkUri QuickCheck scientific semigroups tasty
-    tastyHunit tastyQuickcheck tastyTh text time unorderedContainers
-    vector
-  ];
-  meta = {
-    homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
-    description = "JSON Web Token (JWT) decoding and encoding";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix
deleted file mode 100644
index d359cebd6e1..00000000000
--- a/pkgs/development/libraries/haskell/kan-extensions/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, comonad, contravariant, distributive, free
-, mtl, pointed, semigroupoids, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kan-extensions";
-  version = "4.1.1";
-  sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar";
-  buildDepends = [
-    adjunctions comonad contravariant distributive free mtl pointed
-    semigroupoids tagged transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/kan-extensions/";
-    description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kansas-comet/default.nix b/pkgs/development/libraries/haskell/kansas-comet/default.nix
deleted file mode 100644
index 1c01d567d75..00000000000
--- a/pkgs/development/libraries/haskell/kansas-comet/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, dataDefault, scotty, stm, text, time, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kansas-comet";
-  version = "0.3.1";
-  sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
-  buildDepends = [
-    aeson dataDefault scotty stm text time transformers
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/ku-fpg/kansas-comet/";
-    description = "A JavaScript push mechanism based on the comet idiom";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix
deleted file mode 100644
index f81f17a3c27..00000000000
--- a/pkgs/development/libraries/haskell/kansas-lava/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, dataDefault, dataReify, dotgen, filepath, netlist
-, netlistToVhdl, random, sizedTypes, strict
-}:
-
-cabal.mkDerivation (self: {
-  pname = "kansas-lava";
-  version = "0.2.4";
-  sha256 = "0rsjlj558k57r1sfm12n9r9wn8r615bbrwgjhal07qhvy4qip4pg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs dataDefault dataReify dotgen filepath netlist netlistToVhdl
-    random sizedTypes strict
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
-    description = "Kansas Lava is a hardware simulator and VHDL generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix
deleted file mode 100644
index 196da768e06..00000000000
--- a/pkgs/development/libraries/haskell/keys/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, free, semigroupoids, semigroups, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "keys";
-  version = "3.10.1";
-  sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
-  buildDepends = [
-    comonad free semigroupoids semigroups transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/keys/";
-    description = "Keyed functors and containers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/knob/default.nix b/pkgs/development/libraries/haskell/knob/default.nix
deleted file mode 100644
index 7ad084e06b7..00000000000
--- a/pkgs/development/libraries/haskell/knob/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "knob";
-  version = "0.1.1";
-  sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "https://john-millikin.com/software/knob/";
-    description = "Memory-backed handles";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix
deleted file mode 100644
index ef0301ef773..00000000000
--- a/pkgs/development/libraries/haskell/labeled-tree/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "labeled-tree";
-  version = "1.0.0.0";
-  sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
-  meta = {
-    description = "Labeled tree structure";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
deleted file mode 100644
index 34cf827c027..00000000000
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, haskellSrc, mtl, network, random, regexCompat
-, regexPosix, syb, tagsoup, utf8String, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdabot-utils";
-  version = "4.2.2";
-  sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
-  buildDepends = [
-    binary haskellSrc mtl network random regexCompat regexPosix syb
-    tagsoup utf8String zlib
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Lambdabot";
-    description = "Utility libraries for the advanced IRC bot, Lambdabot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
deleted file mode 100644
index 6b09752f7d4..00000000000
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, arrows, binary, brainfuck, dataMemocombinators
-, dependentMap, dependentSum, dependentSumTemplate, dice
-, editDistance, filepath, haskeline, haskellSrcExts, hoogle
-, hslogger, hstatsd, HTTP, IOSpec, liftedBase, logict, misfortune
-, monadControl, MonadRandom, mtl, mueval, network, numbers, oeis
-, parsec, QuickCheck, random, randomFu, randomSource, regexTdfa
-, SafeSemaphore, show, split, syb, tagsoup, time, transformers
-, transformersBase, unlambda, utf8String, vectorSpace, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdabot";
-  version = "4.3.0.1";
-  sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb";
-  isLibrary = true;
-  isExecutable = true;
-  patches = [ ./deps.patch ];
-  buildDepends = [
-    arrows binary brainfuck dataMemocombinators dependentMap
-    dependentSum dependentSumTemplate dice editDistance filepath
-    haskeline haskellSrcExts hoogle hslogger hstatsd HTTP IOSpec
-    liftedBase logict misfortune monadControl MonadRandom mtl mueval
-    network numbers oeis parsec QuickCheck random randomFu randomSource
-    regexTdfa SafeSemaphore show split syb tagsoup time transformers
-    transformersBase unlambda utf8String vectorSpace zlib
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Lambdabot";
-    description = "Lambdabot is a development tool and advanced IRC bot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lambdabot/deps.patch b/pkgs/development/libraries/haskell/lambdabot/deps.patch
deleted file mode 100644
index a9222806719..00000000000
--- a/pkgs/development/libraries/haskell/lambdabot/deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lambdabot.cabal.orig	2014-10-16 17:39:16.000000000 -0500
-+++ b/lambdabot.cabal	2014-10-16 18:26:58.000000000 -0500
-@@ -166,7 +166,7 @@
-                         edit-distance           >= 0.2,
-                         filepath                >= 1.3,
-                         haskeline               >= 0.7,
--                        haskell-src-exts        >= 1.14.0,
-+                        haskell-src-exts        >= 1.14.0 && < 1.16,
-                         hstatsd                 >= 0.1,
-                         hslogger                >= 1.2.1,
-                         HTTP                    >= 4000,
-@@ -174,7 +174,8 @@
-                         misfortune              >= 0.1,
-                         monad-control           >= 0.3,
-                         mtl                     >= 2,
--                        network                 >= 2.3.0.13,
-+                        network                 >= 2.6,
-+                        network-uri             >= 2.6,
-                         oeis                    >= 0.3.1,
-                         time                    >= 1.4,
-                         parsec                  >= 3,
diff --git a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix
deleted file mode 100644
index a29d73fe72f..00000000000
--- a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lambdabot, mueval, ghc, makeWrapper }:
-
-stdenv.mkDerivation {
-  name = "lambdabot-wrapper";
-
-  buildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    makeWrapper "${lambdabot}/bin/lambdabot" "$out/bin/lambdabot" \
-      --prefix PATH : "${ghc}/bin:${mueval}/bin"
-  '';
-
-  preferLocalBuild = true;
-
-  meta = lambdabot.meta;
-}
diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
deleted file mode 100644
index 62f09047101..00000000000
--- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw
-, stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lambdacube-engine";
-  version = "0.2.4";
-  sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
-  buildDepends = [
-    binary bitmap bytestringTrie filepath mtl OpenGLRaw stbImage uulib
-    vect vector vectorAlgorithms xml zipArchive
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
-    description = "3D rendering engine written entirely in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
deleted file mode 100644
index 720d7dd8926..00000000000
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, languageCQuote, mainlandPretty }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c-inline";
-  version = "0.7.7.0";
-  sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6";
-  buildDepends = [ filepath languageCQuote mainlandPretty ];
-  testDepends = [ languageCQuote ];
-  meta = {
-    homepage = "https://github.com/mchakravarty/language-c-inline/";
-    description = "Inline C & Objective-C code in Haskell for language interoperability";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
deleted file mode 100644
index 03b1d62546b..00000000000
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
-, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-c-quote";
-  version = "0.10.1.3";
-  sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k";
-  buildDepends = [
-    exceptionMtl exceptionTransformers filepath haskellSrcMeta
-    mainlandPretty mtl srcloc syb symbol
-  ];
-  testDepends = [
-    HUnit srcloc symbol testFramework testFrameworkHunit
-  ];
-  buildTools = [ alex happy ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix
deleted file mode 100644
index 9346a10bdf2..00000000000
--- a/pkgs/development/libraries/haskell/language-c/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, filepath, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c";
-  version = "0.4.7";
-  sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
-  buildDepends = [ filepath syb ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://www.sivity.net/projects/language.c/";
-    description = "Analysis and generation of C code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
deleted file mode 100644
index f2f77fb9dd3..00000000000
--- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-ecmascript";
-  version = "0.16.2";
-  sha256 = "15jvq3wblx67hhvgblqzfdnks6x17hfnivifps5wfs9v1ljkiq1k";
-  buildDepends = [
-    dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate
-    wlPprint
-  ];
-  testDepends = [
-    dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 uniplate
-    wlPprint
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jswebtools/language-ecmascript";
-    description = "JavaScript parser and pretty-printer library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
deleted file mode 100644
index 6d983123cb6..00000000000
--- a/pkgs/development/libraries/haskell/language-glsl/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, prettyclass, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-glsl";
-  version = "0.1.1";
-  sha256 = "06dc339a2cddzgjda3nzprgr0v2clbhlpl8j81m04i66bbj2l15y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ parsec prettyclass ];
-  testDepends = [
-    HUnit parsec prettyclass testFramework testFrameworkHunit
-  ];
-  meta = {
-    description = "GLSL abstract syntax tree, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
deleted file mode 100644
index da190862c01..00000000000
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "language-haskell-extract";
-  version = "0.2.4";
-  sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
-  buildDepends = [ regexPosix ];
-  meta = {
-    homepage = "http://github.com/finnsson/template-helper";
-    description = "Module to automatically extract functions from the local code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
deleted file mode 100644
index dc35a8867ba..00000000000
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-java";
-  version = "0.2.7";
-  sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
-  buildDepends = [ cpphs parsec syb ];
-  testDepends = [
-    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  buildTools = [ alex ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/language-java";
-    description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
deleted file mode 100644
index 166b5bd5c09..00000000000
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck
-, testFramework, testFrameworkHunit, utf8Light, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-javascript";
-  version = "0.5.13";
-  sha256 = "0h46wfh5xi3gbiaplx3ikmj7mfcwm1d37i5c9n3qfsmmkac29n2w";
-  buildDepends = [ blazeBuilder mtl utf8String ];
-  testDepends = [
-    blazeBuilder Cabal HUnit mtl QuickCheck testFramework
-    testFrameworkHunit utf8Light utf8String
-  ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://github.com/alanz/language-javascript";
-    description = "Parser for JavaScript";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
deleted file mode 100644
index d743c7eee3a..00000000000
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "largeword";
-  version = "1.2.3";
-  sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
-  buildDepends = [ binary ];
-  testDepends = [
-    binary HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/idontgetoutmuch/largeword";
-    description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lattices/default.nix b/pkgs/development/libraries/haskell/lattices/default.nix
deleted file mode 100644
index d37b6d2e883..00000000000
--- a/pkgs/development/libraries/haskell/lattices/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lattices";
-  version = "1.2.1.1";
-  sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6";
-  meta = {
-    description = "Fine-grained library for constructing and manipulating lattices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
deleted file mode 100644
index d38e4528d25..00000000000
--- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lazysmallcheck";
-  version = "0.6";
-  sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
-  meta = {
-    homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
-    description = "A library for demand-driven testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
deleted file mode 100644
index f1fcd255b5f..00000000000
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
-, lens, scientific, semigroups, simpleReflect, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens-aeson";
-  version = "1.0.0.3";
-  sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac";
-  buildDepends = [
-    aeson attoparsec lens scientific text unorderedContainers vector
-  ];
-  testDepends = [
-    doctest filepath genericDeriving semigroups simpleReflect
-  ];
-  meta = {
-    homepage = "http://github.com/lens/lens-aeson/";
-    description = "Law-abiding lenses for aeson";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix
deleted file mode 100644
index 23084746ea2..00000000000
--- a/pkgs/development/libraries/haskell/lens-datetime/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, time }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-datetime";
-  version = "0.2.1";
-  sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
-  buildDepends = [ lens time ];
-  meta = {
-    homepage = "http://github.com/nilcons/lens-datetime";
-    description = "Lenses for Data.Time.* types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
deleted file mode 100644
index 94a53898325..00000000000
--- a/pkgs/development/libraries/haskell/lens-family-core/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family-core";
-  version = "1.2.0";
-  sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Haskell 98 Lens Families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family-th/default.nix b/pkgs/development/libraries/haskell/lens-family-th/default.nix
deleted file mode 100644
index a2ecf7b61ef..00000000000
--- a/pkgs/development/libraries/haskell/lens-family-th/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family-th";
-  version = "0.4.0.0";
-  sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5";
-  meta = {
-    homepage = "http://github.com/DanBurton/lens-family-th#readme";
-    description = "Generate lens-family style lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix
deleted file mode 100644
index 58ce93e1b65..00000000000
--- a/pkgs/development/libraries/haskell/lens-family/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lensFamilyCore, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "lens-family";
-  version = "1.2.0";
-  sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
-  buildDepends = [ lensFamilyCore mtl transformers ];
-  meta = {
-    description = "Lens Families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
deleted file mode 100644
index f82368422e4..00000000000
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, exceptions, filepath, free, genericDeriving, hashable
-, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens";
-  version = "4.6.0.1";
-  sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2";
-  buildDepends = [
-    bifunctors comonad contravariant distributive exceptions filepath
-    free hashable mtl parallel primitive profunctors reflection
-    semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void
-  ];
-  testDepends = [
-    deepseq doctest filepath genericDeriving hlint HUnit mtl nats
-    parallel QuickCheck semigroups simpleReflect split testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
-    transformers unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/lens/";
-    description = "Lenses, Folds and Traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lenses/default.nix b/pkgs/development/libraries/haskell/lenses/default.nix
deleted file mode 100644
index debe3061798..00000000000
--- a/pkgs/development/libraries/haskell/lenses/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "lenses";
-  version = "0.1.6";
-  sha256 = "0n2r7gjiq5vk6jjaxn7kr3g5gvn4y0gmdqpn9l0nfgqdnscmfbiv";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://github.com/jvranish/Lenses/tree/master";
-    description = "Simple Functional Lenses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
deleted file mode 100644
index 2e3ba003233..00000000000
--- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, dataDefault, exceptions, filepath, leveldb, mtl
-, QuickCheck, resourcet, snappy, tasty, tastyQuickcheck, temporary
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "leveldb-haskell";
-  version = "0.6";
-  sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async dataDefault exceptions filepath resourcet transformers
-  ];
-  testDepends = [
-    dataDefault exceptions mtl QuickCheck tasty tastyQuickcheck
-    temporary transformers
-  ];
-  extraLibraries = [ leveldb snappy ];
-  meta = {
-    homepage = "http://github.com/kim/leveldb-haskell";
-    description = "Haskell bindings to LevelDB";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libffi/default.nix b/pkgs/development/libraries/haskell/libffi/default.nix
deleted file mode 100644
index 6b5892bce45..00000000000
--- a/pkgs/development/libraries/haskell/libffi/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libffi }:
-
-cabal.mkDerivation (self: {
-  pname = "libffi";
-  version = "0.1";
-  sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
-  pkgconfigDepends = [ libffi ];
-  meta = {
-    description = "A binding to libffi";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
deleted file mode 100644
index a873616f3c0..00000000000
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, doctest, filepath, free, hspec
-, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens
-, liftedAsync, liftedBase, monadControl, mtl, network, networkUri
-, profunctors, text, transformers, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libjenkins";
-  version = "0.6.0";
-  sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4";
-  buildDepends = [
-    attoparsec free httpClient httpClientTls httpTypes liftedAsync
-    liftedBase monadControl mtl network networkUri profunctors text
-    transformers
-  ];
-  testDepends = [
-    async attoparsec doctest filepath free hspec hspecExpectationsLens
-    httpClient httpClientTls httpTypes lens liftedAsync liftedBase
-    monadControl mtl network networkUri profunctors text transformers
-    xmlConduit
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Jenkins API interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch b/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
deleted file mode 100644
index fda68fde5f9..00000000000
--- a/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur libjenkins-0.4.2.0-orig/libjenkins.cabal libjenkins-0.4.2.0/libjenkins.cabal
---- libjenkins-0.4.2.0-orig/libjenkins.cabal	2014-02-17 13:11:22.000000000 -0500
-+++ libjenkins-0.4.2.0/libjenkins.cabal	2014-04-07 11:40:30.046473593 -0400
-@@ -52,6 +52,7 @@
-     , text          >= 0.11
-     , transformers  >= 0.3
-     , xml-conduit   >= 1.1
-+    , resourcet
- 
- test-suite doctest
-   default-language:  Haskell2010
-diff -Naur libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs
---- libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs	2014-02-17 13:11:22.000000000 -0500
-+++ libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs	2014-04-07 11:40:02.221415450 -0400
-@@ -22,7 +22,7 @@
- import           Control.Monad.Trans.Reader (ReaderT, runReaderT, ask, local)
- import           Control.Monad.Trans.Maybe (MaybeT(..), mapMaybeT)
- import           Data.ByteString.Lazy (ByteString)
--import           Data.Conduit (ResourceT)
-+import           Control.Monad.Trans.Resource (ResourceT)
- import           Data.Data (Data, Typeable)
- import           Data.Text (Text)
- import qualified Data.Text.Encoding as Text
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
deleted file mode 100644
index abfa8a0496b..00000000000
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, cereal, cryptoApi, hspec, hspecExpectationsLens
-, httpClient, httpClientTls, HUnit, lens, lensAeson, networkUri
-, profunctors, pureMD5, semigroups, text, xmlConduit
-, xmlHtmlConduitLens
-}:
-
-cabal.mkDerivation (self: {
-  pname = "liblastfm";
-  version = "0.5.1";
-  sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
-  buildDepends = [
-    aeson cereal cryptoApi httpClient httpClientTls networkUri
-    profunctors pureMD5 semigroups text xmlConduit
-  ];
-  testDepends = [
-    aeson cereal cryptoApi hspec hspecExpectationsLens httpClient
-    httpClientTls HUnit lens lensAeson networkUri profunctors pureMD5
-    text xmlConduit xmlHtmlConduitLens
-  ];
-  meta = {
-    description = "Lastfm API interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
deleted file mode 100644
index 6dc0aede069..00000000000
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, dataDefault, filepath, hspec, mtl, network
-, QuickCheck, text, time, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libmpd";
-  version = "0.9.0.1";
-  sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd";
-  buildDepends = [
-    attoparsec dataDefault filepath mtl network text time utf8String
-  ];
-  testDepends = [
-    attoparsec dataDefault filepath hspec mtl network QuickCheck text
-    time utf8String
-  ];
-  meta = {
-    homepage = "http://github.com/vimus/libmpd-haskell#readme";
-    description = "An MPD client library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix
deleted file mode 100644
index 8ed4e80d49f..00000000000
--- a/pkgs/development/libraries/haskell/libnotify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk, libnotify }:
-
-cabal.mkDerivation (self: {
-  pname = "libnotify";
-  version = "0.1.1.0";
-  sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
-  buildDepends = [ glib gtk ];
-  extraLibraries = [ libnotify ];
-  meta = {
-    description = "Bindings to libnotify library";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
deleted file mode 100644
index e4dc138eae0..00000000000
--- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text
-, transformers, uniplate, unixBytestring, unorderedContainers, uuid
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "libsystemd-journal";
-  version = "1.2.0";
-  sha256 = "10gsqcy5f7m6f0giqhfcqspb17b3gyib4cpw5nrdl7hiah13hi7x";
-  buildDepends = [
-    hashable hsyslog pipes pipesSafe text transformers uniplate
-    unixBytestring unorderedContainers uuid vector
-  ];
-  extraLibraries = [ systemd ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/libsystemd-journal";
-    description = "Haskell bindings to libsystemd-journal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
deleted file mode 100644
index 43f4e19029b..00000000000
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libxml2, text, xmlTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "libxml-sax";
-  version = "0.7.5";
-  sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
-  buildDepends = [ text xmlTypes ];
-  extraLibraries = [ libxml2 ];
-  pkgconfigDepends = [ libxml2 ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-libxml/";
-    description = "Bindings for the libXML2 SAX interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
deleted file mode 100644
index ecb6b9aa18a..00000000000
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, constraints, HUnit, liftedBase, monadControl, mtl, tasty
-, tastyHunit, tastyTh, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lifted-async";
-  version = "0.6.0.1";
-  sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf";
-  buildDepends = [ async constraints liftedBase monadControl transformersBase ];
-  testDepends = [
-    async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh
-  ];
-  meta = {
-    homepage = "https://github.com/maoe/lifted-async";
-    description = "Run lifted IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
deleted file mode 100644
index 2aa24f83325..00000000000
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, monadControl, testFramework, testFrameworkHunit
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lifted-base";
-  version = "0.2.3.3";
-  sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3";
-  buildDepends = [ monadControl transformersBase ];
-  testDepends = [
-    HUnit monadControl testFramework testFrameworkHunit transformers
-    transformersBase
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/basvandijk/lifted-base";
-    description = "lifted IO operations from the base library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lin-alg/default.nix b/pkgs/development/libraries/haskell/lin-alg/default.nix
deleted file mode 100644
index 39391f989a8..00000000000
--- a/pkgs/development/libraries/haskell/lin-alg/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, NumInstances, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "lin-alg";
-  version = "0.1.0.2";
-  sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
-  buildDepends = [ NumInstances vector ];
-  meta = {
-    description = "Low-dimensional matrices and vectors for graphics and physics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix
deleted file mode 100644
index a10489a6006..00000000000
--- a/pkgs/development/libraries/haskell/linear-opengl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, distributive, lens, linear, OpenGL, OpenGLRaw, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "linear-opengl";
-  version = "0.2.0.4";
-  sha256 = "11pdif2w730jqknajr2si77a0z4v4k5spm5zdks642i25ya135ba";
-  buildDepends = [
-    distributive lens linear OpenGL OpenGLRaw tagged
-  ];
-  meta = {
-    homepage = "http://www.github.com/bgamari/linear-opengl";
-    description = "Isomorphisms between linear and OpenGL types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
deleted file mode 100644
index 6301d8d42d6..00000000000
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, adjunctions, binary, distributive, doctest, filepath
-, hashable, HUnit, lens, reflection, semigroupoids, semigroups
-, simpleReflect, tagged, testFramework, testFrameworkHunit
-, transformers, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "linear";
-  version = "1.15.5";
-  sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi";
-  buildDepends = [
-    adjunctions binary distributive hashable lens reflection
-    semigroupoids semigroups tagged transformers unorderedContainers
-    vector void
-  ];
-  testDepends = [
-    binary doctest filepath HUnit lens simpleReflect testFramework
-    testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/linear/";
-    description = "Linear Algebra";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix
deleted file mode 100644
index 2c5dc577f0f..00000000000
--- a/pkgs/development/libraries/haskell/linux-inotify/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "linux-inotify";
-  version = "0.2.0.1";
-  sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
-  buildDepends = [ hashable ];
-  meta = {
-    description = "Thinner binding to the Linux Kernel's inotify interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix
deleted file mode 100644
index 442ffc2028a..00000000000
--- a/pkgs/development/libraries/haskell/list-t/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "list-t";
-  version = "0.4.2";
-  sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
-  buildDepends = [
-    basePrelude mmorph monadControl transformers transformersBase
-  ];
-  testDepends = [ basePrelude HTF mmorph mtlPrelude ];
-  meta = {
-    homepage = "https://github.com/nikita-volkov/list-t";
-    description = "ListT done right";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix
deleted file mode 100644
index f14e202d226..00000000000
--- a/pkgs/development/libraries/haskell/list-tries/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dlist }:
-
-cabal.mkDerivation (self: {
-  pname = "list-tries";
-  version = "0.5.2";
-  sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary dlist ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
-    description = "Tries and Patricia tries: finite sets and maps for list keys";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/listExtras/default.nix b/pkgs/development/libraries/haskell/listExtras/default.nix
deleted file mode 100644
index 2da3060202c..00000000000
--- a/pkgs/development/libraries/haskell/listExtras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "list-extras";
-  version = "0.4.1.3";
-  sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Common not-so-common functions for lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lists/default.nix b/pkgs/development/libraries/haskell/lists/default.nix
deleted file mode 100644
index 358d33e35d7..00000000000
--- a/pkgs/development/libraries/haskell/lists/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, listExtras, split }:
-
-cabal.mkDerivation (self: {
-  pname = "lists";
-  version = "0.4.2";
-  sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
-  buildDepends = [ listExtras split ];
-  meta = {
-    description = "Functions for dealing with lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
deleted file mode 100644
index cd92b67b16a..00000000000
--- a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general-pure";
-  version = "3.4.4.0";
-  sha256 = "0x43yfcss3f5v5mlzyv7d13fvajbdgv4cmkx5yx1904xsiddg27v";
-  buildDepends = [ mtl parsec setenv transformers ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Pure Haskell LLVM functionality (no FFI)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
deleted file mode 100644
index aec66b12723..00000000000
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
-, QuickCheck, setenv, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general";
-  version = "3.4.4.0";
-  sha256 = "10x7qb2svw0gz0sqf4vn14hpzks3rk29g4i2pzfdi5qk11j8jd9b";
-  buildDepends = [
-    llvmGeneralPure mtl parsec setenv transformers utf8String
-  ];
-  testDepends = [
-    HUnit llvmGeneralPure mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  buildTools = [ llvmConfig ];
-  doCheck = false;
-  meta = {
-    description = "General purpose LLVM bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/loch-th/default.nix b/pkgs/development/libraries/haskell/loch-th/default.nix
deleted file mode 100644
index 5061524708b..00000000000
--- a/pkgs/development/libraries/haskell/loch-th/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "loch-th";
-  version = "0.2.1";
-  sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
-  meta = {
-    homepage = "https://github.com/liskin/loch-th";
-    description = "Support for precise error locations in source files (Template Haskell version)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
deleted file mode 100644
index 6864d4c5fc4..00000000000
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractDequeTests, atomicPrimops, HUnit
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lockfree-queue";
-  version = "0.2.3";
-  sha256 = "0y8ax6vcjnjm8g7ybn95wca74hm0g22fvgra06vj6l90pl93awyg";
-  buildDepends = [ abstractDeque atomicPrimops ];
-  testDepends = [
-    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
-    testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-    description = "Michael and Scott lock-free queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix
deleted file mode 100644
index e24fd10beb6..00000000000
--- a/pkgs/development/libraries/haskell/logfloat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "logfloat";
-  version = "0.12.1";
-  sha256 = "1k13jjqv4df341hcj9hzrlisfx9wrsmyqvzi6ricx341d9z4ch05";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Log-domain floating point numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
deleted file mode 100644
index 54a7feee595..00000000000
--- a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchzip, hspec, libsystemdJournal, loggingFacade, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "logging-facade-journald";
-  version = "0.0.0";
-  src = fetchzip {
-    url = "https://hackage.haskell.org/package/logging-facade-journald-0.0.0/logging-facade-journald-0.0.0.tar.gz";
-    sha256 = "1wvh48y3lz2ipz6cwh7gbwajwrd7ziivhkmgpglzjfy335zin7m6";
-  };
-  buildDepends = [
-    libsystemdJournal loggingFacade text unorderedContainers
-  ];
-  testDepends = [
-    hspec libsystemdJournal loggingFacade text unorderedContainers
-  ];
-  meta = {
-    description = "Journald back-end for logging-facade";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging-facade/default.nix b/pkgs/development/libraries/haskell/logging-facade/default.nix
deleted file mode 100644
index 9e4e7601d85..00000000000
--- a/pkgs/development/libraries/haskell/logging-facade/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fetchzip, hspec, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "logging-facade";
-  version = "0.0.0";
-  src = fetchzip {
-    url = "https://hackage.haskell.org/package/logging-facade-0.0.0/logging-facade-0.0.0.tar.gz";
-    sha256 = "0w6bkzgf0lamcdnris95i1xq8wg882wf17b517rgr5d1vhxz9y7s";
-  };
-  buildDepends = [ transformers ];
-  testDepends = [ hspec ];
-  meta = {
-    description = "Simple logging abstraction that allows multiple backends";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
deleted file mode 100644
index 94eb14cb003..00000000000
--- a/pkgs/development/libraries/haskell/logging/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, fastLogger, hspec, liftedBase, monadControl
-, monadLogger, pcreLight, text, time, transformers, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "logging";
-  version = "2.1.0";
-  sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh";
-  buildDepends = [
-    binary fastLogger liftedBase monadControl monadLogger pcreLight
-    text time transformers vectorSpace
-  ];
-  testDepends = [ hspec monadLogger ];
-  meta = {
-    description = "Simplified logging in IO for application writers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
deleted file mode 100644
index 1a51d623557..00000000000
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "logict";
-  version = "0.6.0.2";
-  sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "A backtracking logic-programming monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/logsink/default.nix b/pkgs/development/libraries/haskell/logsink/default.nix
deleted file mode 100644
index d272a4d4c2b..00000000000
--- a/pkgs/development/libraries/haskell/logsink/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hsyslog, loggingFacade, time }:
-
-cabal.mkDerivation (self: {
-  pname = "logsink";
-  version = "0.1.0";
-  sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
-  buildDepends = [ hsyslog loggingFacade time ];
-  testDepends = [ hspec loggingFacade ];
-  meta = {
-    description = "A logging framework for Haskell";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/loop/default.nix b/pkgs/development/libraries/haskell/loop/default.nix
deleted file mode 100644
index 88edb1909a5..00000000000
--- a/pkgs/development/libraries/haskell/loop/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "loop";
-  version = "0.2.0";
-  sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
-  testDepends = [ hspec mtl ];
-  meta = {
-    homepage = "https://github.com/nh2/loop";
-    description = "Fast loops (for when GHC can't optimize forM_)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
deleted file mode 100644
index 6c28b6c8cd5..00000000000
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "lrucache";
-  version = "1.1.1.4";
-  sha256 = "0w3b338wsf7c0acjxxfdjxsljfpsix67aihkl2jwnp5x71awf8qh";
-  meta = {
-    homepage = "http://github.com/chowells79/lrucache";
-    description = "a simple, pure LRU cache";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix
deleted file mode 100644
index c3e90c84c56..00000000000
--- a/pkgs/development/libraries/haskell/lushtags/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "lushtags";
-  version = "0.0.1";
-  sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ haskellSrcExts text vector ];
-  meta = {
-    homepage = "https://github.com/bitc/lushtags";
-    description = "Create ctags compatible tags files for Haskell programs";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix
deleted file mode 100644
index 9b80409ddd4..00000000000
--- a/pkgs/development/libraries/haskell/lzma-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lzma-conduit";
-  version = "1.1.1";
-  sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg";
-  buildDepends = [ bindingsDSL conduit resourcet transformers ];
-  testDepends = [
-    conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ lzma ];
-  meta = {
-    homepage = "http://github.com/alphaHeavy/lzma-conduit";
-    description = "Conduit interface for lzma/xz compression";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.isLinux && self.stdenv.isi686;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
deleted file mode 100644
index 7a1ee231957..00000000000
--- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lzma-enumerator";
-  version = "0.1.3";
-  sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
-  buildDepends = [ bindingsDSL enumerator mtl ];
-  testDepends = [
-    enumerator HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ lzma ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/alphaHeavy/lzma-enumerator";
-    description = "Enumerator interface for lzma/xz compression";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = self.stdenv.isi686;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix
deleted file mode 100644
index 24be1424c99..00000000000
--- a/pkgs/development/libraries/haskell/maccatcher/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "maccatcher";
-  version = "2.1.5";
-  sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary parsec ];
-  meta = {
-    description = "Obtain the host MAC address on *NIX and Windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines-directory/default.nix b/pkgs/development/libraries/haskell/machines-directory/default.nix
deleted file mode 100644
index 3cd67af354e..00000000000
--- a/pkgs/development/libraries/haskell/machines-directory/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, machines, machinesIo, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "machines-directory";
-  version = "0.2.0.0";
-  sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v";
-  buildDepends = [ filepath machines machinesIo transformers ];
-  meta = {
-    homepage = "http://github.com/aloiscochard/machines-io";
-    description = "Directory (system) utilities for the machines library";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines-io/default.nix b/pkgs/development/libraries/haskell/machines-io/default.nix
deleted file mode 100644
index c724b7df62b..00000000000
--- a/pkgs/development/libraries/haskell/machines-io/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chunkedData, machines, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "machines-io";
-  version = "0.2.0.0";
-  sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03";
-  buildDepends = [ chunkedData machines transformers ];
-  meta = {
-    homepage = "http://github.com/aloiscochard/machines-io";
-    description = "IO utilities for the machines library";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix
deleted file mode 100644
index bb01e9f655e..00000000000
--- a/pkgs/development/libraries/haskell/machines/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, doctest, filepath, free, mtl, pointed
-, profunctors, semigroups, transformers, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "machines";
-  version = "0.4.1";
-  sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb";
-  buildDepends = [
-    comonad free mtl pointed profunctors semigroups transformers void
-  ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/machines/";
-    description = "Networked stream transducers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
deleted file mode 100644
index 1383efab868..00000000000
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, srcloc, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mainland-pretty";
-  version = "0.2.7";
-  sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
-  buildDepends = [ srcloc text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
-    description = "Pretty printing designed for printing source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/managed/default.nix b/pkgs/development/libraries/haskell/managed/default.nix
deleted file mode 100644
index febb1f8c574..00000000000
--- a/pkgs/development/libraries/haskell/managed/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "managed";
-  version = "1.0.0";
-  sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "A monad for managed values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/map-syntax/default.nix b/pkgs/development/libraries/haskell/map-syntax/default.nix
deleted file mode 100644
index 52c42efd320..00000000000
--- a/pkgs/development/libraries/haskell/map-syntax/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "map-syntax";
-  version = "0.2";
-  sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
-  buildDepends = [ mtl ];
-  testDepends = [
-    deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    description = "Syntax sugar for defining maps";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
deleted file mode 100644
index 226a4efa8c7..00000000000
--- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck, silently, stringbuilder }:
-
-cabal.mkDerivation (self: {
-  pname = "markdown-unlit";
-  version = "0.2.0.1";
-  sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq";
-  isLibrary = true;
-  isExecutable = true;
-  testDepends = [ hspec QuickCheck silently stringbuilder ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
-  meta = {
-    description = "Literate Haskell support for Markdown";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix
deleted file mode 100644
index cd0bcd3cfee..00000000000
--- a/pkgs/development/libraries/haskell/markdown/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra
-, dataDefault, hspec, systemFileio, systemFilepath, text
-, transformers, xssSanitize
-}:
-
-cabal.mkDerivation (self: {
-  pname = "markdown";
-  version = "0.1.13";
-  sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134";
-  buildDepends = [
-    attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault
-    text transformers xssSanitize
-  ];
-  testDepends = [
-    blazeHtml conduit conduitExtra hspec systemFileio systemFilepath
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/markdown";
-    description = "Convert Markdown to HTML, with XSS protection";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix
deleted file mode 100644
index 00f283208c6..00000000000
--- a/pkgs/development/libraries/haskell/markov-chain/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "markov-chain";
-  version = "0.0.3.3";
-  sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
-  buildDepends = [ random transformers ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/markov-chain/";
-    description = "Markov Chains for generating random sequences with a user definable behaviour";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
deleted file mode 100644
index 2e747760cc7..00000000000
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorThUnbox
-}:
-
-cabal.mkDerivation (self: {
-  pname = "math-functions";
-  version = "0.1.5.2";
-  sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
-  buildDepends = [ deepseq erf vector vectorThUnbox ];
-  testDepends = [
-    HUnit ieee754 QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/math-functions";
-    description = "Special functions and Chebyshev polynomials";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/matrix/default.nix b/pkgs/development/libraries/haskell/matrix/default.nix
deleted file mode 100644
index 2d1ec8aa45f..00000000000
--- a/pkgs/development/libraries/haskell/matrix/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, loop, primitive, QuickCheck, tasty
-, tastyQuickcheck, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "matrix";
-  version = "0.3.4.0";
-  sha256 = "16a633llf7nh70s92cn8i8sdish9vryy4xh62rimvmn91ivvjay1";
-  buildDepends = [ deepseq loop primitive vector ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck ];
-  meta = {
-    description = "A native implementation of matrix operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
deleted file mode 100644
index ff95fe0a23b..00000000000
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, processExtras, temporary, text, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "maude";
-  version = "0.6.1";
-  sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql";
-  buildDepends = [ filepath processExtras temporary text xml ];
-  meta = {
-    homepage = "https://github.com/davidlazar/maude-hs";
-    description = "An interface to the Maude rewriting system";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/meep/default.nix b/pkgs/development/libraries/haskell/meep/default.nix
deleted file mode 100644
index f8ad537938c..00000000000
--- a/pkgs/development/libraries/haskell/meep/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, hspec, hspecExpectationsLens, lens
-, QuickCheck, semigroups
-}:
-
-cabal.mkDerivation (self: {
-  pname = "meep";
-  version = "0.1.1.0";
-  sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq";
-  buildDepends = [ bifunctors lens semigroups ];
-  testDepends = [
-    bifunctors doctest hspec hspecExpectationsLens lens QuickCheck
-    semigroups
-  ];
-  meta = {
-    description = "A silly container";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
deleted file mode 100644
index f17b0df4ad1..00000000000
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "mersenne-random-pure64";
-  version = "0.2.0.4";
-  sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
-    description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mersenne-random/default.nix b/pkgs/development/libraries/haskell/mersenne-random/default.nix
deleted file mode 100644
index ec7a54c9ed2..00000000000
--- a/pkgs/development/libraries/haskell/mersenne-random/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mersenne-random";
-  version = "1.0.0.1";
-  sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/mersenne-random";
-    description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
deleted file mode 100644
index 864d3c5c427..00000000000
--- a/pkgs/development/libraries/haskell/midi/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, eventList, explicitException, monoidTransformer
-, nonNegative, QuickCheck, random, transformers, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "midi";
-  version = "0.2.1.3";
-  sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a";
-  buildDepends = [
-    binary eventList explicitException monoidTransformer nonNegative
-    QuickCheck random transformers utilityHt
-  ];
-  testDepends = [
-    eventList explicitException nonNegative QuickCheck transformers
-    utilityHt
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/MIDI";
-    description = "Handling of MIDI messages and files";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
deleted file mode 100644
index f20b20f71b7..00000000000
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
-, sendmail ? "sendmail", text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mime-mail";
-  version = "0.4.6";
-  sha256 = "051mqpzypg4r6rd06qb75pl3nq9p68r1sl73r0pwl1imcp158aw6";
-  buildDepends = [
-    base64Bytestring blazeBuilder filepath random text
-  ];
-  testDepends = [ blazeBuilder hspec text ];
-  configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"";
-  meta = {
-    homepage = "http://github.com/snoyberg/mime-mail";
-    description = "Compose MIME email messages";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
deleted file mode 100644
index daf6cc37b6f..00000000000
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mime-types";
-  version = "0.1.0.4";
-  sha256 = "0bxhkwz8p7mhg5kspbpc5zm4k50pc0r5pzjr6807y88x8vjpvj2x";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Basic mime-type handling types and functions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix
deleted file mode 100644
index eba24ff8f16..00000000000
--- a/pkgs/development/libraries/haskell/mime/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mime";
-  version = "0.4.0.1";
-  sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "https://github.com/GaloisInc/mime";
-    description = "Working with MIME types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix
deleted file mode 100644
index c0593855644..00000000000
--- a/pkgs/development/libraries/haskell/minimorph/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "minimorph";
-  version = "0.1.5.0";
-  sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g";
-  buildDepends = [ text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "http://darcsden.com/kowey/minimorph";
-    description = "English spelling functions with an emphasis on simplicity";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix
deleted file mode 100644
index 04da7e27e2c..00000000000
--- a/pkgs/development/libraries/haskell/minioperational/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, elevator, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "minioperational";
-  version = "0.4.8.1";
-  sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9";
-  buildDepends = [ cleanUnions elevator transformers ];
-  meta = {
-    homepage = "https://github.com/fumieval/minioperational";
-    description = "fast and simple operational monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
deleted file mode 100644
index b58449b22ad..00000000000
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, HUnit, minimorph, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "miniutter";
-  version = "0.4.4.1";
-  sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1";
-  buildDepends = [ binary minimorph text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/Mikolaj/miniutter";
-    description = "Simple English clause creation from arbitrary words";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/misfortune/default.nix b/pkgs/development/libraries/haskell/misfortune/default.nix
deleted file mode 100644
index cc619288213..00000000000
--- a/pkgs/development/libraries/haskell/misfortune/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, filepath, knob, monadLoops, randomFu, regexBase
-, regexPcre, semigroups, text, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "misfortune";
-  version = "0.1.1.1";
-  sha256 = "0knb31jxxn7zds13a90d4lir39386nwzd181mlzkrw5niw1zwmhb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    cereal filepath knob monadLoops randomFu regexBase regexPcre
-    semigroups text utf8String vector
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/misfortune";
-    description = "fortune-mod clone";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/missing-foreign/default.nix b/pkgs/development/libraries/haskell/missing-foreign/default.nix
deleted file mode 100644
index 928cf73d457..00000000000
--- a/pkgs/development/libraries/haskell/missing-foreign/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "missing-foreign";
-  version = "0.1.1";
-  sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
-  meta = {
-    description = "Convenience functions for FFI work";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
deleted file mode 100644
index fe4f666b327..00000000000
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mmap";
-  version = "0.5.9";
-  sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Memory mapped files for POSIX and Windows";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
deleted file mode 100644
index bf8fb46f793..00000000000
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mmorph";
-  version = "1.0.4";
-  sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Monad morphisms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
deleted file mode 100644
index 614fe145bea..00000000000
--- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "modular-arithmetic";
-  version = "1.2.0.0";
-  sha256 = "1qlvi0xjdvr4730xj303i6gp610mz4xrlrk191yy8hr7afjysm0k";
-  meta = {
-    description = "A type for integers modulo some constant";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
deleted file mode 100644
index f75688ef4ce..00000000000
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers, transformersBase }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-control";
-  version = "1.0.0.2";
-  sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr";
-  buildDepends = [ stm transformers transformersBase ];
-  meta = {
-    homepage = "https://github.com/basvandijk/monad-control";
-    description = "Lift control operations, like exception catching, through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-coroutine/default.nix b/pkgs/development/libraries/haskell/monad-coroutine/default.nix
deleted file mode 100644
index 9bcfcc6d4b0..00000000000
--- a/pkgs/development/libraries/haskell/monad-coroutine/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadParallel, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-coroutine";
-  version = "0.8";
-  sha256 = "0nirp5c3vi529ap142zs29j10j9m609ippi3chv6a87h51avkhzx";
-  buildDepends = [ monadParallel transformers ];
-  meta = {
-    homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
-    description = "Coroutine monad transformer for suspending and resuming monadic computations";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
deleted file mode 100644
index 0b655689dc4..00000000000
--- a/pkgs/development/libraries/haskell/monad-extras/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mmorph, monadControl, stm, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-extras";
-  version = "0.5.9";
-  sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
-  buildDepends = [
-    mmorph monadControl stm transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://github.com/jwiegley/monad-extras";
-    description = "Extra utility functions for working with monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
deleted file mode 100644
index c95adce3fcc..00000000000
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, either, monadControl, mtl, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-journal";
-  version = "0.7";
-  sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
-  buildDepends = [
-    either monadControl mtl transformers transformersBase
-  ];
-  meta = {
-    homepage = "http://github.com/phaazon/monad-journal";
-    description = "Pure logger typeclass and monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
deleted file mode 100644
index 7988819b81c..00000000000
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, conduitExtra, exceptions
-, fastLogger, liftedBase, monadControl, monadLoops, mtl, resourcet
-, stm, stmChans, text, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-logger";
-  version = "0.3.11.1";
-  sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7";
-  buildDepends = [
-    blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
-    monadControl monadLoops mtl resourcet stm stmChans text
-    transformers transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/kazu-yamamoto/logger";
-    description = "A class of monads which can log messages";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
deleted file mode 100644
index 8b9c9b6b933..00000000000
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-loops";
-  version = "0.4.2.1";
-  sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56";
-  meta = {
-    homepage = "https://github.com/mokus0/monad-loops";
-    description = "Monadic loops";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
deleted file mode 100644
index a542cdb3173..00000000000
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par-extras";
-  version = "0.3.3";
-  sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
-  buildDepends = [
-    abstractPar cereal deepseq mtl random transformers
-  ];
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "Combinators and extra features for Par monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
deleted file mode 100644
index 13cc7499aab..00000000000
--- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par";
-  version = "0.1.0.3";
-  sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg";
-  buildDepends = [ deepseq HUnit ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "A library for parallel programming based on a monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
deleted file mode 100644
index c9d6cf71ae5..00000000000
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras
-, mtl, mwcRandom, parallel, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "monad-par";
-  version = "0.3.4.7";
-  sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
-  buildDepends = [
-    abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
-    parallel
-  ];
-  testDepends = [
-    abstractDeque abstractPar deepseq HUnit monadParExtras mtl
-    mwcRandom QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/simonmar/monad-par";
-    description = "A library for parallel programming based on a monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix
deleted file mode 100644
index bff520fab83..00000000000
--- a/pkgs/development/libraries/haskell/monad-parallel/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parallel, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-parallel";
-  version = "0.7.1.3";
-  sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx";
-  buildDepends = [ parallel transformers transformersCompat ];
-  meta = {
-    homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
-    description = "Parallel execution of monadic computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
deleted file mode 100644
index b7ffb95b9df..00000000000
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-peel";
-  version = "0.1.1";
-  sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l";
-  buildDepends = [ extensibleExceptions transformers ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/monad-peel/";
-    description = "Lift control operations like exception catching through monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-stm/default.nix b/pkgs/development/libraries/haskell/monad-stm/default.nix
deleted file mode 100644
index 5418817160f..00000000000
--- a/pkgs/development/libraries/haskell/monad-stm/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-stm";
-  version = "0.1.0.2";
-  sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
-  buildDepends = [ stm transformers ];
-  meta = {
-    description = "MonadSTM class analogous to MonadIO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix
deleted file mode 100644
index e8c598d3a30..00000000000
--- a/pkgs/development/libraries/haskell/monad-supply/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-supply";
-  version = "0.6";
-  sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Stateful supply monad";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix
deleted file mode 100644
index f4fac043ea1..00000000000
--- a/pkgs/development/libraries/haskell/monad-unify/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "monad-unify";
-  version = "0.2.2";
-  sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
-  buildDepends = [ mtl unorderedContainers ];
-  meta = {
-    description = "Generic first-order unification";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadIO/default.nix b/pkgs/development/libraries/haskell/monadIO/default.nix
deleted file mode 100644
index ec3efa33ae8..00000000000
--- a/pkgs/development/libraries/haskell/monadIO/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "monadIO";
-  version = "0.10.1.4";
-  sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
-  buildDepends = [ mtl stm ];
-  meta = {
-    description = "Overloading of concurrency variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
deleted file mode 100644
index 2e8c064ac9f..00000000000
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cryptoApi, mtl, tagged, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monadcryptorandom";
-  version = "0.6.1";
-  sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
-  buildDepends = [ cryptoApi mtl tagged transformers ];
-  meta = {
-    homepage = "https://github.com/TomMD/monadcryptorandom";
-    description = "A monad for using CryptoRandomGen";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix
deleted file mode 100644
index bdb12c483b6..00000000000
--- a/pkgs/development/libraries/haskell/monadlib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monadLib";
-  version = "3.7.3";
-  sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
-  meta = {
-    homepage = "http://wiki.github.com/yav/monadlib";
-    description = "A collection of monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix
deleted file mode 100644
index 9ff5d5079ce..00000000000
--- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, haskellSrcExts, monadloc, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "monadloc-pp";
-  version = "0.3.1";
-  sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath haskellSrcExts monadloc syb ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/pepeiborra/monadloc-pp";
-    description = "A preprocessor for generating monadic call traces";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix
deleted file mode 100644
index 4d99a61335c..00000000000
--- a/pkgs/development/libraries/haskell/monadloc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monadloc";
-  version = "0.7.1";
-  sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/pepeiborra/monadloc";
-    description = "A class for monads which can keep a monadic call trace";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
deleted file mode 100644
index 4d5cd7575fb..00000000000
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "monads-tf";
-  version = "0.1.0.2";
-  sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Monad classes, using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
deleted file mode 100644
index 3523749dab7..00000000000
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bson, cryptohash, hashtables, liftedBase
-, monadControl, mtl, network, parsec, random, randomShuffle, text
-, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mongoDB";
-  version = "2.0.3";
-  sha256 = "1blqd30mw9fl861f07zn7az4psl9byjjbd986884p6rx07m28abk";
-  buildDepends = [
-    binary bson cryptohash hashtables liftedBase monadControl mtl
-    network parsec random randomShuffle text transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/mongodb-haskell/mongodb";
-    description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
deleted file mode 100644
index 91d160fc345..00000000000
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec
-, QuickCheck, semigroupoids, semigroups, text, transformers
-, unorderedContainers, vector, vectorAlgorithms, vectorInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mono-traversable";
-  version = "0.6.3";
-  sha256 = "026qii2i6l8lsvhvb9l8gkzybrvf87skg6mjam2bxc3i1bjx1lkr";
-  buildDepends = [
-    comonad dlist dlistInstances hashable semigroupoids semigroups text
-    transformers unorderedContainers vector vectorAlgorithms
-    vectorInstances
-  ];
-  testDepends = [
-    foldl hspec QuickCheck semigroups text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/snoyberg/mono-traversable";
-    description = "Type classes for mapping, folding, and traversing monomorphic containers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
deleted file mode 100644
index f7ae10ce08d..00000000000
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, groups, semigroupoids, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "monoid-extras";
-  version = "0.3.3.5";
-  sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280";
-  buildDepends = [ groups semigroupoids semigroups ];
-  jailbreak = true;
-  meta = {
-    description = "Various extra monoid-related definitions and utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
deleted file mode 100644
index 147045287dd..00000000000
--- a/pkgs/development/libraries/haskell/monoid-transformer/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monoid-transformer";
-  version = "0.0.3";
-  sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
-  meta = {
-    description = "Monoid counterparts to some ubiquitous monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/monomorphic/default.nix b/pkgs/development/libraries/haskell/monomorphic/default.nix
deleted file mode 100644
index e160878b680..00000000000
--- a/pkgs/development/libraries/haskell/monomorphic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "monomorphic";
-  version = "0.0.3.2";
-  sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2";
-  meta = {
-    homepage = "https://github.com/konn/monomorphic";
-    description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
deleted file mode 100644
index a466f75a1b1..00000000000
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, split, text }:
-
-cabal.mkDerivation (self: {
-  pname = "mpppc";
-  version = "0.1.3";
-  sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
-  buildDepends = [ ansiTerminal split text ];
-  jailbreak = true;
-  meta = {
-    description = "Multi-dimensional parametric pretty-printer with color";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/msgpack/default.nix b/pkgs/development/libraries/haskell/msgpack/default.nix
deleted file mode 100644
index b2a626621fe..00000000000
--- a/pkgs/development/libraries/haskell/msgpack/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, hashable, mtl
-, QuickCheck, testFramework, testFrameworkQuickcheck2, text
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "msgpack";
-  version = "0.7.2.5";
-  sha256 = "1iwibyv5aqp5h98x4s5pp3hj218l2k3vff87p727mh74f5j6l3s8";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq hashable mtl text
-    unorderedContainers vector
-  ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://msgpack.org/";
-    description = "A Haskell implementation of MessagePack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix
deleted file mode 100644
index 3bf2395cb3a..00000000000
--- a/pkgs/development/libraries/haskell/mtl-prelude/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl-prelude";
-  version = "1.0.1";
-  sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    homepage = "https://github.com/nikita-volkov/mtl-prelude";
-    description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
deleted file mode 100644
index 372c8706cc9..00000000000
--- a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.1.3.1";
-  sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
deleted file mode 100644
index 19dedb3174a..00000000000
--- a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.2.0.1";
-  sha256 = "0486cg4dp0p942zsg7yxpwn1jykx8p3gb794jaq0v3j44a7x00rb";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.2.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix
deleted file mode 100644
index 35a1ffad8d2..00000000000
--- a/pkgs/development/libraries/haskell/mtl/2.2.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.2.1";
-  sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/mtl";
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
deleted file mode 100644
index 6391d2d9ac0..00000000000
--- a/pkgs/development/libraries/haskell/mtlparse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "mtlparse";
-  version = "0.1.2";
-  sha256 = "cd85d985e4eff842b1c053a2ff507094a20995c5757acc06ea34ff07d9edd142";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
-    description = "parse library using mtl package";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix
deleted file mode 100644
index 225994a32e5..00000000000
--- a/pkgs/development/libraries/haskell/mueval/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, extensibleExceptions, filepath, hint, mtl, show
-, simpleReflect, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mueval";
-  version = "0.9.1.1";
-  sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal extensibleExceptions filepath hint mtl show simpleReflect
-    utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/gwern/mueval";
-    description = "Safely evaluate pure Haskell expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mueval/wrapper.nix b/pkgs/development/libraries/haskell/mueval/wrapper.nix
deleted file mode 100644
index 6c3beb4da8b..00000000000
--- a/pkgs/development/libraries/haskell/mueval/wrapper.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, mueval, makeWrapper, ghc
-, show, simpleReflect, mtl, random, QuickCheck
-, additionalPackages ? [] }:
-
-stdenv.mkDerivation {
-  name = "mueval-wrapper";
-
-  buildInputs = [ makeWrapper show simpleReflect mtl random QuickCheck ]
-    ++ additionalPackages;
-
-  ghcVersion = ghc.version;
-
-  buildCommand = ''
-    PKGPATH=""
-    for p in $nativePkgs; do
-      for i in "$p/lib/ghc-$ghcVersion/package.conf.d/"*.installedconf; do
-        PKGPATH=$PKGPATH''${PKGPATH:+:}$i
-      done
-    done
-
-    makeWrapper "${mueval}/bin/mueval" "$out/bin/mueval" \
-      --prefix PATH : "${mueval}/bin" \
-      --prefix GHC_PACKAGE_PATH : "$PKGPATH" \
-      --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
-  '';
-
-  preferLocalBuild = true;
-
-  meta = {
-    description = mueval.meta.description;
-  };
-}
-
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
deleted file mode 100644
index f9912a6d013..00000000000
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "multiarg";
-  version = "0.28.0.0";
-  sha256 = "1qy2xlxqhxlj9f5g7wf90vwch3qs1yz733f87irdmak0v4vxdkd5";
-  buildDepends = [ bifunctors utf8String ];
-  meta = {
-    homepage = "https://github.com/massysett/multiarg";
-    description = "Combinators to build command line parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multimap/default.nix b/pkgs/development/libraries/haskell/multimap/default.nix
deleted file mode 100644
index 15764392bf1..00000000000
--- a/pkgs/development/libraries/haskell/multimap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multimap";
-  version = "1.2.1";
-  sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
-  meta = {
-    homepage = "http://hub.darcs.net/scravy/multimap";
-    description = "A multimap";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix
deleted file mode 100644
index 82cad64df04..00000000000
--- a/pkgs/development/libraries/haskell/multipart/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "multipart";
-  version = "0.1.2";
-  sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://www.github.com/silkapp/multipart";
-    description = "HTTP multipart split out of the cgi package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
deleted file mode 100644
index 503377b58e0..00000000000
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "multiplate";
-  version = "0.0.2";
-  sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
-  buildDepends = [ transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Multiplate";
-    description = "Lightweight generic library for mutually recursive data types";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
deleted file mode 100644
index d7671a522e6..00000000000
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multirec";
-  version = "0.7.4";
-  sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic programming for families of recursive datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix
deleted file mode 100644
index b2293934712..00000000000
--- a/pkgs/development/libraries/haskell/multiset/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multiset";
-  version = "0.2.2";
-  sha256 = "1g14c1zm4rdc8nxvb69k98h542wi24q2lpba1gpqjqspk4d0sjmn";
-  meta = {
-    description = "The Data.MultiSet container type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
deleted file mode 100644
index b16d274e7e6..00000000000
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "murmur-hash";
-  version = "0.1.0.7";
-  sha256 = "125v4ypiv8n2m8zd1yi46prz96yy79ap0yzhm4vhrws4cf1zapkp";
-  meta = {
-    homepage = "http://github.com/nominolo/murmur-hash";
-    description = "MurmurHash2 implementation for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mvc-updates/default.nix b/pkgs/development/libraries/haskell/mvc-updates/default.nix
deleted file mode 100644
index ef6d465fd81..00000000000
--- a/pkgs/development/libraries/haskell/mvc-updates/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, foldl, mvc }:
-
-cabal.mkDerivation (self: {
-  pname = "mvc-updates";
-  version = "1.2.0";
-  sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
-  buildDepends = [ async foldl mvc ];
-  meta = {
-    description = "Concurrent and combinable updates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mvc/default.nix b/pkgs/development/libraries/haskell/mvc/default.nix
deleted file mode 100644
index 0068beb9bc3..00000000000
--- a/pkgs/development/libraries/haskell/mvc/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, contravariant, managed, mmorph, pipes
-, pipesConcurrency, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mvc";
-  version = "1.0.3";
-  sha256 = "1b1342qxyn2jxb3a5c9bp6ai7iwhbjxgfpbh2kjm7v75444lx78g";
-  buildDepends = [
-    async contravariant managed mmorph pipes pipesConcurrency
-    transformers
-  ];
-  meta = {
-    description = "Model-view-controller";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
deleted file mode 100644
index 5e015ecbe96..00000000000
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, primitive, QuickCheck, statistics, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mwc-random";
-  version = "0.13.2.2";
-  sha256 = "1rsrvadaih66xn8zr8kfvrr65g7wpj6i9jnzkmlik9lqrvz4axcp";
-  buildDepends = [ primitive time vector ];
-  testDepends = [
-    HUnit QuickCheck statistics testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/mwc-random";
-    description = "Fast, high quality pseudo random number generation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix
deleted file mode 100644
index 3698b727fe0..00000000000
--- a/pkgs/development/libraries/haskell/mysql-simple/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
-, mysql, pcreLight, text, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "mysql-simple";
-  version = "0.2.2.4";
-  sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6";
-  buildDepends = [
-    attoparsec base16Bytestring blazeBuilder blazeTextual mysql
-    pcreLight text time
-  ];
-  meta = {
-    homepage = "https://github.com/bos/mysql-simple";
-    description = "A mid-level MySQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix
deleted file mode 100644
index 5422443d2fe..00000000000
--- a/pkgs/development/libraries/haskell/mysql/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mysqlConfig, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "mysql";
-  version = "0.1.1.7";
-  sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0";
-  buildTools = [ mysqlConfig ];
-  extraLibraries = [ zlib ];
-  meta = {
-    homepage = "https://github.com/bos/mysql";
-    description = "A low-level MySQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix
deleted file mode 100644
index 156e0c04a0a..00000000000
--- a/pkgs/development/libraries/haskell/nanospec/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, silently }:
-
-cabal.mkDerivation (self: {
-  pname = "nanospec";
-  version = "0.2.0";
-  sha256 = "0g10l86cv33r58zxn2bprqlm80i7g86bwzhn9jqg9s81xc0aw2qv";
-  testDepends = [ hspec silently ];
-  doCheck = false;
-  meta = {
-    description = "A lightweight implementation of a subset of Hspec's API";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix
deleted file mode 100644
index e3b55592204..00000000000
--- a/pkgs/development/libraries/haskell/nat/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "nat";
-  version = "0.3";
-  sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
-  meta = {
-    description = "Lazy binary natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
deleted file mode 100644
index 3c4130eddc4..00000000000
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable }:
-
-cabal.mkDerivation (self: {
-  pname = "nats";
-  version = "1";
-  sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0";
-  buildDepends = [ hashable ];
-  meta = {
-    homepage = "http://github.com/ekmett/nats/";
-    description = "Natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix
deleted file mode 100644
index f4ed7dd2a12..00000000000
--- a/pkgs/development/libraries/haskell/naturals/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "naturals";
-  version = "0.2.0.2";
-  sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
-  meta = {
-    homepage = "frigidcode.com";
-    description = "Constructors and related functions for natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
deleted file mode 100644
index 3a5cd89b926..00000000000
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, ncurses, text, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "ncurses";
-  version = "0.2.11";
-  sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
-  buildDepends = [ text transformers ];
-  buildTools = [ c2hs ];
-  extraLibraries = [ ncurses ];
-  patchPhase = "find . -type f -exec sed -i -e 's|ncursesw/||' {} \\;";
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-ncurses/";
-    description = "Modernised bindings to GNU ncurses";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
deleted file mode 100644
index 6794ce4f37f..00000000000
--- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, netlist }:
-
-cabal.mkDerivation (self: {
-  pname = "netlist-to-vhdl";
-  version = "0.3.1";
-  sha256 = "15daik7l0pjqilya01l5rl84g2fyjwkap1md0nx82gxcp8m1v76k";
-  buildDepends = [ netlist ];
-  meta = {
-    description = "Convert a Netlist AST to VHDL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix
deleted file mode 100644
index 70d993cf8e4..00000000000
--- a/pkgs/development/libraries/haskell/netlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "netlist";
-  version = "0.3.1";
-  sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
-  buildDepends = [ binary syb ];
-  meta = {
-    description = "Netlist AST";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
deleted file mode 100644
index f60af56b62f..00000000000
--- a/pkgs/development/libraries/haskell/netwire/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, parallel, profunctors, random, semigroups, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "netwire";
-  version = "5.0.1";
-  sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    deepseq parallel profunctors random semigroups time transformers
-  ];
-  meta = {
-    homepage = "http://hub.darcs.net/ertes/netwire";
-    description = "Functional reactive programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix
deleted file mode 100644
index 82d6c47844d..00000000000
--- a/pkgs/development/libraries/haskell/network-carbon/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, text, time, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "network-carbon";
-  version = "1.0.2";
-  sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h";
-  buildDepends = [ network text time vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ocharles/network-carbon";
-    description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
deleted file mode 100644
index 5b023f91b66..00000000000
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, connection, cprngAes, dataDefault
-, HUnit, monadControl, mtl, network, streamingCommons, systemFileio
-, systemFilepath, tls, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-conduit-tls";
-  version = "1.1.0.2";
-  sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax";
-  buildDepends = [
-    conduit conduitExtra connection cprngAes dataDefault monadControl
-    network streamingCommons systemFileio systemFilepath tls
-    transformers
-  ];
-  testDepends = [ conduit conduitExtra connection HUnit mtl ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Create TLS-aware network code with conduits";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
deleted file mode 100644
index 4bc1292f074..00000000000
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "network-conduit";
-  version = "1.1.0";
-  sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Stream socket data using conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-data/default.nix b/pkgs/development/libraries/haskell/network-data/default.nix
deleted file mode 100644
index d6c94c97a32..00000000000
--- a/pkgs/development/libraries/haskell/network-data/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, prettyclass }:
-
-cabal.mkDerivation (self: {
-  pname = "network-data";
-  version = "0.5.2";
-  sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
-  buildDepends = [ cereal prettyclass ];
-  meta = {
-    description = "Library for network data structures and their serialization";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix
deleted file mode 100644
index 92e6e9e34c7..00000000000
--- a/pkgs/development/libraries/haskell/network-fancy/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "network-fancy";
-  version = "0.2.2";
-  sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j";
-  meta = {
-    homepage = "http://github.com/taruti/network-fancy";
-    description = "Networking support with a cleaner API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix
deleted file mode 100644
index df584710c14..00000000000
--- a/pkgs/development/libraries/haskell/network-info/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "network-info";
-  version = "0.2.0.5";
-  sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf";
-  meta = {
-    homepage = "http://github.com/jystic/network-info";
-    description = "Access the local computer's basic network configuration";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix
deleted file mode 100644
index 1c6bf19e82b..00000000000
--- a/pkgs/development/libraries/haskell/network-metrics/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, network, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "network-metrics";
-  version = "0.4";
-  sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
-  buildDepends = [ binary dataDefault network random time ];
-  meta = {
-    homepage = "http://github.com/brendanhay/network-metrics";
-    description = "Send metrics to Ganglia, Graphite, and statsd";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
deleted file mode 100644
index 2102ad3c605..00000000000
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "network-multicast";
-  version = "0.0.11";
-  sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
-  buildDepends = [ network ];
-  meta = {
-    description = "Simple multicast library";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
deleted file mode 100644
index 90d9becb804..00000000000
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gnuidn, gnutls, gsasl, libxmlSax, monadsTf, network, text
-, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-protocol-xmpp";
-  version = "0.4.6";
-  sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n";
-  buildDepends = [
-    gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
-    xmlTypes
-  ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-xmpp/";
-    description = "Client library for the XMPP protocol";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
deleted file mode 100644
index ba7b0a01f5f..00000000000
--- a/pkgs/development/libraries/haskell/network-simple/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, network, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "network-simple";
-  version = "0.4.0.2";
-  sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf";
-  buildDepends = [ exceptions network transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/network-simple";
-    description = "Simple network sockets usage patterns";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
deleted file mode 100644
index cd467f5d2ab..00000000000
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataAccessor, network, networkTransport
-, networkTransportTests
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport-tcp";
-  version = "0.4.1";
-  sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf";
-  buildDepends = [ dataAccessor network networkTransport ];
-  testDepends = [ network networkTransport networkTransportTests ];
-  doCheck = false;
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "TCP instantiation of Network.Transport";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
deleted file mode 100644
index 5ee1edec2e9..00000000000
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, mtl, networkTransport, random }:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport-tests";
-  version = "0.2.1.0";
-  sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64";
-  buildDepends = [ ansiTerminal mtl networkTransport random ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Unit tests for Network.Transport implementations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
deleted file mode 100644
index 410e6076f29..00000000000
--- a/pkgs/development/libraries/haskell/network-transport/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, hashable, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "network-transport";
-  version = "0.4.1.0";
-  sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93";
-  buildDepends = [ binary hashable transformers ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Network abstraction layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
deleted file mode 100644
index 6cfd4dca161..00000000000
--- a/pkgs/development/libraries/haskell/network-uri/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, network, parsec, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network-uri";
-  version = "2.6.0.1";
-  sha256 = "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37";
-  buildDepends = [ parsec ];
-  testDepends = [
-    HUnit network testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/network-uri";
-    description = "URI manipulation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
deleted file mode 100644
index 515be08fbcc..00000000000
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.2.1.7";
-  sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58";
-  buildDepends = [ parsec ];
-  meta = {
-    description = "Networking-related facilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
deleted file mode 100644
index 757991666b6..00000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.13";
-  sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7";
-  buildDepends = [ parsec ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
deleted file mode 100644
index 59a338a7907..00000000000
--- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.5.0.0";
-  sha256 = "1x90fdzfigqq2vbjqg73p4vyy7p1z0apj79cpl7i9v9amxa6y5mj";
-  buildDepends = [ parsec ];
-  testDepends = [
-    HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.6.0.2.nix b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
deleted file mode 100644
index 37540ad323e..00000000000
--- a/pkgs/development/libraries/haskell/network/2.6.0.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.6.0.2";
-  sha256 = "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4";
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix
deleted file mode 100644
index 14105ed7349..00000000000
--- a/pkgs/development/libraries/haskell/newtype/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "newtype";
-  version = "0.2";
-  sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
-  meta = {
-    description = "A typeclass and set of functions for working with newtypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/non-empty/default.nix b/pkgs/development/libraries/haskell/non-empty/default.nix
deleted file mode 100644
index 7fba365097b..00000000000
--- a/pkgs/development/libraries/haskell/non-empty/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "non-empty";
-  version = "0.2";
-  sha256 = "1wapx5q8spvlq8g7nagj2lwhrqzg90dw4n0qvd1ap47n0rh3iymm";
-  buildDepends = [ QuickCheck utilityHt ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/non-empty/";
-    description = "List-like structures with static restrictions on the number of elements";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
deleted file mode 100644
index 9b7af5e7751..00000000000
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "non-negative";
-  version = "0.1.1";
-  sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
-  buildDepends = [ QuickCheck utilityHt ];
-  testDepends = [ QuickCheck utilityHt ];
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/non-negative/";
-    description = "Non-negative numbers";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
deleted file mode 100644
index 3d2ef6af751..00000000000
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
-
-cabal.mkDerivation (self: {
-  pname = "numbers";
-  version = "3000.2.0.1";
-  sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/numbers#readme";
-    description = "Various number types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix
deleted file mode 100644
index 918427d0fa0..00000000000
--- a/pkgs/development/libraries/haskell/numeric-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "numeric-extras";
-  version = "0.0.3";
-  sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
-  meta = {
-    homepage = "http://github.com/ekmett/numeric-extras";
-    description = "Useful tools from the C standard library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
deleted file mode 100644
index 003629d7852..00000000000
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, nonNegative, parsec, QuickCheck, random
-, storableRecord, utilityHt
-}:
-
-cabal.mkDerivation (self: {
-  pname = "numeric-prelude";
-  version = "0.4.1";
-  sha256 = "1y1dg4bk811xmz3p23g8kjl6vxns3gs8qj671971c06nccfl1h5r";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    deepseq nonNegative parsec QuickCheck random storableRecord
-    utilityHt
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
-    description = "An experimental alternative hierarchy of numeric type classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
deleted file mode 100644
index 3b6c777efbf..00000000000
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "numtype-tf";
-  version = "0.1.2";
-  sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Type-level (low cardinality) integers, implemented using type families";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
deleted file mode 100644
index 76874e04529..00000000000
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "numtype";
-  version = "1.1";
-  sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
-  meta = {
-    homepage = "http://dimensional.googlecode.com/";
-    description = "Type-level (low cardinality) integers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix
deleted file mode 100644
index 4051efb42f7..00000000000
--- a/pkgs/development/libraries/haskell/objective/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cleanUnions, elevator, minioperational, profunctors
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "objective";
-  version = "0.6.1";
-  sha256 = "1rnlh16r9kcrxffih6z8rprds9nxhlqksqba9wdgdkkwhrhq0ah6";
-  buildDepends = [
-    cleanUnions elevator minioperational profunctors transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fumieval/objective";
-    description = "Extensible objects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
deleted file mode 100644
index b1b9bd5820f..00000000000
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, HUnit, network, networkUri, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "oeis";
-  version = "0.3.6";
-  sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
-  buildDepends = [ HTTP network networkUri ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix
deleted file mode 100644
index d7fd805f5e8..00000000000
--- a/pkgs/development/libraries/haskell/ofx/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, time }:
-
-cabal.mkDerivation (self: {
-  pname = "ofx";
-  version = "0.4.0.2";
-  sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
-  buildDepends = [ parsec time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.github.com/massysett/ofx";
-    description = "Parser for OFX data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/oo-prototypes/default.nix b/pkgs/development/libraries/haskell/oo-prototypes/default.nix
deleted file mode 100644
index b9f011d3aa1..00000000000
--- a/pkgs/development/libraries/haskell/oo-prototypes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "oo-prototypes";
-  version = "0.1.0.0";
-  sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
-  meta = {
-    homepage = "https://github.com/yi-editor/oo-prototypes";
-    description = "Support for OO-like prototypes";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix
deleted file mode 100644
index 918bef94fba..00000000000
--- a/pkgs/development/libraries/haskell/opaleye/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, postgresqlSimple, productProfunctors
-, profunctors, semigroups, text, time, transformers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "opaleye";
-  version = "0.3";
-  sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx";
-  buildDepends = [
-    contravariant postgresqlSimple productProfunctors profunctors
-    semigroups text time transformers uuid
-  ];
-  testDepends = [
-    postgresqlSimple productProfunctors profunctors time
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-    description = "An SQL-generating DSL targeting PostgreSQL";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
deleted file mode 100644
index 5ae373fbac2..00000000000
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HsOpenSSL, HUnit, ioStreams, network, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "openssl-streams";
-  version = "1.2.0.0";
-  sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc";
-  buildDepends = [ HsOpenSSL ioStreams network ];
-  testDepends = [
-    HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
-  ];
-  jailbreak = true;
-  meta = {
-    description = "OpenSSL network support for io-streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix
deleted file mode 100644
index d3359a3377e..00000000000
--- a/pkgs/development/libraries/haskell/operational/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "operational";
-  version = "0.2.3.2";
-  sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl random ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Operational";
-    description = "Implementation of difficult monads made easy with operational semantics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix
deleted file mode 100644
index a44954c10cd..00000000000
--- a/pkgs/development/libraries/haskell/opml/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, xml }:
-
-cabal.mkDerivation (self: {
-  pname = "opml";
-  version = "0.4";
-  sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
-  buildDepends = [ xml ];
-  meta = {
-    description = "Representing and handling OPML subscription information";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix
deleted file mode 100644
index 721de1e600e..00000000000
--- a/pkgs/development/libraries/haskell/options/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, chellQuickcheck, monadsTf, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "options";
-  version = "1.2";
-  sha256 = "14qrkwd8h50wf6972p0ylvhnc8mh11fqk9l8q0h9lapj7ywm74vx";
-  buildDepends = [ monadsTf transformers ];
-  testDepends = [ chell chellQuickcheck monadsTf transformers ];
-  doCheck = false;
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-options/";
-    description = "A powerful and easy-to-use command-line option parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
deleted file mode 100644
index ea2dc95e364..00000000000
--- a/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "optparse-applicative";
-  version = "0.10.0";
-  sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
-  buildDepends = [ ansiWlPprint transformers transformersCompat ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/pcapriotti/optparse-applicative";
-    description = "Utilities and combinators for parsing command line options";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
deleted file mode 100644
index bef76ab73ee..00000000000
--- a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiWlPprint, transformers, transformersCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "optparse-applicative";
-  version = "0.11.0.1";
-  sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9";
-  buildDepends = [ ansiWlPprint transformers transformersCompat ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/pcapriotti/optparse-applicative";
-    description = "Utilities and combinators for parsing command line options";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
deleted file mode 100644
index feb273fbdeb..00000000000
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, attoparsec, dataDefault, filepath
-, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
-, tagsoup, temporary, text, time, vector, xmlConduit, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc-citeproc";
-  version = "0.6";
-  sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson aesonPretty attoparsec dataDefault filepath hsBibutils mtl
-    pandoc pandocTypes parsec rfc5051 split syb tagsoup temporary text
-    time vector xmlConduit yaml
-  ];
-  testDepends = [
-    aeson filepath pandoc pandocTypes temporary text yaml
-  ];
-  doCheck = false;
-  meta = {
-    description = "Supports using pandoc with citeproc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
deleted file mode 100644
index 2aff8f02478..00000000000
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, deepseqGenerics, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc-types";
-  version = "1.12.4.1";
-  sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq";
-  buildDepends = [ aeson deepseqGenerics syb ];
-  meta = {
-    homepage = "http://johnmacfarlane.net/pandoc";
-    description = "Types for representing a structured document";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
deleted file mode 100644
index 3788c1f3bf8..00000000000
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, alex, ansiTerminal, base64Bytestring, binary
-, blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff
-, executablePath, extensibleExceptions, filepath, haddockLibrary
-, happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls
-, httpTypes, HUnit, JuicyPixels, mtl, network, networkUri
-, pandocTypes, parsec, QuickCheck, random, scientific, SHA, syb
-, tagsoup, temporary, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, texmath, text, time
-, unorderedContainers, vector, xml, yaml, zipArchive, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pandoc";
-  version = "1.13.1";
-  sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv";
-  editedCabalFile = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson alex base64Bytestring binary blazeHtml blazeMarkup
-    dataDefault deepseqGenerics extensibleExceptions filepath
-    haddockLibrary happy highlightingKate hslua HTTP httpClient
-    httpClientTls httpTypes JuicyPixels mtl network networkUri
-    pandocTypes parsec random scientific SHA syb tagsoup temporary
-    texmath text time unorderedContainers vector xml yaml zipArchive
-    zlib
-  ];
-  testDepends = [
-    ansiTerminal Diff executablePath filepath highlightingKate HUnit
-    pandocTypes QuickCheck syb testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text zipArchive
-  ];
-  configureFlags = "-fhttps -fmake-pandoc-man-pages";
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://johnmacfarlane.net/pandoc";
-    description = "Conversion between markup formats";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
deleted file mode 100644
index d79b931132d..00000000000
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pango";
-  version = "0.13.0.4";
-  sha256 = "1fglwywac36abpjjpgdsk62f4sndgr5nf29fmana0yac7hxsm1sq";
-  buildDepends = [ cairo glib mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ cairo pango ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Pango text rendering engine";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
deleted file mode 100644
index 2bf50add862..00000000000
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, random }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel-io";
-  version = "0.3.3";
-  sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ extensibleExceptions random ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://batterseapower.github.com/parallel-io";
-    description = "Combinators for executing IO actions in parallel on a thread pool";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
deleted file mode 100644
index 0e73c691383..00000000000
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.2.0.3";
-  sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
deleted file mode 100644
index 987ee8c5bdc..00000000000
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.2.0.5";
-  sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
deleted file mode 100644
index 495df8984f6..00000000000
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parseargs";
-  version = "0.1.5.2";
-  sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://github.com/BartMassey/parseargs";
-    description = "Command-line argument parsing library for Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec-extra/default.nix b/pkgs/development/libraries/haskell/parsec-extra/default.nix
deleted file mode 100644
index b3dfb2e0a15..00000000000
--- a/pkgs/development/libraries/haskell/parsec-extra/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadsTf, parsec, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec-extra";
-  version = "0.1.0.5";
-  sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
-  buildDepends = [ monadsTf parsec transformers ];
-  meta = {
-    description = "Some miscellaneous basic string parsers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
deleted file mode 100644
index f2258da9968..00000000000
--- a/pkgs/development/libraries/haskell/parsec/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "3.1.7";
-  sha256 = "12h7n367gaw9ifd19yd3ppi4j6kghf7rryacl0ips0fwlxw1x8wa";
-  buildDepends = [ mtl text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
deleted file mode 100644
index 45bb96561c3..00000000000
--- a/pkgs/development/libraries/haskell/parsek/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parsek";
-  version = "1.0.1.2";
-  sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd";
-  meta = {
-    description = "Parallel Parsing Processes";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix
deleted file mode 100644
index 25f4a137083..00000000000
--- a/pkgs/development/libraries/haskell/parsers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck
-, quickcheckInstances, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "parsers";
-  version = "0.12.1.1";
-  sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw";
-  buildDepends = [
-    attoparsec charset parsec text transformers unorderedContainers
-  ];
-  testDepends = [
-    attoparsec doctest filepath parsec QuickCheck quickcheckInstances
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/parsers/";
-    description = "Parsing combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
deleted file mode 100644
index 14b0d08396e..00000000000
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsimony";
-  version = "1.3";
-  sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
-  buildDepends = [ text ];
-  meta = {
-    description = "Monadic parser combinators derived from Parsec";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
deleted file mode 100644
index eea91f43cb5..00000000000
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, QuickCheck, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "path-pieces";
-  version = "0.1.4";
-  sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v";
-  buildDepends = [ text time ];
-  testDepends = [ hspec HUnit QuickCheck text ];
-  meta = {
-    description = "Components of paths";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
deleted file mode 100644
index d004b177e3d..00000000000
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "pathtype";
-  version = "0.5.4";
-  sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
-  buildDepends = [ QuickCheck time ];
-  meta = {
-    homepage = "http://code.haskell.org/pathtype";
-    description = "Type-safe replacement for System.FilePath etc";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix
deleted file mode 100644
index 6f70eb1e14d..00000000000
--- a/pkgs/development/libraries/haskell/patience/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "patience";
-  version = "0.1.1";
-  sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
-  meta = {
-    description = "Patience diff and longest increasing subsequence";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix
deleted file mode 100644
index 43ef906aad2..00000000000
--- a/pkgs/development/libraries/haskell/pattern-arrows/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "pattern-arrows";
-  version = "0.0.2";
-  sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
-    description = "Arrows for Pretty Printing";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pbkdf/default.nix b/pkgs/development/libraries/haskell/pbkdf/default.nix
deleted file mode 100644
index 6f30043ee3b..00000000000
--- a/pkgs/development/libraries/haskell/pbkdf/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, byteable, bytedump, cryptohash, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "pbkdf";
-  version = "1.1.1.1";
-  sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
-  buildDepends = [ binary byteable bytedump cryptohash utf8String ];
-  testDepends = [ binary byteable bytedump cryptohash utf8String ];
-  meta = {
-    homepage = "https://github.com/cdornan/pbkdf";
-    description = "Haskell implementation of the PBKDF functions from RFC-2898";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
deleted file mode 100644
index db35b2fe020..00000000000
--- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, pcap, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pcap-enumerator";
-  version = "0.5";
-  sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
-  buildDepends = [ enumerator pcap transformers ];
-  meta = {
-    homepage = "http://github.com/cutsea110/pcap-enumerator";
-    description = "Convert a pcap into an enumerator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pcap/default.nix b/pkgs/development/libraries/haskell/pcap/default.nix
deleted file mode 100644
index 56e2e71969c..00000000000
--- a/pkgs/development/libraries/haskell/pcap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libpcap, network, time }:
-
-cabal.mkDerivation (self: {
-  pname = "pcap";
-  version = "0.4.5.2";
-  sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
-  buildDepends = [ network time ];
-  extraLibraries = [ libpcap ];
-  meta = {
-    homepage = "https://github.com/bos/pcap";
-    description = "A system-independent interface for user-level packet capture";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
deleted file mode 100644
index 49e0d5fffad..00000000000
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcre }:
-
-cabal.mkDerivation (self: {
-  pname = "pcre-light";
-  version = "0.4.0.3";
-  sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
-  extraLibraries = [ pcre ];
-  meta = {
-    homepage = "https://github.com/Daniel-Diaz/pcre-light";
-    description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
deleted file mode 100644
index 5ca5ab95622..00000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, ioStreams, pdfToolboxCore
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-content";
-  version = "0.0.3.1";
-  sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz";
-  buildDepends = [
-    attoparsec base16Bytestring ioStreams pdfToolboxCore text
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
deleted file mode 100644
index bc7b179a0da..00000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, errors, ioStreams, scientific, transformers
-, zlibBindings
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-core";
-  version = "0.0.3.0";
-  sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6";
-  buildDepends = [
-    attoparsec errors ioStreams scientific transformers zlibBindings
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
deleted file mode 100644
index 77615ed8665..00000000000
--- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cipherRc4, cryptohash, ioStreams, pdfToolboxContent
-, pdfToolboxCore, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pdf-toolbox-document";
-  version = "0.0.4.0";
-  sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa";
-  buildDepends = [
-    cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/Yuras/pdf-toolbox";
-    description = "A collection of tools for processing PDF files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
deleted file mode 100644
index 42944c03205..00000000000
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pem";
-  version = "0.2.2";
-  sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
-  buildDepends = [ base64Bytestring mtl ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-pem";
-    description = "Privacy Enhanced Mail (PEM) format reader and writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
deleted file mode 100644
index 1c86e8259a8..00000000000
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "permutation";
-  version = "0.5.0.4";
-  sha256 = "0kl5yw1as2y8yf2ac2f6v7g8k7mzjqw5fdh18a6m3jfhjw9rcqf7";
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/spacekitteh/permutation";
-    description = "A library for permutations and combinations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
deleted file mode 100644
index db4b89990b2..00000000000
--- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
-, mysql, mysqlSimple, persistent, resourcet, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-mysql";
-  version = "2.1.2";
-  sha256 = "06i2wcrqvk216bq3853acqi6wgrdzkz3wzah231gv3yz348lr6sv";
-  buildDepends = [
-    aeson blazeBuilder conduit monadControl monadLogger mysql
-    mysqlSimple persistent resourcet text transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using MySQL database server";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
deleted file mode 100644
index 1ccdeca9277..00000000000
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
-, persistent, postgresqlLibpq, postgresqlSimple, resourcet, text
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-postgresql";
-  version = "2.1.1";
-  sha256 = "0mfvzd62qn7ffx6nrgkr52qzl3prjq8xkahvb6j5akb6azdmzg80";
-  buildDepends = [
-    aeson blazeBuilder conduit monadControl monadLogger persistent
-    postgresqlLibpq postgresqlSimple resourcet text time transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using postgresql";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
deleted file mode 100644
index 34a427ddb07..00000000000
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, conduit, monadControl, monadLogger, persistent
-, resourcet, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-sqlite";
-  version = "2.1.1";
-  sha256 = "1hypaixwp6q10gfwbg0xfqfw7vz9j56max5i0k1mklan6js7wy9w";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson conduit monadControl monadLogger persistent resourcet text
-    transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Backend for the persistent library using sqlite3";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
deleted file mode 100644
index 1c8f502ba7b..00000000000
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hspec, monadControl, monadLogger, pathPieces
-, persistent, QuickCheck, tagged, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent-template";
-  version = "2.1";
-  sha256 = "0rj3yqm38kg7lvj9hi4c5yaypvxj6pwb47b0kg8h2hsa0rshhrdy";
-  buildDepends = [
-    aeson monadControl monadLogger pathPieces persistent tagged text
-    transformers unorderedContainers
-  ];
-  testDepends = [
-    aeson hspec persistent QuickCheck text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Type-safe, non-relational, multi-backend persistence";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
deleted file mode 100644
index 9775f510d42..00000000000
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
-, blazeMarkup, conduit, exceptions, fastLogger, hspec, liftedBase
-, monadControl, monadLogger, mtl, pathPieces, resourcePool
-, resourcet, scientific, silently, sqlite, tagged, text, time
-, transformers, transformersBase, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "persistent";
-  version = "2.1.1.4";
-  sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
-  buildDepends = [
-    aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    exceptions fastLogger liftedBase monadControl monadLogger mtl
-    pathPieces resourcePool resourcet scientific silently tagged text
-    time transformers transformersBase unorderedContainers vector
-  ];
-  testDepends = [
-    aeson attoparsec base64Bytestring blazeHtml conduit hspec
-    monadControl monadLogger pathPieces resourcet scientific text time
-    transformers unorderedContainers vector
-  ];
-  extraLibraries = [ sqlite ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Type-safe, multi-backend data serialization";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix
deleted file mode 100644
index 0e80c55a447..00000000000
--- a/pkgs/development/libraries/haskell/pgm/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "pgm";
-  version = "0.1.4";
-  sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "https://github.com/astanin/haskell-pgm";
-    description = "Pure Haskell implementation of PGM image format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
deleted file mode 100644
index 237492a65bd..00000000000
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring
-, pipesParse, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-aeson";
-  version = "0.4.1.2";
-  sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
-  buildDepends = [
-    aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
-    transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-aeson";
-    description = "Encode and decode JSON streams using Aeson and Pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
deleted file mode 100644
index d9d5caf4d29..00000000000
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty
-, tastyHunit, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-attoparsec";
-  version = "0.5.1.1";
-  sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz";
-  buildDepends = [ attoparsec pipes pipesParse text transformers ];
-  testDepends = [
-    attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
-    transformers
-  ];
-  meta = {
-    homepage = "https://github.com/k0001/pipes-attoparsec";
-    description = "Attoparsec and Pipes integration";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
deleted file mode 100644
index ea9fe83eab7..00000000000
--- a/pkgs/development/libraries/haskell/pipes-binary/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse
-, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-binary";
-  version = "0.4.0.3";
-  sha256 = "0r56h5f9i6hy4zb2bhfi26y7y3z0j4nacdb2dgkxmh5mqjd33f0q";
-  buildDepends = [
-    binary pipes pipesBytestring pipesParse transformers
-  ];
-  testDepends = [
-    binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit
-    tastySmallcheck transformers
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-binary";
-    description = "Encode and decode binary streams using the pipes and binary libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
deleted file mode 100644
index 8c52ccf5546..00000000000
--- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, pipesGroup, pipesParse, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-bytestring";
-  version = "2.1.0";
-  sha256 = "1q98444kpcdc817zbg121g2n1mhblrdfsmd0bs5rqq6ijxb213z0";
-  buildDepends = [ pipes pipesGroup pipesParse transformers ];
-  meta = {
-    description = "ByteString support for pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
deleted file mode 100644
index 91c9c6a8e19..00000000000
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, pipes, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-concurrency";
-  version = "2.0.2";
-  sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8";
-  buildDepends = [ pipes stm ];
-  testDepends = [ async pipes stm ];
-  meta = {
-    description = "Concurrency for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix
deleted file mode 100644
index e26526fb046..00000000000
--- a/pkgs/development/libraries/haskell/pipes-csv/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, cassava, HUnit, pipes, pipesBytestring
-, testFramework, testFrameworkHunit, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-csv";
-  version = "1.4.0";
-  sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
-  buildDepends = [
-    blazeBuilder cassava pipes unorderedContainers vector
-  ];
-  testDepends = [
-    cassava HUnit pipes pipesBytestring testFramework
-    testFrameworkHunit vector
-  ];
-  meta = {
-    description = "Fast, streaming csv parser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix
deleted file mode 100644
index 584713352ba..00000000000
--- a/pkgs/development/libraries/haskell/pipes-group/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, free, pipes, pipesParse, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-group";
-  version = "1.0.1";
-  sha256 = "19caih65hsvnvkwv8dlrrf961aw6k0zr9yx78cia1padslidxlbw";
-  buildDepends = [ free pipes pipesParse transformers ];
-  meta = {
-    description = "Group streams into substreams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix
deleted file mode 100644
index 5f432bc9dd9..00000000000
--- a/pkgs/development/libraries/haskell/pipes-http/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpClient, httpClientTls, pipes }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-http";
-  version = "1.0.2";
-  sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
-  buildDepends = [ httpClient httpClientTls pipes ];
-  jailbreak = true;
-  meta = {
-    description = "HTTP client with pipes interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
deleted file mode 100644
index 4e7cd3d125d..00000000000
--- a/pkgs/development/libraries/haskell/pipes-network/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, networkSimple, pipes, pipesSafe, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-network";
-  version = "0.6.4";
-  sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
-  buildDepends = [
-    network networkSimple pipes pipesSafe transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/k0001/pipes-network";
-    description = "Use network sockets together with the pipes library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
deleted file mode 100644
index 270908a56a6..00000000000
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-parse";
-  version = "3.0.2";
-  sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08";
-  buildDepends = [ pipes transformers ];
-  meta = {
-    description = "Parsing infrastructure for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
deleted file mode 100644
index ea2b230feeb..00000000000
--- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, exceptions, mtl, pipes, pipesConcurrency, pipesSafe
-, postgresqlSimple, stm, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-postgresql-simple";
-  version = "0.1.2.0";
-  sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
-  buildDepends = [
-    async exceptions mtl pipes pipesConcurrency pipesSafe
-    postgresqlSimple stm text transformers
-  ];
-  meta = {
-    description = "Convert various postgresql-simple calls to work with pipes";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix
deleted file mode 100644
index 6c3265cc9f4..00000000000
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, pipes, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-safe";
-  version = "2.2.0";
-  sha256 = "1m44a2pbws73jbr2ca48i94mrfwzlsibyc22i2w3fqq159qfg6ca";
-  buildDepends = [ exceptions pipes transformers ];
-  meta = {
-    description = "Safety for the pipes ecosystem";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-shell/default.nix b/pkgs/development/libraries/haskell/pipes-shell/default.nix
deleted file mode 100644
index f7f5e20bcf4..00000000000
--- a/pkgs/development/libraries/haskell/pipes-shell/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, hspec, pipes, pipesBytestring, pipesSafe, stm
-, stmChans, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-shell";
-  version = "0.1.3";
-  sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
-  buildDepends = [
-    async pipes pipesBytestring pipesSafe stm stmChans text
-  ];
-  testDepends = [
-    async hspec pipes pipesBytestring pipesSafe stm stmChans text
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    description = "Create proper Pipes from System.Process";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
deleted file mode 100644
index 177eb6e7d35..00000000000
--- a/pkgs/development/libraries/haskell/pipes-text/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe
-, streamingCommons, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-text";
-  version = "0.0.0.15";
-  sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
-  buildDepends = [
-    pipes pipesBytestring pipesGroup pipesParse pipesSafe
-    streamingCommons text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michaelt/text-pipes";
-    description = "Text pipes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
deleted file mode 100644
index bbb555681e0..00000000000
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pipes, transformers, zlib, zlibBindings }:
-
-cabal.mkDerivation (self: {
-  pname = "pipes-zlib";
-  version = "0.4.3";
-  sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
-  buildDepends = [ pipes transformers zlib zlibBindings ];
-  meta = {
-    homepage = "https://github.com/k0001/pipes-zlib";
-    description = "Zlib and GZip compression and decompression for Pipes streams";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
deleted file mode 100644
index 9703b14fc71..00000000000
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mmorph, mtl, QuickCheck, testFramework
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pipes";
-  version = "4.1.4";
-  sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb";
-  buildDepends = [ mmorph mtl transformers ];
-  testDepends = [
-    mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Compositional pipelines";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/placeholders/default.nix b/pkgs/development/libraries/haskell/placeholders/default.nix
deleted file mode 100644
index bb4a2c5ca15..00000000000
--- a/pkgs/development/libraries/haskell/placeholders/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "placeholders";
-  version = "0.1";
-  sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
-  meta = {
-    homepage = "http://github.com/ahammar/placeholders";
-    description = "Placeholders for use while developing Haskell code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/plugins/default.nix b/pkgs/development/libraries/haskell/plugins/default.nix
deleted file mode 100644
index face90f5b1d..00000000000
--- a/pkgs/development/libraries/haskell/plugins/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, ghcPaths, haskellSrc, random }:
-
-cabal.mkDerivation (self: {
-  pname = "plugins";
-  version = "1.5.4.0";
-  sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
-  buildDepends = [ Cabal filepath ghcPaths haskellSrc random ];
-  meta = {
-    homepage = "http://hub.darcs.net/stepcut/plugins";
-    description = "Dynamic linking for Haskell and C objects";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
deleted file mode 100644
index 82ee1a418c7..00000000000
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm
-, tagged, transformers, transformersCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pointed";
-  version = "4.1.1";
-  sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj";
-  buildDepends = [
-    comonad dataDefaultClass semigroupoids semigroups stm tagged
-    transformers transformersCompat
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/pointed/";
-    description = "Pointed and copointed data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix
deleted file mode 100644
index 8acb4bac6b1..00000000000
--- a/pkgs/development/libraries/haskell/pointedlist/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "pointedlist";
-  version = "0.6.1";
-  sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
-  buildDepends = [ binary ];
-  meta = {
-    description = "A zipper-like comonad which works as a list, tracking a position";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
deleted file mode 100644
index e2bb34f895c..00000000000
--- a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "polynomials-bernstein";
-  version = "1.1.1";
-  sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
-  buildDepends = [ vector ];
-  meta = {
-    description = "A solver for systems of polynomial equations in bernstein form";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
deleted file mode 100644
index 2b4e881421c..00000000000
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "polyparse";
-  version = "1.10";
-  sha256 = "0nz7dv91a2f7gf4jnma8qcqa4n6qjcyggf8qdja46sdcabpd0ij2";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://code.haskell.org/~malcolm/polyparse/";
-    description = "A variety of alternative parser combinator libraries";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
deleted file mode 100644
index 14098c980bb..00000000000
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, monadControl, resourcePool, resourcet, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pool-conduit";
-  version = "0.1.2.3";
-  sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
-  buildDepends = [
-    monadControl resourcePool resourcet transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Resource pool allocations via ResourceT. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix
deleted file mode 100644
index e0f1edad52e..00000000000
--- a/pkgs/development/libraries/haskell/pop3-client/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network }:
-
-cabal.mkDerivation (self: {
-  pname = "pop3-client";
-  version = "0.1.4";
-  sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
-  buildDepends = [ mtl network ];
-  meta = {
-    homepage = "https://github.com/tmrudick/haskell-pop3-client/";
-    description = "POP3 Client Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
deleted file mode 100644
index 0eb3c13f9bd..00000000000
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gdk_pixbuf, glib, gtk, gtk2hsBuildtools, libc, mtl
-, pango, popplerGlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "poppler";
-  version = "0.13";
-  sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
-  buildDepends = [ cairo glib gtk mtl ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc ];
-  pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
-  patchPhase = ''
-    sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
-    sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/gtk2hs/";
-    description = "Binding to the Poppler";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/posix-paths/default.nix b/pkgs/development/libraries/haskell/posix-paths/default.nix
deleted file mode 100644
index 3a49c84b783..00000000000
--- a/pkgs/development/libraries/haskell/posix-paths/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "posix-paths";
-  version = "0.2.0.3";
-  sha256 = "16r0sd2m9xzzkrvj6qvc7z3yc8r83kpx724v5wifphcri3scvznv";
-  testDepends = [ doctest HUnit QuickCheck ];
-  meta = {
-    description = "POSIX filepath/directory functionality";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
deleted file mode 100644
index eb677e4868c..00000000000
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, postgresql }:
-
-cabal.mkDerivation (self: {
-  pname = "postgresql-libpq";
-  version = "0.9.0.1";
-  sha256 = "0fdz9pkmrajqm026s6d5ib9kqg5ph93fw7l2xrgf22zagl53rzx3";
-  extraLibraries = [ postgresql ];
-  meta = {
-    homepage = "http://github.com/lpsmith/postgresql-libpq";
-    description = "low-level binding to libpq";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
deleted file mode 100644
index d48e80e3014..00000000000
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base16Bytestring, blazeBuilder
-, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit
-, postgresqlLibpq, scientific, text, time, transformers, uuid
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "postgresql-simple";
-  version = "0.4.8.0";
-  sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable
-    postgresqlLibpq scientific text time transformers uuid vector
-  ];
-  testDepends = [
-    aeson base16Bytestring cryptohash HUnit text time vector
-  ];
-  doCheck = false;
-  meta = {
-    description = "Mid-Level PostgreSQL client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix
deleted file mode 100644
index c84253da0e8..00000000000
--- a/pkgs/development/libraries/haskell/ppm/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "ppm";
-  version = "2009.5.13";
-  sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://github.com/nfjinjing/ppm/tree/master";
-    description = "a tiny PPM image generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix
deleted file mode 100644
index fdf153c5a26..00000000000
--- a/pkgs/development/libraries/haskell/pqueue/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "pqueue";
-  version = "1.2.1";
-  sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Reliable, persistent, fast priority queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prelude-extras/default.nix b/pkgs/development/libraries/haskell/prelude-extras/default.nix
deleted file mode 100644
index 40cbfef908a..00000000000
--- a/pkgs/development/libraries/haskell/prelude-extras/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prelude-extras";
-  version = "0.4";
-  sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
-  meta = {
-    homepage = "http://github.com/ekmett/prelude-extras";
-    description = "Haskell 98 - higher order versions of Prelude classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix b/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
deleted file mode 100644
index 17674a5be56..00000000000
--- a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prelude-safeenum";
-  version = "0.1.1.1";
-  sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "A redefinition of the Prelude's Enum class in order to render it safe";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/default.nix b/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
deleted file mode 100644
index 021becccfa1..00000000000
--- a/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "preprocessor-tools";
-  version = "1.0.1";
-  sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix
deleted file mode 100644
index a8efaf7554e..00000000000
--- a/pkgs/development/libraries/haskell/presburger/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "presburger";
-  version = "1.2";
-  sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm";
-  testDepends = [ QuickCheck ];
-  meta = {
-    homepage = "http://github.com/yav/presburger";
-    description = "A decision procedure for quantifier-free linear arithmetic";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix
deleted file mode 100644
index ee63eccf005..00000000000
--- a/pkgs/development/libraries/haskell/present/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoLisp, dataDefault, mtl, semigroups, text }:
-
-cabal.mkDerivation (self: {
-  pname = "present";
-  version = "2.2";
-  sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
-  buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ];
-  meta = {
-    description = "Make presentations for data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
deleted file mode 100644
index a9a39529f61..00000000000
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, happy, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "pretty-show";
-  version = "1.6.8";
-  sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath haskellLexer ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "http://wiki.github.com/yav/pretty-show";
-    description = "Tools for working with derived `Show` instances and generic inspection of values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prettyclass/default.nix b/pkgs/development/libraries/haskell/prettyclass/default.nix
deleted file mode 100644
index a81d734aaa9..00000000000
--- a/pkgs/development/libraries/haskell/prettyclass/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "prettyclass";
-  version = "1.0.0.0";
-  sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
-  meta = {
-    description = "Pretty printing class similar to Show";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
deleted file mode 100644
index 49ad80e064f..00000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.0.1";
-  sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
-  meta = {
-    homepage = "http://code.haskell.org/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix
deleted file mode 100644
index 2b43bf467c1..00000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.1.0";
-  sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
deleted file mode 100644
index 4f6d728122c..00000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.3.0";
-  sha256 = "11wfdnhrgb7606d5sywqzlvnhzf45a9ywl9wghysvmr0mq2iypvn";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
deleted file mode 100644
index 08b081d227c..00000000000
--- a/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.5.4.0";
-  sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10";
-  meta = {
-    homepage = "https://github.com/haskell/primitive";
-    description = "Primitive memory-related operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/probability/default.nix b/pkgs/development/libraries/haskell/probability/default.nix
deleted file mode 100644
index bada700ca3d..00000000000
--- a/pkgs/development/libraries/haskell/probability/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, transformers, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "probability";
-  version = "0.2.4.1";
-  sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
-  buildDepends = [ random transformers utilityHt ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
-    description = "Probabilistic Functional Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
deleted file mode 100644
index ff8a54b8571..00000000000
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl
-, resourcet, shakespeare, shakespeareText, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "process-conduit";
-  version = "1.2.0.1";
-  sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
-  buildDepends = [
-    conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
-    text
-  ];
-  testDepends = [ conduit conduitExtra hspec resourcet ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/snoyberg/process-conduit";
-    description = "Conduits for processes (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix
deleted file mode 100644
index 000b3b78e7f..00000000000
--- a/pkgs/development/libraries/haskell/process-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, text }:
-
-cabal.mkDerivation (self: {
-  pname = "process-extras";
-  version = "0.2.0";
-  sha256 = "0mr4f2v19qz6d6jhffz9gky0ykdqwl8c11adbdm04wm2a3xsvf7g";
-  buildDepends = [ deepseq text ];
-  meta = {
-    homepage = "https://github.com/davidlazar/process-extras";
-    description = "Process extras";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/process/1.2.0.0.nix b/pkgs/development/libraries/haskell/process/1.2.0.0.nix
deleted file mode 100644
index 615f9201b04..00000000000
--- a/pkgs/development/libraries/haskell/process/1.2.0.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "process";
-  version = "1.2.0.0";
-  sha256 = "02il5pxibf0q9b46v0lgdxyc2wlk5kg1v8223ry6brg41zpcj71q";
-  buildDepends = [ deepseq filepath ];
-  meta = {
-    description = "Process libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix
deleted file mode 100644
index 444baa76a1a..00000000000
--- a/pkgs/development/libraries/haskell/product-profunctors/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, profunctors }:
-
-cabal.mkDerivation (self: {
-  pname = "product-profunctors";
-  version = "0.6";
-  sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4";
-  buildDepends = [ contravariant profunctors ];
-  testDepends = [ profunctors ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/tomjaguarpaw/product-profunctors";
-    description = "product-profunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
deleted file mode 100644
index b1336cd59da..00000000000
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, distributive, semigroupoids, tagged, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "profunctors";
-  version = "4.3.2";
-  sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v";
-  buildDepends = [
-    comonad distributive semigroupoids tagged transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/profunctors/";
-    description = "Profunctors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
deleted file mode 100644
index 8cb7dfd32ae..00000000000
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl
-, QuickCheck, resourcet, systemFileio, systemFilepath, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "project-template";
-  version = "0.1.4.2";
-  sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr";
-  buildDepends = [
-    base64Bytestring conduit conduitExtra mtl resourcet systemFileio
-    systemFilepath text transformers
-  ];
-  testDepends = [
-    base64Bytestring conduit hspec QuickCheck resourcet systemFilepath
-    text transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/haskell-ide";
-    description = "Specify Haskell project templates and generate files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
deleted file mode 100644
index 73ddd10427a..00000000000
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fgl, graphviz, mtl, prolog, text }:
-
-cabal.mkDerivation (self: {
-  pname = "prolog-graph-lib";
-  version = "0.2.0.1";
-  sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
-  buildDepends = [ fgl graphviz mtl prolog text ];
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "Generating images of resolution trees for Prolog queries";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
deleted file mode 100644
index 7a8d0fc42f2..00000000000
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "prolog-graph";
-  version = "0.1.0.2";
-  sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs fgl graphviz mtl prolog prologGraphLib text
-  ];
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "A command line tool to visualize query resolution in Prolog";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
deleted file mode 100644
index 71539fb342a..00000000000
--- a/pkgs/development/libraries/haskell/prolog/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb, thLift, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "prolog";
-  version = "0.2.0.1";
-  sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
-  buildDepends = [ mtl parsec syb thLift transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/Erdwolf/prolog";
-    description = "A Prolog interpreter written in Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protobuf/default.nix b/pkgs/development/libraries/haskell/protobuf/default.nix
deleted file mode 100644
index 3b0c1508ce0..00000000000
--- a/pkgs/development/libraries/haskell/protobuf/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataBinaryIeee754, deepseq, hex, HUnit, mtl
-, QuickCheck, tagged, tasty, tastyHunit, tastyQuickcheck, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "protobuf";
-  version = "0.2.0.4";
-  sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j";
-  buildDepends = [
-    cereal dataBinaryIeee754 deepseq mtl text unorderedContainers
-  ];
-  testDepends = [
-    cereal hex HUnit mtl QuickCheck tagged tasty tastyHunit
-    tastyQuickcheck text unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/alphaHeavy/protobuf";
-    description = "Google Protocol Buffers via GHC.Generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
deleted file mode 100644
index e7df6ac2075..00000000000
--- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, protocolBuffers }:
-
-cabal.mkDerivation (self: {
-  pname = "protocol-buffers-descriptor";
-  version = "2.0.17";
-  sha256 = "0jl041645d83iqqiw891d2k760jql6djvi2mmjh9lnmp48lwjy3p";
-  buildDepends = [ protocolBuffers ];
-  meta = {
-    homepage = "http://code.haskell.org/protocol-buffers/";
-    description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
deleted file mode 100644
index d3d81a14658..00000000000
--- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, mtl, parsec, syb, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "protocol-buffers";
-  version = "2.0.17";
-  sha256 = "12aky44ssgdj6vsjg0yvr8350cym7n6kn7gdaax0nxzpfxrjfy1v";
-  buildDepends = [ binary filepath mtl parsec syb utf8String ];
-  meta = {
-    homepage = "http://code.haskell.org/protocol-buffers/";
-    description = "Parse Google Protocol Buffer specifications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/psqueues/default.nix b/pkgs/development/libraries/haskell/psqueues/default.nix
deleted file mode 100644
index aea7f2f0950..00000000000
--- a/pkgs/development/libraries/haskell/psqueues/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, deepseq, hashable, HUnit, QuickCheck, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "psqueues";
-  version = "0.1.1.0";
-  sha256 = "1w6i6cl9wfblbg8d06lffh4l5y42li9a27myyvwnzfv86z49s9cb";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    deepseq hashable HUnit QuickCheck tagged testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    description = "Pure priority search queues";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
deleted file mode 100644
index 2a2d8fcd098..00000000000
--- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, dataDefault, HUnit, idna, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "publicsuffixlist";
-  version = "0.1";
-  sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
-  buildDepends = [ cereal dataDefault text utf8String ];
-  testDepends = [ cereal dataDefault HUnit idna text utf8String ];
-  meta = {
-    homepage = "https://github.com/litherum/publicsuffixlist";
-    description = "Is a given string a domain suffix?";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix
deleted file mode 100644
index 3a07d382754..00000000000
--- a/pkgs/development/libraries/haskell/punycode/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "punycode";
-  version = "2.0";
-  sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
-  buildDepends = [ cereal mtl text ];
-  testDepends = [ cereal encoding HUnit mtl QuickCheck text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/litherum/punycode";
-    description = "Encode unicode strings to ascii forms according to RFC 3492";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pure-cdb/default.nix b/pkgs/development/libraries/haskell/pure-cdb/default.nix
deleted file mode 100644
index b173a619cfd..00000000000
--- a/pkgs/development/libraries/haskell/pure-cdb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, testSimple, Unixutils, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "pure-cdb";
-  version = "0.1.1";
-  sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
-  buildDepends = [ binary mtl vector ];
-  testDepends = [ mtl testSimple Unixutils vector ];
-  meta = {
-    homepage = "https://github.com/bosu/pure-cdb";
-    description = "Another pure-haskell CDB (Constant Database) implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
deleted file mode 100644
index 0252f8dc6df..00000000000
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, cryptoApi, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "pureMD5";
-  version = "2.1.2.1";
-  sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
-  buildDepends = [ binary cereal cryptoApi tagged ];
-  meta = {
-    description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
deleted file mode 100644
index fd6fe516de7..00000000000
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs
-, optparseApplicative, parsec, patternArrows, time, transformers
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "purescript";
-  version = "0.6.3";
-  sha256 = "0hd6aslsfw2jd06wyfzi1kr86vfj91ywvgl9rv9cyawzczk7l7v4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    fileEmbed filepath haskeline monadUnify mtl optparseApplicative
-    parsec patternArrows time transformers unorderedContainers
-    utf8String
-  ];
-  testDepends = [
-    filepath mtl nodejs parsec transformers utf8String
-  ];
-  meta = {
-    homepage = "http://www.purescript.org/";
-    description = "PureScript Programming Language Compiler";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
deleted file mode 100644
index cca1e04bd4e..00000000000
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, binary, byteable, cryptohash, random }:
-
-cabal.mkDerivation (self: {
-  pname = "pwstore-fast";
-  version = "2.4.4";
-  sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
-  buildDepends = [
-    base64Bytestring binary byteable cryptohash random
-  ];
-  meta = {
-    homepage = "https://github.com/PeterScott/pwstore";
-    description = "Secure password storage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix
deleted file mode 100644
index 89defe86bad..00000000000
--- a/pkgs/development/libraries/haskell/qrencode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, qrencode }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-qrencode";
-  version = "1.0.4";
-  sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
-  extraLibraries = [ qrencode ];
-  meta = {
-    homepage = "https://github.com/jamessanders/haskell-qrencode";
-    description = "Haskell bindings for libqrencode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix
deleted file mode 100644
index d83fdf12acb..00000000000
--- a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, ieee754, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-assertions";
-  version = "0.1.1";
-  sha256 = "0hrnr17wafng7nc6d8w6pp1lygplri8xkb5380aq64zg9iik2s21";
-  buildDepends = [ ieee754 QuickCheck ];
-  testDepends = [ hspec ieee754 QuickCheck ];
-  meta = {
-    homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
-    description = "HUnit like assertions for QuickCheck";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
deleted file mode 100644
index 11bcb7aab6d..00000000000
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, QuickCheck, text, time, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-instances";
-  version = "0.3.9";
-  sha256 = "1a0mbd1kga4qnamp80x2g4avjwcy8z0zrriqxdhb1525wyyb0656";
-  buildDepends = [
-    hashable QuickCheck text time unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/aslatter/qc-instances";
-    description = "Common quickcheck instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
deleted file mode 100644
index d96131c5332..00000000000
--- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-io";
-  version = "0.1.1";
-  sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
-  buildDepends = [ HUnit QuickCheck ];
-  meta = {
-    description = "Use HUnit assertions as QuickCheck properties";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
deleted file mode 100644
index 3ef3b02851e..00000000000
--- a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, either, filepath, QuickCheck, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-property-monad";
-  version = "0.2.3";
-  sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
-  buildDepends = [ either QuickCheck transformers ];
-  testDepends = [ doctest filepath QuickCheck ];
-  meta = {
-    homepage = "http://github.com/bennofs/quickcheck-property-monad/";
-    description = "quickcheck-property-monad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
deleted file mode 100644
index edc2924f09b..00000000000
--- a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "quickcheck-unicode";
-  version = "1.0.0.0";
-  sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq";
-  buildDepends = [ QuickCheck ];
-  meta = {
-    homepage = "https://github.com/bos/quickcheck-unicode";
-    description = "Generator and shrink functions for testing Unicode-related software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
deleted file mode 100644
index 73506a3ba75..00000000000
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, erf, logfloat, mathFunctions, monadLoops, mtl
-, randomShuffle, randomSource, rvar, syb, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "random-fu";
-  version = "0.2.6.1";
-  sha256 = "04fi92szpjyg0ffgxfayz00vpiqi67hzyahhin12wvw3pxbyyp9g";
-  buildDepends = [
-    erf logfloat mathFunctions monadLoops mtl randomShuffle
-    randomSource rvar syb transformers vector
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Random number generation";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
deleted file mode 100644
index 76f0c1f0ebb..00000000000
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MonadRandom, random }:
-
-cabal.mkDerivation (self: {
-  pname = "random-shuffle";
-  version = "0.0.4";
-  sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
-  buildDepends = [ MonadRandom random ];
-  meta = {
-    description = "Random shuffle implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
deleted file mode 100644
index bdb341cead5..00000000000
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom
-, random, stateref, syb, thExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "random-source";
-  version = "0.3.0.6";
-  sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
-  buildDepends = [
-    flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
-    syb thExtras
-  ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Generic basis for random number generators";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
deleted file mode 100644
index 031c251fbb7..00000000000
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.1.1";
-  sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
deleted file mode 100644
index 3939c439248..00000000000
--- a/pkgs/development/libraries/haskell/random/1.0.1.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.0.1.3";
-  sha256 = "06mbjx05c54iz5skn4biyjy9sqdr1qi6d33an8wya7sndnpakd21";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/random/1.1.nix b/pkgs/development/libraries/haskell/random/1.1.nix
deleted file mode 100644
index 5ff11eeefda..00000000000
--- a/pkgs/development/libraries/haskell/random/1.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "random";
-  version = "1.1";
-  sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
-  buildDepends = [ time ];
-  meta = {
-    description = "random number library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
deleted file mode 100644
index 33b1ddf5b44..00000000000
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "ranges";
-  version = "0.2.4";
-  sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
-  meta = {
-    description = "Ranges and various functions on them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
deleted file mode 100644
index 7137bf668c5..00000000000
--- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "rank1dynamic";
-  version = "0.2.0.0";
-  sha256 = "09p3lggnsn0355440d9cazwijv9qm4siw99gg2xkk2hamp2sj42h";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://haskell-distributed.github.com";
-    description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rawStringsQq/default.nix b/pkgs/development/libraries/haskell/rawStringsQq/default.nix
deleted file mode 100644
index ca5c2248958..00000000000
--- a/pkgs/development/libraries/haskell/rawStringsQq/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "raw-strings-qq";
-  version = "1.0.2";
-  sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
-  meta = {
-    homepage = "https://github.com/23Skidoo/raw-strings-qq";
-    description = "Raw string literals for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
deleted file mode 100644
index 2bff24cd3ab..00000000000
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cabalMacosx, reactiveBanana, wx, wxcore }:
-
-cabal.mkDerivation (self: {
-  pname = "reactive-banana-wx";
-  version = "0.8.0.0";
-  sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
-  configureFlags = "-f-buildExamples";
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Examples for the reactive-banana library, using wxHaskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
deleted file mode 100644
index 964c4767b27..00000000000
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit
-, transformers, unorderedContainers, vault
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reactive-banana";
-  version = "0.8.0.2";
-  sha256 = "0hfhq663dvvb3jbgdnarawryw09m8ckqvqp6p5n4d4dms4gfzcdv";
-  buildDepends = [
-    hashable pqueue transformers unorderedContainers vault
-  ];
-  testDepends = [
-    hashable HUnit pqueue testFramework testFrameworkHunit transformers
-    unorderedContainers vault
-  ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Library for functional reactive programming (FRP)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ bluescreen303 ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
deleted file mode 100644
index 9a05fed7e12..00000000000
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, readline, ncurses }:
-
-cabal.mkDerivation (self: {
-  pname = "readline";
-  version = "1.0.3.0";
-  sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
-  propagatedBuildInputs = [ readline ncurses ];
-  # experimentally link with ncursesw because ghci can't interpret ld scripts,
-  # and ncurses sometimes seems to be a script pointing to ncursesw
-  postConfigure = ''
-    sed -i -e "/^extra-libraries/ s/ncurses/ncursesw/" readline.buildinfo
-  '';
-  meta = {
-    description = "An interface to the GNU readline library";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
deleted file mode 100644
index 00fe58be4b1..00000000000
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HTTP, network, networkUri, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "recaptcha";
-  version = "0.1.0.3";
-  sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
-  buildDepends = [ HTTP network networkUri xhtml ];
-  meta = {
-    homepage = "http://github.com/jgm/recaptcha/tree/master";
-    description = "Functions for using the reCAPTCHA service in web applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix
deleted file mode 100644
index e846d69d0db..00000000000
--- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, free, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "recursion-schemes";
-  version = "4.1";
-  sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf";
-  buildDepends = [ comonad free transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/recursion-schemes/";
-    description = "Generalized bananas, lenses and barbed wire";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
deleted file mode 100644
index 5cf9535e1b2..00000000000
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, fingertree, hashable, keys, pointed
-, semigroupoids, semigroups, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reducers";
-  version = "3.10.3";
-  sha256 = "0hi77mgc2f38y0xfykn7x6gdl6xg710skpx4z76s8c0wwnd28pr6";
-  buildDepends = [
-    comonad fingertree hashable keys pointed semigroupoids semigroups
-    text transformers unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/reducers/";
-    description = "Semigroups, specialized containers and a general map/reduce framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
deleted file mode 100644
index b7138c3e974..00000000000
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "reflection";
-  version = "1.5.1";
-  sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx";
-  buildDepends = [ tagged ];
-  meta = {
-    homepage = "http://github.com/ekmett/reflection";
-    description = "Reifies arbitrary terms into types that can be reflected back into terms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-applicative/default.nix b/pkgs/development/libraries/haskell/regex-applicative/default.nix
deleted file mode 100644
index 1e3b5b96346..00000000000
--- a/pkgs/development/libraries/haskell/regex-applicative/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, smallcheck, tasty, tastyHunit, tastySmallcheck
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "regex-applicative";
-  version = "0.3.0.3";
-  sha256 = "111j6x1j7bx5viz2hmgyvcdwfrv5x3f9mifx888hyd3hz850wpwc";
-  buildDepends = [ transformers ];
-  testDepends = [
-    smallcheck tasty tastyHunit tastySmallcheck transformers
-  ];
-  meta = {
-    homepage = "https://github.com/feuerbach/regex-applicative";
-    description = "Regex-based parsing with applicative interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-base/default.nix b/pkgs/development/libraries/haskell/regex-base/default.nix
deleted file mode 100644
index 2a99cc96c25..00000000000
--- a/pkgs/development/libraries/haskell/regex-base/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-base";
-  version = "0.93.2";
-  sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
deleted file mode 100644
index b364f3714a6..00000000000
--- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexTdfa }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat-tdfa";
-  version = "0.95.1.4";
-  sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
-  buildDepends = [ regexBase regexTdfa ];
-  meta = {
-    homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
-    description = "Unicode Support version of Text.Regex, using regex-tdfa";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat/default.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix
deleted file mode 100644
index 83dffb381fc..00000000000
--- a/pkgs/development/libraries/haskell/regex-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat";
-  version = "0.95.1";
-  sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
-  buildDepends = [ regexBase regexPosix ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
deleted file mode 100644
index f5ddf2a6388..00000000000
--- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-pcre-builtin";
-  version = "0.94.4.8.8.35";
-  sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-pcre";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix
deleted file mode 100644
index db0f8b7ff45..00000000000
--- a/pkgs/development/libraries/haskell/regex-pcre/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcre, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-pcre";
-  version = "0.94.4";
-  sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
-  buildDepends = [ regexBase ];
-  extraLibraries = [ pcre ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-pcre";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
deleted file mode 100644
index 292edc23563..00000000000
--- a/pkgs/development/libraries/haskell/regex-posix/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.95.2";
-  sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix
deleted file mode 100644
index 0e5bb61bfed..00000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa-rc";
-  version = "1.1.8.3";
-  sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
-  buildDepends = [ mtl parsec regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-tdfa";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
deleted file mode 100644
index b532234312a..00000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexTdfa, text }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa-text";
-  version = "1.0.0.2";
-  sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
-  buildDepends = [ regexBase regexTdfa text ];
-  meta = {
-    description = "Text interface for regex-tdfa";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
deleted file mode 100644
index 2508920e1b4..00000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-tdfa";
-  version = "1.2.0";
-  sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
-  buildDepends = [ mtl parsec regexBase ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/regex-tdfa";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
deleted file mode 100644
index 2a61bf13598..00000000000
--- a/pkgs/development/libraries/haskell/regexpr/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, mtlparse }:
-
-cabal.mkDerivation (self: {
-  pname = "regexpr";
-  version = "0.5.4";
-  sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604";
-  buildDepends = [ HUnit mtl mtlparse ];
-  meta = {
-    homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
-    description = "regular expression like Perl/Ruby in Haskell";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
deleted file mode 100644
index 4b4fe43102a..00000000000
--- a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hxt, regular, text }:
-
-cabal.mkDerivation (self: {
-  pname = "regular-xmlpickler";
-  version = "0.2";
-  sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
-  buildDepends = [ hxt regular text ];
-  meta = {
-    homepage = "http://github.com/silkapp/regular-xmlpickler";
-    description = "Generic generation of HXT XmlPickler instances using Regular";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
deleted file mode 100644
index d18909d6f29..00000000000
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "regular";
-  version = "0.3.4.3";
-  sha256 = "12pc58agqb4fi0riwxjf0kykn1z12273q8dcdd0fh2x1ddxwgg2r";
-  meta = {
-    description = "Generic programming library for regular datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rematch/default.nix b/pkgs/development/libraries/haskell/rematch/default.nix
deleted file mode 100644
index 0ef47cde904..00000000000
--- a/pkgs/development/libraries/haskell/rematch/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "rematch";
-  version = "0.2.0.0";
-  sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
-  testDepends = [ hspec HUnit ];
-  doCheck = false;
-  meta = {
-    description = "A simple api for matchers";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix
deleted file mode 100644
index 47235710b1e..00000000000
--- a/pkgs/development/libraries/haskell/remote/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, filepath, mtl, network, pureMD5, stm, syb, time
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "remote";
-  version = "0.1.1";
-  sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
-  buildDepends = [
-    binary filepath mtl network pureMD5 stm syb time utf8String
-  ];
-  meta = {
-    description = "Cloud Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
deleted file mode 100644
index 5abce50c45c..00000000000
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa-algorithms";
-  version = "3.3.1.2";
-  sha256 = "12fizvma877ws3xiz3k34jg5xh5yhnl0n5aq2za005l9i5angkk9";
-  buildDepends = [ repa vector ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Algorithms using the Repa array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
deleted file mode 100644
index 518e8ce4789..00000000000
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, llvm, QuickCheck, random, repa, repaAlgorithms, repaIo
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "repa-examples";
-  version = "3.3.1.1";
-  sha256 = "0gdkwmdnmvq82zglryxx2ic1nm4g2r4a0bwndiwbj670w03p712p";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    QuickCheck random repa repaAlgorithms repaIo vector
-  ];
-  extraLibraries = [ llvm ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Examples using the Repa array library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
deleted file mode 100644
index 38e6933de61..00000000000
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bmp, repa, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa-io";
-  version = "3.3.1.2";
-  sha256 = "1i58ysk44y7s6z1jmns2fi83flqma4k5nsjh1pblqb2rgl7x0z5p";
-  buildDepends = [ binary bmp repa vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "Read and write Repa arrays in various formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
deleted file mode 100644
index 7978f80eec7..00000000000
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "repa";
-  version = "3.3.1.2";
-  sha256 = "0rsahd6c1mxd8hq9zfx4jqgmcfs4di4askky87y71xy5v4k1x4ai";
-  buildDepends = [ QuickCheck vector ];
-  meta = {
-    homepage = "http://repa.ouroborus.net";
-    description = "High performance, regular, shape polymorphic parallel arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
deleted file mode 100644
index fe075fba1fe..00000000000
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
-
-cabal.mkDerivation (self: {
-  pname = "repr";
-  version = "0.4.1.3";
-  sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
-  buildDepends = [
-    baseUnicodeSymbols dstring random stringCombinators
-  ];
-  meta = {
-    homepage = "https://github.com/basvandijk/repr";
-    description = "Render overloaded expressions to their textual representation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reserve/default.nix b/pkgs/development/libraries/haskell/reserve/default.nix
deleted file mode 100644
index 753368e07c7..00000000000
--- a/pkgs/development/libraries/haskell/reserve/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, hspec, httpConduit, httpKit, httpTypes
-, network, QuickCheck, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "reserve";
-  version = "0.1.0";
-  sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ baseCompat httpKit httpTypes network ];
-  testDepends = [
-    baseCompat hspec httpConduit httpKit httpTypes network QuickCheck
-    warp
-  ];
-  meta = {
-    description = "Reserve reloads web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
deleted file mode 100644
index 47950176a49..00000000000
--- a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, MonadCatchIOTransformers, stm, time
-, transformers, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resource-pool-catchio";
-  version = "0.2.1.0";
-  sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
-  buildDepends = [
-    hashable MonadCatchIOTransformers stm time transformers
-    transformersBase vector
-  ];
-  meta = {
-    homepage = "http://github.com/norm2782/pool";
-    description = "Fork of resource-pool, with a MonadCatchIO constraint";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
deleted file mode 100644
index 76492381c7a..00000000000
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, monadControl, stm, time, transformers
-, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resource-pool";
-  version = "0.2.3.2";
-  sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
-  buildDepends = [
-    hashable monadControl stm time transformers transformersBase vector
-  ];
-  meta = {
-    homepage = "http://github.com/bos/pool";
-    description = "A high-performance striped resource pooling implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
deleted file mode 100644
index 2ee001b4225..00000000000
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "resourcet";
-  version = "1.1.3.3";
-  sha256 = "0ih5p1k0n3ylcv0yk5x7hjzbzhs67vxmng708g9vz7a24xs2m7w2";
-  buildDepends = [
-    exceptions liftedBase mmorph monadControl mtl transformers
-    transformersBase
-  ];
-  testDepends = [ hspec liftedBase transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Deterministic allocation and freeing of scarce resources";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
deleted file mode 100644
index a1a1ce6287b..00000000000
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aesonUtils, caseInsensitive, dataDefault
-, exceptionTransformers, httpConduit, httpTypes, hxt
-, hxtPickleUtils, monadControl, mtl, primitive, resourcet
-, restTypes, tostring, transformersBase, uriEncode, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-client";
-  version = "0.4.0.5";
-  sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
-  buildDepends = [
-    aesonUtils caseInsensitive dataDefault exceptionTransformers
-    httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
-    resourcet restTypes tostring transformersBase uriEncode utf8String
-  ];
-  meta = {
-    description = "Utility library for use in generated API client libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
deleted file mode 100644
index 1c4affbafdc..00000000000
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonUtils, either, errors, fclabels, HUnit, hxt
-, hxtPickleUtils, jsonSchema, mtl, multipart, random, restStringmap
-, restTypes, safe, split, testFramework, testFrameworkHunit, text
-, transformers, unorderedContainers, uriEncode, utf8String, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-core";
-  version = "0.34.0.3";
-  sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19";
-  buildDepends = [
-    aeson aesonUtils either errors fclabels hxt hxtPickleUtils
-    jsonSchema mtl multipart random restStringmap restTypes safe split
-    text transformers unorderedContainers uriEncode utf8String uuid
-  ];
-  testDepends = [
-    HUnit mtl testFramework testFrameworkHunit unorderedContainers
-  ];
-  meta = {
-    description = "Rest API library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
deleted file mode 100644
index f97d701fba1..00000000000
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
-, hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
-, jsonSchema, restCore, safe, scientific, semigroups, split, tagged
-, testFramework, testFrameworkHunit, text, uniplate
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-gen";
-  version = "0.16.1.3";
-  sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a";
-  buildDepends = [
-    aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
-    haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore
-    safe scientific semigroups split tagged text uniplate
-    unorderedContainers vector
-  ];
-  testDepends = [
-    fclabels haskellSrcExts HUnit restCore testFramework
-    testFrameworkHunit
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Documentation and client generation from rest definition";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
deleted file mode 100644
index 0cb090524e8..00000000000
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, mtl, restCore, restGen, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "rest-happstack";
-  version = "0.2.10.6";
-  sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5";
-  buildDepends = [ happstackServer mtl restCore restGen utf8String ];
-  meta = {
-    description = "Rest driver for Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
deleted file mode 100644
index ac584ae4844..00000000000
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, restCore, safe, snapCore
-, unorderedContainers, uriEncode, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-snap";
-  version = "0.1.17.16";
-  sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia";
-  buildDepends = [
-    caseInsensitive restCore safe snapCore unorderedContainers
-    uriEncode utf8String
-  ];
-  meta = {
-    description = "Rest driver for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
deleted file mode 100644
index 9c1e98c0655..00000000000
--- a/pkgs/development/libraries/haskell/rest-stringmap/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hashable, hxt, jsonSchema, tagged, text, tostring
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-stringmap";
-  version = "0.2.0.2";
-  sha256 = "0nzkc09679c2mz3amh1avk2kfjpqbhbxsr0r9zvgcs71gqkal2mz";
-  buildDepends = [
-    aeson hashable hxt jsonSchema tagged text tostring
-    unorderedContainers
-  ];
-  jailbreak = true;
-  meta = {
-    description = "Maps with stringy keys that can be transcoded to JSON and XML";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
deleted file mode 100644
index 9a4caac1ad2..00000000000
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, genericAeson, hxt, jsonSchema, mtl, regular
-, regularXmlpickler, restStringmap, text, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-types";
-  version = "1.12";
-  sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6";
-  buildDepends = [
-    aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
-    restStringmap text uuid
-  ];
-  meta = {
-    description = "Silk Rest Framework Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
deleted file mode 100644
index 761519a99e2..00000000000
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore, text
-, unorderedContainers, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rest-wai";
-  version = "0.1.0.6";
-  sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz";
-  buildDepends = [
-    caseInsensitive httpTypes mimeTypes mtl restCore text
-    unorderedContainers wai
-  ];
-  meta = {
-    description = "Rest driver for WAI applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix
deleted file mode 100644
index bcf4272ad7a..00000000000
--- a/pkgs/development/libraries/haskell/rethinkdb/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, base64Bytestring, binary, dataDefault, doctest, mtl
-, network, scientific, text, time, unorderedContainers, utf8String
-, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "rethinkdb";
-  version = "1.15.2.1";
-  sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5";
-  buildDepends = [
-    aeson base64Bytestring binary dataDefault mtl network scientific
-    text time unorderedContainers utf8String vector
-  ];
-  testDepends = [ doctest ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/atnnn/haskell-rethinkdb";
-    description = "A driver for RethinkDB 1.15";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
deleted file mode 100644
index 0df453d10bb..00000000000
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefaultClass, exceptions, hspec, HUnit, QuickCheck
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "retry";
-  version = "0.5.1";
-  sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj";
-  buildDepends = [ dataDefaultClass exceptions transformers ];
-  testDepends = [
-    dataDefaultClass exceptions hspec HUnit QuickCheck time
-    transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/Soostone/retry";
-    description = "Retry combinators for monadic actions that may fail";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/reverse-apply/default.nix b/pkgs/development/libraries/haskell/reverse-apply/default.nix
deleted file mode 100644
index 8f39027b251..00000000000
--- a/pkgs/development/libraries/haskell/reverse-apply/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "reverse-apply";
-  version = "2.0.1";
-  sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
-  meta = {
-    description = "Standard version of the reverse apply operator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rex/default.nix b/pkgs/development/libraries/haskell/rex/default.nix
deleted file mode 100644
index 2f2d3ca89e5..00000000000
--- a/pkgs/development/libraries/haskell/rex/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, haskellSrcMeta, pcreLight }:
-
-cabal.mkDerivation (self: {
-  pname = "rex";
-  version = "0.5.1";
-  sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
-  buildDepends = [ haskellSrcExts haskellSrcMeta pcreLight ];
-  meta = {
-    homepage = "http://github.com/mgsloan/rex";
-    description = "A quasi-quoter for typeful results of regex captures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rfc5051/default.nix b/pkgs/development/libraries/haskell/rfc5051/default.nix
deleted file mode 100644
index 45a7f3c3da3..00000000000
--- a/pkgs/development/libraries/haskell/rfc5051/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "rfc5051";
-  version = "0.1.0.3";
-  sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    description = "Simple unicode collation as per RFC5051";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix
deleted file mode 100644
index 0ebf6dac301..00000000000
--- a/pkgs/development/libraries/haskell/robots-txt/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "robots-txt";
-  version = "0.4.1.1";
-  sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f";
-  buildDepends = [ attoparsec time ];
-  testDepends = [ attoparsec heredoc hspec QuickCheck transformers ];
-  meta = {
-    homepage = "http://github.com/meanpath/robots";
-    description = "Parser for robots.txt";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rope/default.nix b/pkgs/development/libraries/haskell/rope/default.nix
deleted file mode 100644
index 3c751d5eddd..00000000000
--- a/pkgs/development/libraries/haskell/rope/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fingertree, mtl, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "rope";
-  version = "0.6.4";
-  sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
-  buildDepends = [ fingertree mtl utf8String ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/rope";
-    description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix
deleted file mode 100644
index 736deff0db0..00000000000
--- a/pkgs/development/libraries/haskell/rosezipper/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "rosezipper";
-  version = "0.2";
-  sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
-  meta = {
-    description = "Generic zipper implementation for Data.Tree";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
deleted file mode 100644
index 0802c8ba3f5..00000000000
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, MonadPrompt, mtl, randomSource, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "rvar";
-  version = "0.2.0.2";
-  sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
-  buildDepends = [ MonadPrompt mtl randomSource transformers ];
-  meta = {
-    homepage = "https://github.com/mokus0/random-fu";
-    description = "Random Variables";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
deleted file mode 100644
index 3676ee09db6..00000000000
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "safe";
-  version = "0.3.8";
-  sha256 = "0k5lk85z2y8kgk7dx7km32g8vi55vnwln8ys2gs174ljd136cjdf";
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/safe/";
-    description = "Library of safe (exception free) functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix
deleted file mode 100644
index 6faa46d20bb..00000000000
--- a/pkgs/development/libraries/haskell/safecopy/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, quickcheckInstances, tasty, tastyQuickcheck
-, text, time, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "safecopy";
-  version = "0.8.3";
-  sha256 = "10xd42a1i84fwiy3db0ji4bd8ssk9jqysqwc00wdcdjyp50c333n";
-  buildDepends = [ cereal text time vector ];
-  testDepends = [
-    cereal lens quickcheckInstances tasty tastyQuickcheck time vector
-  ];
-  meta = {
-    homepage = "http://acid-state.seize.it/safecopy";
-    description = "Binary serialization with version control";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/saltine/default.nix b/pkgs/development/libraries/haskell/saltine/default.nix
deleted file mode 100644
index acb4066fb2e..00000000000
--- a/pkgs/development/libraries/haskell/saltine/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libsodium, profunctors, QuickCheck, testFramework
-, testFrameworkQuickcheck2, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "saltine";
-  version = "0.0.0.3";
-  sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y";
-  buildDepends = [ profunctors ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 vector
-  ];
-  extraLibraries = [ libsodium ];
-  meta = {
-    description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix
deleted file mode 100644
index 18fcb238726..00000000000
--- a/pkgs/development/libraries/haskell/sample-frame/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, storableRecord }:
-
-cabal.mkDerivation (self: {
-  pname = "sample-frame";
-  version = "0.0.3";
-  sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ QuickCheck storableRecord ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
-    description = "Handling of samples in an (audio) signal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix
deleted file mode 100644
index 492dcd816ed..00000000000
--- a/pkgs/development/libraries/haskell/sbv/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, filepath, HUnit, mtl, QuickCheck, random
-, syb
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sbv";
-  version = "3.3";
-  sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    async deepseq filepath HUnit mtl QuickCheck random syb
-  ];
-  testDepends = [ filepath HUnit syb ];
-  meta = {
-    homepage = "http://leventerkok.github.com/sbv/";
-    description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
deleted file mode 100644
index 0e45c9ad075..00000000000
--- a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scientific";
-  version = "0.2.0.2";
-  sha256 = "13rrdaf5mrhpckq9vvrm4pnj63vahg7f0g75hk11nk7k1644l4f0";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ smallcheck tasty tastySmallcheck text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/scientific";
-    description = "Arbitrary-precision floating-point numbers represented using scientific notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
deleted file mode 100644
index 10e294b4214..00000000000
--- a/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty
-, tastyAntXml, tastyHunit, tastyQuickcheck, tastySmallcheck, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scientific";
-  version = "0.3.3.3";
-  sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [
-    QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck
-    tastySmallcheck text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/basvandijk/scientific";
-    description = "Numbers represented using scientific notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
deleted file mode 100644
index 9f5c652d22c..00000000000
--- a/pkgs/development/libraries/haskell/scotty-hastache/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hastache, httpTypes, mtl, scotty, text, wai
-, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scotty-hastache";
-  version = "0.2.1";
-  sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
-  buildDepends = [
-    filepath hastache httpTypes mtl scotty text wai warp
-  ];
-  meta = {
-    homepage = "https://github.com/scotty-web/scotty-hastache";
-    description = "Easy Mustache templating support for Scotty";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
deleted file mode 100644
index 1e184577a66..00000000000
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, caseInsensitive, dataDefault, hspec2
-, hspecWai, httpTypes, liftedBase, monadControl, mtl, regexCompat
-, text, transformers, transformersBase, wai, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scotty";
-  version = "0.9.1";
-  sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
-  buildDepends = [
-    aeson blazeBuilder caseInsensitive dataDefault httpTypes
-    monadControl mtl regexCompat text transformers transformersBase wai
-    waiExtra warp
-  ];
-  testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/scotty-web/scotty";
-    description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/scrypt/default.nix b/pkgs/development/libraries/haskell/scrypt/default.nix
deleted file mode 100644
index c0d9e2df2e8..00000000000
--- a/pkgs/development/libraries/haskell/scrypt/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, entropy, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scrypt";
-  version = "0.5.0";
-  sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
-  buildDepends = [ base64Bytestring entropy ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://github.com/informatikr/scrypt";
-    description = "Stronger password hashing via sequential memory-hard functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix
deleted file mode 100644
index 29561239d19..00000000000
--- a/pkgs/development/libraries/haskell/sdl2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, SDL2, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "sdl2";
-  version = "1.3.0";
-  sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
-  buildDepends = [ transformers ];
-  extraLibraries = [ SDL2 ];
-  pkgconfigDepends = [ SDL2 ];
-  meta = {
-    description = "Low-level bindings to SDL2";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
deleted file mode 100644
index c03a92d0fd3..00000000000
--- a/pkgs/development/libraries/haskell/securemem/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteable }:
-
-cabal.mkDerivation (self: {
-  pname = "securemem";
-  version = "0.1.4";
-  sha256 = "1wdbcnyaarrixfvz79mcyqmfnn9h5zsmrrsa64xj8650ppyaxi48";
-  buildDepends = [ byteable ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-securemem";
-    description = "abstraction to an auto scrubbing and const time eq, memory chunk";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
deleted file mode 100644
index 13b005a98a9..00000000000
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "semigroupoid-extras";
-  version = "4.0";
-  sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g";
-  buildDepends = [ semigroupoids ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroupoid-extras";
-    description = "This package has been absorbed into semigroupoids 4.0";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
deleted file mode 100644
index ca625f5eb75..00000000000
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, semigroups
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "semigroupoids";
-  version = "4.2";
-  sha256 = "18zip518f2l2ccmg3hjzy5mq2b8r98crzm10kr77yc4m64w5vac8";
-  buildDepends = [
-    comonad contravariant distributive semigroups transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroupoids";
-    description = "Semigroupoids: Category sans id";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
deleted file mode 100644
index 8cd94e9079f..00000000000
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, nats, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "semigroups";
-  version = "0.16";
-  sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s";
-  buildDepends = [ deepseq hashable nats text unorderedContainers ];
-  meta = {
-    homepage = "http://github.com/ekmett/semigroups/";
-    description = "Anything that associates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
deleted file mode 100644
index b7fddb0bc04..00000000000
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "sendfile";
-  version = "0.7.9";
-  sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
-  buildDepends = [ network ];
-  meta = {
-    homepage = "http://hub.darcs.net/stepcut/sendfile";
-    description = "A portable sendfile library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/serialport/default.nix b/pkgs/development/libraries/haskell/serialport/default.nix
deleted file mode 100644
index 5e733f82ca1..00000000000
--- a/pkgs/development/libraries/haskell/serialport/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit }:
-
-cabal.mkDerivation (self: {
-  pname = "serialport";
-  version = "0.4.7";
-  sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
-  testDepends = [ HUnit ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/jputcu/serialport";
-    description = "Cross platform serial port library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix
deleted file mode 100644
index d11e25222ea..00000000000
--- a/pkgs/development/libraries/haskell/servant-client/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec
-, httpClient, httpTypes, network, networkUri, QuickCheck, safe
-, servant, servantServer, stringConversions, text, transformers
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-client";
-  version = "0.2.1";
-  sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn";
-  buildDepends = [
-    aeson attoparsec either exceptions httpClient httpTypes networkUri
-    safe servant stringConversions text transformers
-  ];
-  testDepends = [
-    aeson deepseq either hspec httpTypes network QuickCheck servant
-    servantServer wai warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "automatical derivation of querying functions for servant webservices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix
deleted file mode 100644
index 3da6936532c..00000000000
--- a/pkgs/development/libraries/haskell/servant-docs/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, hashable, lens, servant, stringConversions
-, systemFilepath, text, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-docs";
-  version = "0.2.1";
-  sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson hashable lens servant stringConversions systemFilepath text
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "generate API docs for your servant webservice";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix
deleted file mode 100644
index 2a85cb19106..00000000000
--- a/pkgs/development/libraries/haskell/servant-jquery/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, filepath, lens, servant, servantServer, stm
-, transformers, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-jquery";
-  version = "0.2.1";
-  sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson filepath lens servant servantServer stm transformers warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "Automatically derive jquery-based javascript functions to query servant webservices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix
deleted file mode 100644
index 8c3ce56d412..00000000000
--- a/pkgs/development/libraries/haskell/servant-server/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai
-, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant
-, split, stringConversions, systemFilepath, temporary, text
-, transformers, wai, waiAppStatic, waiExtra, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-server";
-  version = "0.2.3";
-  sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec either httpTypes networkUri safe servant split
-    stringConversions systemFilepath text transformers wai waiAppStatic
-    warp
-  ];
-  testDepends = [
-    aeson either exceptions hspec hspecWai httpTypes network parsec
-    QuickCheck servant stringConversions temporary text transformers
-    wai waiExtra warp
-  ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "A family of combinators for defining webservices APIs and serving them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix
deleted file mode 100644
index 1c206c1ab22..00000000000
--- a/pkgs/development/libraries/haskell/servant/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, parsec, QuickCheck, stringConversions, text }:
-
-cabal.mkDerivation (self: {
-  pname = "servant";
-  version = "0.2.1";
-  sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x";
-  buildDepends = [ parsec stringConversions text ];
-  testDepends = [ hspec parsec QuickCheck stringConversions text ];
-  meta = {
-    homepage = "http://haskell-servant.github.io/";
-    description = "A family of combinators for defining webservices APIs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
deleted file mode 100644
index 567c50ecb2a..00000000000
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "setenv";
-  version = "0.1.1.1";
-  sha256 = "0azkvsvk9i1979rn45zryqyirvjhj9b32nnz1m30aasbs2q8f393";
-  doCheck = false;
-  meta = {
-    description = "A cross-platform library for setting environment variables";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
deleted file mode 100644
index a76a2f5cf32..00000000000
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "setlocale";
-  version = "1.0.0.1";
-  sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0";
-  jailbreak = true;
-  meta = {
-    description = "Haskell bindings to setlocale";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
deleted file mode 100644
index 3ed0912b0f3..00000000000
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ gcc, cabal, binary, deepseq, extra, filepath, hashable, jsFlot
-, jsJquery, QuickCheck, random, time, transformers
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shake";
-  version = "0.14.3";
-  sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl";
-  isLibrary = true;
-  isExecutable = true;
-  buildTools = [ gcc ];
-  buildDepends = [
-    binary deepseq extra filepath hashable jsFlot jsJquery random time
-    transformers unorderedContainers utf8String
-  ];
-  testDepends = [
-    binary deepseq extra filepath hashable jsFlot jsJquery QuickCheck
-    random time transformers unorderedContainers utf8String
-  ];
-  meta = {
-    homepage = "http://www.shakebuild.com/";
-    description = "Build system library, like Make, but more accurate dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
deleted file mode 100644
index 3db4273cc92..00000000000
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-css";
-  version = "1.1.0";
-  sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into css at compile time. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
deleted file mode 100644
index 0b8cdbf5bbc..00000000000
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-i18n";
-  version = "1.1.0";
-  sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "A type-based approach to internationalization. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
deleted file mode 100644
index 27aa98d1548..00000000000
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-js";
-  version = "1.3.0";
-  sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
deleted file mode 100644
index 786f6741ca1..00000000000
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, shakespeare }:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare-text";
-  version = "1.1.0";
-  sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
-  buildDepends = [ shakespeare ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
deleted file mode 100644
index 5c6b804810d..00000000000
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, blazeMarkup, exceptions, hspec, HUnit
-, parsec, systemFileio, systemFilepath, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shakespeare";
-  version = "2.0.2.1";
-  sha256 = "1s73nlkccfg3wl0qfx6f7q3afiakdhzh5xksnfhsg5hjhx80qhza";
-  buildDepends = [
-    aeson blazeHtml blazeMarkup exceptions parsec systemFileio
-    systemFilepath text time transformers
-  ];
-  testDepends = [
-    aeson blazeHtml blazeMarkup exceptions hspec HUnit parsec
-    systemFileio systemFilepath text time transformers
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "A toolkit for making compile-time interpolated templates";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix
deleted file mode 100644
index a93e38b1b82..00000000000
--- a/pkgs/development/libraries/haskell/shell-conduit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, conduit, conduitExtra, controlMonadLoop, filepath
-, monadControl, monadsTf, resourcet, semigroups, split, text
-, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shell-conduit";
-  version = "4.5";
-  sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g";
-  buildDepends = [
-    async conduit conduitExtra controlMonadLoop filepath monadControl
-    monadsTf resourcet semigroups split text transformers
-    transformersBase
-  ];
-  meta = {
-    homepage = "https://github.com/chrisdone/shell-conduit";
-    description = "Write shell scripts with Conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shellish/default.nix b/pkgs/development/libraries/haskell/shellish/default.nix
deleted file mode 100644
index cdf2e3a3463..00000000000
--- a/pkgs/development/libraries/haskell/shellish/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, strict, time, unixCompat }:
-
-cabal.mkDerivation (self: {
-  pname = "shellish";
-  version = "0.1.4";
-  sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
-  buildDepends = [ filepath mtl strict time unixCompat ];
-  meta = {
-    homepage = "http://repos.mornfall.net/shellish";
-    description = "shell-/perl- like (systems) programming in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix
deleted file mode 100644
index dcc7211f869..00000000000
--- a/pkgs/development/libraries/haskell/shellmate/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, temporary, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "shellmate";
-  version = "0.1.6";
-  sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";
-  buildDepends = [ filepath temporary time transformers ];
-  meta = {
-    homepage = "http://github.com/valderman/shellmate";
-    description = "Simple interface for shell scripting in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
deleted file mode 100644
index 251cb6a17b5..00000000000
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, enclosedExceptions, exceptions, liftedAsync
-, liftedBase, monadControl, mtl, systemFileio, systemFilepath, text
-, time, transformers, transformersBase, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shelly";
-  version = "1.6.0";
-  sha256 = "0yrx7sv1s8pddpap143d3yi3ypvf84jjh16i8b3dm4kb3m4x3mdv";
-  buildDepends = [
-    async enclosedExceptions exceptions liftedAsync liftedBase
-    monadControl mtl systemFileio systemFilepath text time transformers
-    transformersBase unixCompat
-  ];
-  meta = {
-    homepage = "https://github.com/yesodweb/Shelly.hs";
-    description = "shell-like (systems) programming in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
deleted file mode 100644
index cc8cf94c9d6..00000000000
--- a/pkgs/development/libraries/haskell/show/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "show";
-  version = "0.6";
-  sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg";
-  buildDepends = [ syb ];
-  meta = {
-    description = "'Show' instances for Lambdabot";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix
deleted file mode 100644
index 619f8614f09..00000000000
--- a/pkgs/development/libraries/haskell/silently/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, nanospec }:
-
-cabal.mkDerivation (self: {
-  pname = "silently";
-  version = "1.2.4.1";
-  sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52";
-  buildDepends = [ deepseq ];
-  testDepends = [ deepseq nanospec ];
-  meta = {
-    homepage = "https://github.com/trystan/silently";
-    description = "Prevent or capture writing to stdout and other handles";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix
deleted file mode 100644
index 49e574772f1..00000000000
--- a/pkgs/development/libraries/haskell/simple-conduit/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, chunkedData, either, exceptions, filepath
-, free, liftedAsync, liftedBase, mmorph, monadControl
-, monoTraversable, mtl, mwcRandom, primitive, semigroups, stm
-, streamingCommons, text, transformers, transformersBase, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "simple-conduit";
-  version = "0.5.1";
-  sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
-  buildDepends = [
-    bifunctors chunkedData either exceptions filepath free liftedAsync
-    liftedBase mmorph monadControl monoTraversable mtl mwcRandom
-    primitive semigroups stm streamingCommons text transformers
-    transformersBase vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jwiegley/simple-conduit";
-    description = "A simple streaming I/O library based on monadic folds";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix
deleted file mode 100644
index 6ff9d26dc74..00000000000
--- a/pkgs/development/libraries/haskell/simple-reflect/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-reflect";
-  version = "0.3.2";
-  sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-  meta = {
-    homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
-    description = "Simple reflection of expressions containing variables";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
deleted file mode 100644
index d291aba9630..00000000000
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, conduitExtra, hspec, HUnit, network, resourcet }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-sendfile";
-  version = "0.2.18";
-  sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49";
-  buildDepends = [ network ];
-  testDepends = [
-    conduit conduitExtra hspec HUnit network resourcet
-  ];
-  doCheck = false;
-  meta = {
-    description = "Cross platform library for the sendfile system call";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix
deleted file mode 100644
index 71cd2f4bbd7..00000000000
--- a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "simple-sql-parser";
-  version = "0.4.0";
-  sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl parsec ];
-  testDepends = [
-    HUnit mtl parsec testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "http://jakewheat.github.io/simple-sql-parser/";
-    description = "A parser for SQL queries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
deleted file mode 100644
index c4074b9d62c..00000000000
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden
-, thDesugar
-}:
-
-cabal.mkDerivation (self: {
-  pname = "singletons";
-  version = "1.0";
-  sha256 = "1rd1728wghhqlg2djd7az8i01rf4i3wwwcnz2v43a39jjvhlklkg";
-  buildDepends = [ mtl thDesugar ];
-  testDepends = [ Cabal constraints filepath tasty tastyGolden ];
-  noHaddock = true;
-  patches = self.stdenv.lib.optional self.stdenv.isDarwin ./test.patch;
-  meta = {
-    homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
-    description = "A framework for generating singleton types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/singletons/test.patch b/pkgs/development/libraries/haskell/singletons/test.patch
deleted file mode 100644
index 6979c2c6cb0..00000000000
--- a/pkgs/development/libraries/haskell/singletons/test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tests/SingletonsTestSuiteUtils.hs
-+++ b/tests/SingletonsTestSuiteUtils.hs
-@@ -201,7 +201,7 @@ testCompileAndDumpGroup testDir tests =
- filterWithSed :: FilePath -> IO ()
- filterWithSed file = runProcessWithOpts CreatePipe "sed"
- #ifdef darwin_HOST_OS
--  [ "-i", "''"
-+  [ "-i"
- #else
-   [ "-i"
- #endif
-
diff --git a/pkgs/development/libraries/haskell/sitemap/default.nix b/pkgs/development/libraries/haskell/sitemap/default.nix
deleted file mode 100644
index 1a6b2849476..00000000000
--- a/pkgs/development/libraries/haskell/sitemap/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, taggy, taggyLens, text }:
-
-cabal.mkDerivation (self: {
-  pname = "sitemap";
-  version = "0.1.2";
-  sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
-  buildDepends = [ lens taggy taggyLens text ];
-  meta = {
-    homepage = "http://github.com/alpmestan/sitemap";
-    description = "Sitemap parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
deleted file mode 100644
index 67af162a2a8..00000000000
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, singletons }:
-
-cabal.mkDerivation (self: {
-  pname = "sized-types";
-  version = "0.5.0";
-  sha256 = "1cvgw2plzgpddg2p74hylx499dv4hn2nc8s085mnayp5n9jkn8md";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ singletons ];
-  meta = {
-    homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
-    description = "Sized types in Haskell using the GHC Nat kind";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sized/default.nix b/pkgs/development/libraries/haskell/sized/default.nix
deleted file mode 100644
index ae75ff26e4c..00000000000
--- a/pkgs/development/libraries/haskell/sized/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, ListLike, monomorphic, typeNatural, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "sized";
-  version = "0.1.0.0";
-  sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
-  buildDepends = [
-    constraints ListLike monomorphic typeNatural vector
-  ];
-  meta = {
-    description = "Sized sequence data-types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
deleted file mode 100644
index c60bf97d54f..00000000000
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, cryptoApi, filepath, hspec, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "skein";
-  version = "1.0.9.2";
-  sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw";
-  buildDepends = [ cereal cryptoApi tagged ];
-  testDepends = [ cereal cryptoApi filepath hspec tagged ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/meteficha/skein";
-    description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/slack-api/default.nix b/pkgs/development/libraries/haskell/slack-api/default.nix
deleted file mode 100644
index d0e6b32f572..00000000000
--- a/pkgs/development/libraries/haskell/slack-api/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, aeson, errors, HsOpenSSL, ioStreams, lens, lensAeson
-, monadLoops, mtl, network, opensslStreams, text, time
-, transformers, websockets, wreq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "slack-api";
-  version = "0.2.1";
-  sha256 = "1k6p60gb13g09y6isr1r90zw548vs4y1fz34amfhdx79g9zm30hy";
-  buildDepends = [
-    aeson errors HsOpenSSL ioStreams lens lensAeson monadLoops mtl
-    network opensslStreams text time transformers websockets wreq
-  ];
-  meta = {
-    description = "Bindings to the Slack RTM API";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
deleted file mode 100644
index 1a35a79d9ec..00000000000
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, logict, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "smallcheck";
-  version = "1.1.1";
-  sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
-  buildDepends = [ logict mtl ];
-  meta = {
-    homepage = "https://github.com/feuerbach/smallcheck";
-    description = "A property-based testing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtLib/default.nix b/pkgs/development/libraries/haskell/smtLib/default.nix
deleted file mode 100644
index 2e60c83e991..00000000000
--- a/pkgs/development/libraries/haskell/smtLib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "smtLib";
-  version = "1.0.7";
-  sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
-  meta = {
-    description = "A library for working with the SMTLIB format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix
deleted file mode 100644
index ab97608541d..00000000000
--- a/pkgs/development/libraries/haskell/smtp-mail/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base16Bytestring, base64Bytestring, cryptohash, filepath
-, mimeMail, network, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "smtp-mail";
-  version = "0.1.4.5";
-  sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
-  buildDepends = [
-    base16Bytestring base64Bytestring cryptohash filepath mimeMail
-    network text
-  ];
-  meta = {
-    homepage = "http://github.com/jhickner/smtp-mail";
-    description = "Simple email sending via SMTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
deleted file mode 100644
index 75cb227cd85..00000000000
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, conduit, conduitExtra
-, cprngAes, dataDefault, filepath, mimeMail, network, resourcet
-, stringsearch, text, tls, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "smtps-gmail";
-  version = "1.3.0";
-  sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
-  buildDepends = [
-    attoparsec base64Bytestring conduit conduitExtra cprngAes
-    dataDefault filepath mimeMail network resourcet stringsearch text
-    tls transformers
-  ];
-  meta = {
-    homepage = "https://github.com/enzoh/smtps-gmail";
-    description = "Gmail SMTP Client";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-blaze/default.nix b/pkgs/development/libraries/haskell/snap-blaze/default.nix
deleted file mode 100644
index 9dd9bf382bd..00000000000
--- a/pkgs/development/libraries/haskell/snap-blaze/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, snapCore }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-blaze";
-  version = "0.2.1.2";
-  sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
-  buildDepends = [ blazeHtml snapCore ];
-  meta = {
-    homepage = "http://github.com/jaspervdj/snap-blaze";
-    description = "blaze-html integration for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
deleted file mode 100644
index f9d043dff80..00000000000
--- a/pkgs/development/libraries/haskell/snap-cors/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, caseInsensitive, hashable, network, networkUri
-, snap, text, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-cors";
-  version = "1.2.6";
-  sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8";
-  buildDepends = [
-    attoparsec caseInsensitive hashable network networkUri snap text
-    transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/snap-cors";
-    description = "Add CORS headers to Snap applications";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
deleted file mode 100644
index b9b6376394a..00000000000
--- a/pkgs/development/libraries/haskell/snap-error-collector/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, MonadCatchIOTransformers, monadLoops, snap, stm
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-error-collector";
-  version = "1.1.0";
-  sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2";
-  buildDepends = [
-    async MonadCatchIOTransformers monadLoops snap stm time
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/snap-error-collector";
-    description = "Collect errors in batches and dispatch them";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
deleted file mode 100644
index a8252a4f3f0..00000000000
--- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-web-routes";
-  version = "0.5.0.0";
-  sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
-  buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/lukerandall/snap-web-routes";
-    description = "Type safe URLs for Snap";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
deleted file mode 100644
index 410e9db6f92..00000000000
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
-, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers
-, mtl, random, regexPosix, text, time, unixCompat
-, unorderedContainers, vector, zlibEnum
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-core";
-  version = "0.9.6.3";
-  sha256 = "0i3gl1kxzi2l76sqhyhda7lrcvq8hq6aqgwvfx5k9fa2xic01dw1";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    bytestringMmap caseInsensitive deepseq enumerator filepath hashable
-    HUnit MonadCatchIOTransformers mtl random regexPosix text time
-    unixCompat unorderedContainers vector zlibEnum
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework (core interfaces and types)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
deleted file mode 100644
index 0f4132a75da..00000000000
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, directoryTree, hint, mtl, snapCore, time }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-loader-dynamic";
-  version = "0.10.0.2";
-  sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7";
-  buildDepends = [ directoryTree hint mtl snapCore time ];
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework: dynamic loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
deleted file mode 100644
index 4b74ed294dc..00000000000
--- a/pkgs/development/libraries/haskell/snap/loader-static.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "snap-loader-static";
-  version = "0.9.0.2";
-  sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Snap: A Haskell Web Framework: static loader";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
deleted file mode 100644
index cacb0c03945..00000000000
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, caseInsensitive, enumerator, HsOpenSSL
-, MonadCatchIOTransformers, mtl, network, snapCore, text, time
-, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap-server";
-  version = "0.9.4.5";
-  sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    caseInsensitive enumerator HsOpenSSL MonadCatchIOTransformers mtl
-    network snapCore text time unixCompat
-  ];
-  configureFlags = "-fopenssl";
-  patchPhase = ''
-    sed -i -e 's|text *>= .*,|text,|' -e 's|HsOpenSSL >= .*|HsOpenSSL|' -e 's|network.*2.6,|network,|' snap-server.cabal
-  '';
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
deleted file mode 100644
index bb4afe88512..00000000000
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, cereal, clientsession, comonad
-, configurator, directoryTree, dlist, errors, filepath, hashable
-, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
-, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
-, time, transformers, unorderedContainers, vector, vectorAlgorithms
-, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snap";
-  version = "0.13.3.2";
-  sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec cereal clientsession comonad configurator
-    directoryTree dlist errors filepath hashable heist lens logict
-    MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
-    snapCore snapServer stm syb text time transformers
-    unorderedContainers vector vectorAlgorithms xmlhtml
-  ];
-  meta = {
-    homepage = "http://snapframework.com/";
-    description = "Top-level package for the Snap Web Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
deleted file mode 100644
index 96a64488f2a..00000000000
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, acidState, snap, text }:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-acid-state";
-  version = "0.2.6.1";
-  sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
-  buildDepends = [ acidState snap text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/mightybyte/snaplet-acid-state";
-    description = "acid-state snaplet for Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
deleted file mode 100644
index 7745fa5ddbe..00000000000
--- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, clientsession, configurator, errors, lens
-, MonadCatchIOTransformers, mtl, postgresqlSimple
-, resourcePoolCatchio, snap, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-postgresql-simple";
-  version = "0.6";
-  sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6";
-  buildDepends = [
-    clientsession configurator errors lens MonadCatchIOTransformers mtl
-    postgresqlSimple resourcePoolCatchio snap text transformers
-    unorderedContainers
-  ];
-  meta = {
-    homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
-    description = "postgresql-simple snaplet for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix
deleted file mode 100644
index 1b7a7b10b21..00000000000
--- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, hedis, lens, mtl, network, snap, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-redis";
-  version = "0.1.4.1";
-  sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2";
-  buildDepends = [
-    configurator hedis lens mtl network snap text transformers
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/dzhus/snaplet-redis/";
-    description = "Redis support for Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
deleted file mode 100644
index 6f0f3d5de06..00000000000
--- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, configurator, heist, lensFamilyCore, mtl, snap, stripe
-, text, textFormat, transformers, xmlhtml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snaplet-stripe";
-  version = "0.3.0";
-  sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
-  buildDepends = [
-    configurator heist lensFamilyCore mtl snap stripe text textFormat
-    transformers xmlhtml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/LukeHoersten/snaplet-stripe";
-    description = "Stripe snaplet for the Snap Framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix
deleted file mode 100644
index d24b27f781e..00000000000
--- a/pkgs/development/libraries/haskell/snowball/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, QuickCheck, quickcheckInstances, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "snowball";
-  version = "1.0.0.1";
-  sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
-  buildDepends = [ text textIcu ];
-  testDepends = [
-    HUnit QuickCheck quickcheckInstances testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh text
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://hub.darcs.net/dag/snowball";
-    description = "Bindings to the Snowball library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix
deleted file mode 100644
index d66266f0886..00000000000
--- a/pkgs/development/libraries/haskell/socket-activation/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, network, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "socket-activation";
-  version = "0.1.0.1";
-  sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma";
-  buildDepends = [ network transformers ];
-  meta = {
-    homepage = "https://github.com/sakana/haskell-socket-activation";
-    description = "systemd socket activation library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
deleted file mode 100644
index 57827d495f3..00000000000
--- a/pkgs/development/libraries/haskell/socket-io/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, engineIo, mtl, stm, text, transformers
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "socket-io";
-  version = "1.2.0";
-  sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl";
-  buildDepends = [
-    aeson attoparsec engineIo mtl stm text transformers
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/engine.io";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
deleted file mode 100644
index 6a67dfddcc0..00000000000
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, network }:
-
-cabal.mkDerivation (self: {
-  pname = "socks";
-  version = "0.5.4";
-  sha256 = "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9";
-  buildDepends = [ cereal network ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-socks";
-    description = "Socks proxy (version 5) implementation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix
deleted file mode 100644
index 0dbd0647a86..00000000000
--- a/pkgs/development/libraries/haskell/sodium/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "sodium";
-  version = "0.11.0.2";
-  sha256 = "0m3ig6nqkw0m6xh6ijgr2w06i4ydyfwx7rsbkrrxflichadm9r2g";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Sodium Reactive Programming (FRP) System";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix
deleted file mode 100644
index cb74bb098f8..00000000000
--- a/pkgs/development/libraries/haskell/sourcemap/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, text, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sourcemap";
-  version = "0.1.3.0";
-  sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
-  buildDepends = [
-    aeson attoparsec text unorderedContainers utf8String
-  ];
-  meta = {
-    description = "Implementation of source maps as proposed by Google and Mozilla";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix
deleted file mode 100644
index 28389a860c8..00000000000
--- a/pkgs/development/libraries/haskell/sparse/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, deepseq, doctest, filepath, hlint
-, hybridVectors, lens, linear, mtl, primitive, QuickCheck
-, semigroups, simpleReflect, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh, transformers, vector
-, vectorAlgorithms
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sparse";
-  version = "0.9.1";
-  sha256 = "1pa1h21ca710fdjz60b79jg0v2lr0l11avpiynp9n1cw5bz137fk";
-  buildDepends = [
-    contravariant deepseq hybridVectors lens primitive transformers
-    vector vectorAlgorithms
-  ];
-  testDepends = [
-    deepseq doctest filepath hlint hybridVectors lens linear mtl
-    QuickCheck semigroups simpleReflect testFramework
-    testFrameworkQuickcheck2 testFrameworkTh transformers vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/sparse";
-    description = "A playground of sparse linear algebra primitives using Morton ordering";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix
deleted file mode 100644
index 010f51a5251..00000000000
--- a/pkgs/development/libraries/haskell/spawn/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "spawn";
-  version = "0.3";
-  sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
-  meta = {
-    description = "Tiny library for concurrent computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/speculation/default.nix b/pkgs/development/libraries/haskell/speculation/default.nix
deleted file mode 100644
index 2386d0ad54f..00000000000
--- a/pkgs/development/libraries/haskell/speculation/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "speculation";
-  version = "1.5.0.1";
-  sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/speculation";
-    description = "A framework for safe, programmable, speculative parallelism";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix
deleted file mode 100644
index b30ce21e342..00000000000
--- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "split";
-  version = "0.1.4.3";
-  sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
-  meta = {
-    homepage = "http://code.haskell.org/~byorgey/code/split";
-    description = "Combinator library for splitting lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix
deleted file mode 100644
index 91a6b4cada3..00000000000
--- a/pkgs/development/libraries/haskell/split/0.2.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "split";
-  version = "0.2.2";
-  sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
-  testDepends = [ QuickCheck ];
-  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
-  meta = {
-    description = "Combinator library for splitting lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/spoon/default.nix b/pkgs/development/libraries/haskell/spoon/default.nix
deleted file mode 100644
index 436291cf8dc..00000000000
--- a/pkgs/development/libraries/haskell/spoon/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "spoon";
-  version = "0.3.1";
-  sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Catch errors thrown from pure computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
deleted file mode 100644
index 94d8d4409c9..00000000000
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
-, directSqlite, HUnit, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sqlite-simple";
-  version = "0.4.8.0";
-  sha256 = "098d1s80wlvsp307422f79bm3a9knvgw5ni6jap62fl4rpa7fsmz";
-  buildDepends = [
-    attoparsec blazeBuilder blazeTextual directSqlite text time
-    transformers
-  ];
-  testDepends = [ base16Bytestring directSqlite HUnit text time ];
-  meta = {
-    homepage = "http://github.com/nurpax/sqlite-simple";
-    description = "Mid-Level SQLite client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
deleted file mode 100644
index 8d30afc77ad..00000000000
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "srcloc";
-  version = "0.4.1";
-  sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz";
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "Data types for managing source code locations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/state-plus/default.nix b/pkgs/development/libraries/haskell/state-plus/default.nix
deleted file mode 100644
index d35da29273e..00000000000
--- a/pkgs/development/libraries/haskell/state-plus/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, checkers, mtl, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "state-plus";
-  version = "0.1.1";
-  sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
-  buildDepends = [ mtl ];
-  testDepends = [ checkers mtl QuickCheck ];
-  meta = {
-    description = "MonadPlus for StateT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
deleted file mode 100644
index b9651681351..00000000000
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stateref";
-  version = "0.3";
-  sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
-  buildDepends = [ mtl stm ];
-  meta = {
-    homepage = "http://code.haskell.org/~mokus/stateref/";
-    description = "Abstraction for things that work like IORef";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix
deleted file mode 100644
index dac89bd2ef9..00000000000
--- a/pkgs/development/libraries/haskell/statestack/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "statestack";
-  version = "0.2.0.3";
-  sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx";
-  buildDepends = [ mtl transformers ];
-  meta = {
-    description = "Simple State-like monad transformer with saveable and restorable state";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
deleted file mode 100644
index a24b9359aa4..00000000000
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions
-, monadPar, mwcRandom, primitive, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorAlgorithms, vectorBinaryInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "statistics";
-  version = "0.13.2.1";
-  sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva";
-  buildDepends = [
-    aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
-    vector vectorAlgorithms vectorBinaryInstances
-  ];
-  testDepends = [
-    binary erf HUnit ieee754 mathFunctions mwcRandom primitive
-    QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector vectorAlgorithms
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/statistics";
-    description = "A library of statistical types, data, and functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix
deleted file mode 100644
index 15454aa0c97..00000000000
--- a/pkgs/development/libraries/haskell/statvfs/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "statvfs";
-  version = "0.2";
-  sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
-  meta = {
-    description = "Get unix filesystem statistics with statfs, statvfs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
deleted file mode 100644
index d24b735ab76..00000000000
--- a/pkgs/development/libraries/haskell/stb-image/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bitmap }:
-
-cabal.mkDerivation (self: {
-  pname = "stb-image";
-  version = "0.2.1";
-  sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
-  buildDepends = [ bitmap ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
deleted file mode 100644
index 8455aca477b..00000000000
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-chans";
-  version = "3.0.0.2";
-  sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh";
-  buildDepends = [ stm ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Additional types of channels for STM";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
deleted file mode 100644
index c13aa992317..00000000000
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, cereal, cerealConduit, conduit, conduitExtra, HUnit
-, liftedAsync, liftedBase, monadControl, monadLoops, QuickCheck
-, resourcet, stm, stmChans, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stm-conduit";
-  version = "2.5.3";
-  sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw";
-  buildDepends = [
-    async cereal cerealConduit conduit conduitExtra liftedAsync
-    liftedBase monadControl monadLoops resourcet stm stmChans
-    transformers
-  ];
-  testDepends = [
-    conduit HUnit QuickCheck resourcet stm stmChans testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 transformers
-  ];
-  meta = {
-    homepage = "https://github.com/wowus/stm-conduit";
-    description = "Introduces conduits to channels, and promotes using conduits concurrently";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix
deleted file mode 100644
index d093c5e07db..00000000000
--- a/pkgs/development/libraries/haskell/stm-containers/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh
-, mtl, mtlPrelude, placeholders, primitive, QuickCheck
-, transformers, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stm-containers";
-  version = "0.2.7";
-  sha256 = "1qgmrxccnvids2xq2n28cllfqh88f0b2512hm5grrab7qb07phar";
-  buildDepends = [
-    basePrelude focus hashable listT lochTh placeholders primitive
-    transformers
-  ];
-  testDepends = [
-    basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude
-    placeholders primitive QuickCheck transformers unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/nikita-volkov/stm-containers";
-    description = "Containers for STM";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-delay/default.nix b/pkgs/development/libraries/haskell/stm-delay/default.nix
deleted file mode 100644
index ee2500db8d3..00000000000
--- a/pkgs/development/libraries/haskell/stm-delay/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-delay";
-  version = "0.1.1.1";
-  sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
-  buildDepends = [ stm ];
-  testDepends = [ stm ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-stm-delay";
-    description = "Updatable one-shot timer polled with STM";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm-stats/default.nix b/pkgs/development/libraries/haskell/stm-stats/default.nix
deleted file mode 100644
index 4f58e73248c..00000000000
--- a/pkgs/development/libraries/haskell/stm-stats/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, time }:
-
-cabal.mkDerivation (self: {
-  pname = "stm-stats";
-  version = "0.2.0.0";
-  sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
-  buildDepends = [ stm time ];
-  meta = {
-    description = "retry statistics for STM transactions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix
deleted file mode 100644
index f8cebde5d0b..00000000000
--- a/pkgs/development/libraries/haskell/stm/2.4.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.4.2";
-  sha256 = "1nsq92z7y0w227fyig0xz4365xp50hnzzkqr4s836q969kb3rvn8";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix
deleted file mode 100644
index f6c7a7e7ce0..00000000000
--- a/pkgs/development/libraries/haskell/stm/2.4.3.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.4.3";
-  sha256 = "0vzw4s06d5scfy4ircl81ym8ylkw9ckzsp8rq950dvipmaj1xhis";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix
deleted file mode 100644
index 59f5e647231..00000000000
--- a/pkgs/development/libraries/haskell/storable-complex/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-complex";
-  version = "0.2.1";
-  sha256 = "0dnxnsi7m5whwwki3fry6db6gyy5qzfz8jcj1fg3fhfyf4f9wpaz";
-  meta = {
-    description = "Storable instance for Complex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-endian/default.nix b/pkgs/development/libraries/haskell/storable-endian/default.nix
deleted file mode 100644
index 9fdbdb5a6b0..00000000000
--- a/pkgs/development/libraries/haskell/storable-endian/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, byteorder }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-endian";
-  version = "0.2.5";
-  sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
-  buildDepends = [ byteorder ];
-  meta = {
-    description = "Storable instances with endianness";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
deleted file mode 100644
index fc919b195e0..00000000000
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers, utilityHt }:
-
-cabal.mkDerivation (self: {
-  pname = "storable-record";
-  version = "0.0.3";
-  sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ transformers utilityHt ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://code.haskell.org/~thielema/storable-record/";
-    description = "Elegant definition of Storable instances for records";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
deleted file mode 100644
index c4d19f61188..00000000000
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
-, random, stm, text, transformers, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "streaming-commons";
-  version = "0.1.7.3";
-  sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb";
-  buildDepends = [
-    blazeBuilder network random stm text transformers zlib
-  ];
-  testDepends = [
-    async blazeBuilder deepseq hspec network QuickCheck text zlib
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/streaming-commons";
-    description = "Common lower-level functions needed by various streaming data libraries";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
deleted file mode 100644
index cd338472635..00000000000
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "streamproc";
-  version = "1.6.2";
-  sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
-  meta = {
-    homepage = "http://github.com/peti/streamproc";
-    description = "Stream Processer Arrow";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strict-concurrency/default.nix b/pkgs/development/libraries/haskell/strict-concurrency/default.nix
deleted file mode 100644
index edb0ba0fd47..00000000000
--- a/pkgs/development/libraries/haskell/strict-concurrency/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "strict-concurrency";
-  version = "0.2.4.1";
-  sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
-    description = "Strict concurrency abstractions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
deleted file mode 100644
index 6b4a157431e..00000000000
--- a/pkgs/development/libraries/haskell/strict/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "strict";
-  version = "0.3.2";
-  sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
-  meta = {
-    homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
-    description = "Strict data types and String IO";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
deleted file mode 100644
index 3f4e0edf140..00000000000
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "string-combinators";
-  version = "0.6.0.5";
-  sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
-  meta = {
-    homepage = "https://github.com/basvandijk/string-combinators";
-    description = "Polymorphic functions to build and combine stringlike values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix
deleted file mode 100644
index 9225bacbfe3..00000000000
--- a/pkgs/development/libraries/haskell/string-conversions/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "string-conversions";
-  version = "0.3.0.3";
-  sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p";
-  buildDepends = [ text utf8String ];
-  meta = {
-    description = "Simplifies dealing with different types for strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix
deleted file mode 100644
index ac0e12811e0..00000000000
--- a/pkgs/development/libraries/haskell/string-qq/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "string-qq";
-  version = "0.0.2";
-  sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
-  meta = {
-    description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix
deleted file mode 100644
index f7de2335ad2..00000000000
--- a/pkgs/development/libraries/haskell/stringable/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "stringable";
-  version = "0.1.3";
-  sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
-  buildDepends = [ systemFilepath text ];
-  meta = {
-    description = "A Stringable type class, in the spirit of Foldable and Traversable";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix
deleted file mode 100644
index 49a8ddd509a..00000000000
--- a/pkgs/development/libraries/haskell/stringbuilder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "stringbuilder";
-  version = "0.5.0";
-  sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
-  testDepends = [ hspec QuickCheck ];
-  meta = {
-    description = "A writer monad for multi-line string literals";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix
deleted file mode 100644
index 28a5660b1e7..00000000000
--- a/pkgs/development/libraries/haskell/stringprep/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, tasty, tastyQuickcheck, tastyTh, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stringprep";
-  version = "1.0.0";
-  sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
-  buildDepends = [ text textIcu ];
-  testDepends = [
-    QuickCheck tasty tastyQuickcheck tastyTh text textIcu
-  ];
-  meta = {
-    description = "Implements the \"StringPrep\" algorithm";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix
deleted file mode 100644
index 02ed1a698a6..00000000000
--- a/pkgs/development/libraries/haskell/stringsearch/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stringsearch";
-  version = "0.3.6.5";
-  sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq";
-  meta = {
-    homepage = "https://bitbucket.org/dafis/stringsearch";
-    description = "Fast searching, splitting and replacing of ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix
deleted file mode 100644
index 796bf372676..00000000000
--- a/pkgs/development/libraries/haskell/stripe/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, httpConduit, httpTypes, mtl, text, time
-, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stripe";
-  version = "0.8.1";
-  sha256 = "0vmgj9n7q8ik31z7zzfjfv1qj8f8vrqn9cvk8kjp3k4shj25p7sy";
-  buildDepends = [
-    aeson httpConduit httpTypes mtl text time unorderedContainers
-    utf8String
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/michaelschade/hs-stripe";
-    description = "A Haskell implementation of the Stripe API";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
deleted file mode 100644
index a5975aaddc6..00000000000
--- a/pkgs/development/libraries/haskell/strptime/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "strptime";
-  version = "1.0.10";
-  sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
-  buildDepends = [ text time ];
-  meta = {
-    description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
deleted file mode 100644
index d739d11c17a..00000000000
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl
-, strict, syb, testFramework, testFrameworkHunit, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "stylish-haskell";
-  version = "0.5.11.0";
-  sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson cmdargs filepath haskellSrcExts mtl strict syb yaml
-  ];
-  testDepends = [
-    aeson cmdargs filepath haskellSrcExts HUnit mtl syb testFramework
-    testFrameworkHunit yaml
-  ];
-  meta = {
-    homepage = "https://github.com/jaspervdj/stylish-haskell";
-    description = "Haskell code prettifier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
deleted file mode 100644
index d5e033f094d..00000000000
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "svgcairo";
-  version = "0.13.0.0";
-  sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0";
-  buildDepends = [ cairo glib mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc ];
-  pkgconfigDepends = [ librsvg ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the libsvg-cairo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix
deleted file mode 100644
index 1cc6747ed16..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.4.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.4.0";
-  sha256 = "1wxz8y2dcjl407l596qswcl9cakbb5cs4wzwlyy6qjz7lyd0h0gj";
-  testDepends = [ HUnit mtl ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.4.2.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix
deleted file mode 100644
index 6900c051c01..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.4.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.4.2";
-  sha256 = "1gvyw2gbccip24wpp9xi6qgwvg4m5cijhzz1v51wvyamqv4p2b8l";
-  testDepends = [ HUnit mtl ];
-  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
deleted file mode 100644
index c69b331941c..00000000000
--- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, sybWithClass, text }:
-
-cabal.mkDerivation (self: {
-  pname = "syb-with-class-instances-text";
-  version = "0.0.1";
-  sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e";
-  buildDepends = [ sybWithClass text ];
-  meta = {
-    description = "Scrap Your Boilerplate With Class Text instance";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
deleted file mode 100644
index a6e802ac5c2..00000000000
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb-with-class";
-  version = "0.6.1.5";
-  sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn";
-  meta = {
-    description = "Scrap Your Boilerplate With Class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
deleted file mode 100644
index 46a2979d775..00000000000
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "symbol";
-  version = "0.2.4";
-  sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
-  buildDepends = [ deepseq ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.drexel.edu/~mainland/";
-    description = "A 'Symbol' type for fast symbol comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix
deleted file mode 100644
index a2a33e89e15..00000000000
--- a/pkgs/development/libraries/haskell/syntactic/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged
-, tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "syntactic";
-  version = "2.0";
-  sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x";
-  buildDepends = [ constraints dataHash mtl safe tagged treeView ];
-  testDepends = [
-    QuickCheck tagged tasty tastyGolden tastyQuickcheck tastyTh
-    utf8String
-  ];
-  meta = {
-    homepage = "https://github.com/emilaxelsson/syntactic";
-    description = "Generic representation and manipulation of abstract syntax";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-argv0/default.nix b/pkgs/development/libraries/haskell/system-argv0/default.nix
deleted file mode 100644
index 6f0eb038b60..00000000000
--- a/pkgs/development/libraries/haskell/system-argv0/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, systemFilepath, text }:
-
-cabal.mkDerivation (self: {
-  pname = "system-argv0";
-  version = "0.1.1";
-  sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
-  buildDepends = [ systemFilepath text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-filesystem/";
-    description = "Get argv[0] as a FilePath";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
deleted file mode 100644
index cf3dcee3301..00000000000
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, systemFilepath, temporary, text, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "system-fileio";
-  version = "0.3.16";
-  sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k";
-  buildDepends = [ systemFilepath text time ];
-  testDepends = [
-    chell systemFilepath temporary text time transformers
-  ];
-  meta = {
-    homepage = "https://github.com/fpco/haskell-filesystem";
-    description = "Consistent filesystem interaction across GHC versions";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
deleted file mode 100644
index 8ec752d7a39..00000000000
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "system-filepath";
-  version = "0.4.13";
-  sha256 = "0g1lam859vs71vyc8qsg6aianw5s7w19rk02acf2gr8dg3ypznca";
-  buildDepends = [ deepseq text ];
-  testDepends = [ chell chellQuickcheck QuickCheck text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fpco/haskell-filesystem";
-    description = "High-level, byte-based file and directory path manipulations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
deleted file mode 100644
index 748a69a20a4..00000000000
--- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "system-posix-redirect";
-  version = "1.1.0.1";
-  sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
-  meta = {
-    description = "A toy module to temporarily redirect a program's stdout";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
deleted file mode 100644
index e9e01fb78fb..00000000000
--- a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "system-time-monotonic";
-  version = "0.2";
-  sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
-    description = "Simple library for using the system's monotonic clock";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix
deleted file mode 100644
index e8c6075ffd2..00000000000
--- a/pkgs/development/libraries/haskell/syz/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "syz";
-  version = "0.2.0.0";
-  sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
-    description = "Scrap Your Zippers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix
deleted file mode 100644
index b8159a777d4..00000000000
--- a/pkgs/development/libraries/haskell/tables/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, comonad, deepseq, doctest, filepath
-, hashable, lens, profunctors, safecopy, transformers
-, transformersCompat, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tables";
-  version = "0.4.1";
-  sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49";
-  buildDepends = [
-    binary cereal comonad deepseq hashable lens profunctors safecopy
-    transformers transformersCompat unorderedContainers
-  ];
-  testDepends = [
-    doctest filepath lens transformers unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/tables/";
-    description = "In-memory storage with multiple keys using lenses and traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
deleted file mode 100644
index 57f91bcd728..00000000000
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, csv, html, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tabular";
-  version = "0.2.2.5";
-  sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740";
-  buildDepends = [ csv html mtl ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://hub.darcs.net/kowey/tabular";
-    description = "Two-dimensional data tables with rendering functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagged-transformer/default.nix b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
deleted file mode 100644
index 34da51018e0..00000000000
--- a/pkgs/development/libraries/haskell/tagged-transformer/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, contravariant, distributive, exceptions, mtl
-, reflection, semigroupoids, tagged
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tagged-transformer";
-  version = "0.7.1";
-  sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j";
-  buildDepends = [
-    comonad contravariant distributive exceptions mtl reflection
-    semigroupoids tagged
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/tagged-transformer";
-    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
deleted file mode 100644
index 10585eb3412..00000000000
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "tagged";
-  version = "0.7.3";
-  sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b";
-  meta = {
-    homepage = "http://github.com/ekmett/tagged";
-    description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/taggy-lens/default.nix b/pkgs/development/libraries/haskell/taggy-lens/default.nix
deleted file mode 100644
index fe8344ba73d..00000000000
--- a/pkgs/development/libraries/haskell/taggy-lens/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, lens, taggy, text, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "taggy-lens";
-  version = "0.1.2";
-  sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib";
-  buildDepends = [ lens taggy text unorderedContainers ];
-  testDepends = [
-    doctest hspec lens taggy text unorderedContainers
-  ];
-  meta = {
-    homepage = "http://github.com/alpmestan/taggy-lens";
-    description = "Lenses for the taggy html/xml parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix
deleted file mode 100644
index d456afbd65f..00000000000
--- a/pkgs/development/libraries/haskell/taggy/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeHtml, blazeMarkup, hspec, hspecAttoparsec
-, text, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "taggy";
-  version = "0.1.3";
-  sha256 = "18azsibsfjz4zj69dk4a3jrdw6zvd8n1gsd1ynd2hy7i9z168iw8";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec blazeHtml blazeMarkup text unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec blazeHtml blazeMarkup hspec hspecAttoparsec text
-    unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/alpmestan/taggy";
-    description = "Efficient and simple HTML/XML parsing library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix
deleted file mode 100644
index dbd88393c34..00000000000
--- a/pkgs/development/libraries/haskell/tagshare/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tagshare";
-  version = "0.0";
-  sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "TagShare - explicit sharing with tags";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
deleted file mode 100644
index 40ddd46ba54..00000000000
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "tagsoup";
-  version = "0.13.3";
-  sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/tagsoup/";
-    description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
deleted file mode 100644
index 2e939317504..00000000000
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, conduitExtra, dataDefault, hspec, HUnit, QuickCheck, resourcet
-, text, transformers, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tagstream-conduit";
-  version = "0.5.5.3";
-  sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
-  buildDepends = [
-    attoparsec blazeBuilder caseInsensitive conduit conduitExtra
-    dataDefault resourcet text transformers xmlConduit
-  ];
-  testDepends = [ conduit hspec HUnit QuickCheck resourcet text ];
-  meta = {
-    homepage = "http://github.com/yihuang/tagstream-conduit";
-    description = "streamlined html tag parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
deleted file mode 100644
index be98c204156..00000000000
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, time }:
-
-cabal.mkDerivation (self: {
-  pname = "tar";
-  version = "0.4.0.1";
-  sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
-  buildDepends = [ filepath time ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
deleted file mode 100644
index 8f6b953e954..00000000000
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, genericDeriving, mtl, stm, tagged, tasty, transformers
-, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-ant-xml";
-  version = "1.0.1";
-  sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
-  buildDepends = [
-    genericDeriving mtl stm tagged tasty transformers xml
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/tasty-ant-xml";
-    description = "Render tasty output to XML for Jenkins";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
deleted file mode 100644
index 5f2efb3520f..00000000000
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, deepseq, filepath, mtl, optparseApplicative, tagged
-, tasty, tastyHunit, temporaryRc
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-golden";
-  version = "2.2.2.4";
-  sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c";
-  buildDepends = [
-    async deepseq filepath mtl optparseApplicative tagged tasty
-    temporaryRc
-  ];
-  testDepends = [ filepath tasty tastyHunit temporaryRc ];
-  meta = {
-    homepage = "https://github.com/feuerbach/tasty-golden";
-    description = "Golden tests support for tasty";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
deleted file mode 100644
index 459a0f1123a..00000000000
--- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, hspecCore, QuickCheck, random, tasty
-, tastyQuickcheck, tastySmallcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-hspec";
-  version = "1.1";
-  sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
-  buildDepends = [
-    hspec hspecCore QuickCheck random tasty tastyQuickcheck
-    tastySmallcheck
-  ];
-  meta = {
-    homepage = "http://github.com/mitchellwrosen/tasty-hspec";
-    description = "Hspec support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
deleted file mode 100644
index edbdf8b9cd6..00000000000
--- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-hunit";
-  version = "0.9.0.1";
-  sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb";
-  buildDepends = [ tasty ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "HUnit support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-program/default.nix b/pkgs/development/libraries/haskell/tasty-program/default.nix
deleted file mode 100644
index 60a88315f72..00000000000
--- a/pkgs/development/libraries/haskell/tasty-program/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-program";
-  version = "1.0.1";
-  sha256 = "04q2pp7hwqiiry17dd3ng0i6ikqzpg7hfgf0ckcg33xw450kpx9n";
-  buildDepends = [ filepath tasty ];
-  meta = {
-    homepage = "https://github.com/jstolarek/tasty-program";
-    description = "Use tasty framework to test whether a program executes correctly";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
deleted file mode 100644
index 36b22a30f53..00000000000
--- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, pcreLight, QuickCheck, tagged, tasty, tastyHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-quickcheck";
-  version = "0.8.3.2";
-  sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
-  buildDepends = [ QuickCheck tagged tasty ];
-  testDepends = [ pcreLight tasty tastyHunit ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "QuickCheck support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
deleted file mode 100644
index af251514b42..00000000000
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged
-, tasty, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-rerun";
-  version = "1.1.3";
-  sha256 = "1pgm3h7kyg7q8ydgqqj9sn65ckl6i7cz6a8g1cfighf4gy5y0cj3";
-  buildDepends = [
-    mtl optparseApplicative reducers split stm tagged tasty
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/ocharles/tasty-rerun";
-    description = "Run tests by filtering the test tree depending on the result of previous test runs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
deleted file mode 100644
index 9bdf0c52895..00000000000
--- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, smallcheck, tagged, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-smallcheck";
-  version = "0.8.0.1";
-  sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
-  buildDepends = [ async smallcheck tagged tasty ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "SmallCheck support for the Tasty test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix
deleted file mode 100644
index 98d62036e83..00000000000
--- a/pkgs/development/libraries/haskell/tasty-th/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, languageHaskellExtract, tasty }:
-
-cabal.mkDerivation (self: {
-  pname = "tasty-th";
-  version = "0.1.3";
-  sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
-  buildDepends = [ languageHaskellExtract tasty ];
-  meta = {
-    homepage = "http://github.com/bennofs/tasty-th";
-    description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
deleted file mode 100644
index e99c8672c86..00000000000
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative
-, regexTdfaRc, stm, tagged, time, unboundedDelays
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tasty";
-  version = "0.10.1";
-  sha256 = "1l8ah7018f3m8css56h59fcly1jhanm5wd0hbgm8mg6pn7rrjml5";
-  buildDepends = [
-    ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm
-    tagged time unboundedDelays
-  ];
-  meta = {
-    homepage = "http://documentup.com/feuerbach/tasty";
-    description = "Modern and extensible testing framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix
deleted file mode 100644
index 5f1ae4938d1..00000000000
--- a/pkgs/development/libraries/haskell/tcache-AWS/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aws, conduit, httpConduit, network, TCache, text }:
-
-cabal.mkDerivation (self: {
-  pname = "tcache-AWS";
-  version = "0.0.1";
-  sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv";
-  buildDepends = [ aws conduit httpConduit network TCache text ];
-  meta = {
-    description = "tcache using Amazon Web Services as default persistence mechanism";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix
deleted file mode 100644
index 3a7e3f05bdd..00000000000
--- a/pkgs/development/libraries/haskell/template-default/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault }:
-
-cabal.mkDerivation (self: {
-  pname = "template-default";
-  version = "0.1.1";
-  sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
-  buildDepends = [ dataDefault ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/haskell-pkg-janitors/template-default";
-    description = "declaring Default instances just got even easier";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix
deleted file mode 100644
index 4eceef5729d..00000000000
--- a/pkgs/development/libraries/haskell/template/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "template";
-  version = "0.2.0.10";
-  sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
-  buildDepends = [ mtl text ];
-  meta = {
-    description = "Simple string substitution";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/temporary-rc/default.nix b/pkgs/development/libraries/haskell/temporary-rc/default.nix
deleted file mode 100644
index 62931e168af..00000000000
--- a/pkgs/development/libraries/haskell/temporary-rc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "temporary-rc";
-  version = "1.2.0.3";
-  sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
-  buildDepends = [ exceptions filepath transformers ];
-  meta = {
-    homepage = "http://www.github.com/feuerbach/temporary";
-    description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
deleted file mode 100644
index 8a048744636..00000000000
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, exceptions, filepath, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "temporary";
-  version = "1.2.0.3";
-  sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
-  buildDepends = [ exceptions filepath transformers ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.github.com/batterseapower/temporary";
-    description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
deleted file mode 100644
index 89cf249ecd4..00000000000
--- a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, HUnit, stm, stmChans, testFramework
-, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "terminal-progress-bar";
-  version = "0.0.1.4";
-  sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
-  buildDepends = [ baseUnicodeSymbols stm stmChans ];
-  testDepends = [
-    baseUnicodeSymbols HUnit testFramework testFrameworkHunit
-  ];
-  meta = {
-    homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-    description = "A simple progress bar in the terminal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix
deleted file mode 100644
index d143a66713a..00000000000
--- a/pkgs/development/libraries/haskell/terminal-size/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "terminal-size";
-  version = "0.3.0";
-  sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
-  meta = {
-    description = "Get terminal window height and width";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
deleted file mode 100644
index 9bb59e14a1e..00000000000
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ncurses }:
-
-cabal.mkDerivation (self: {
-  pname = "terminfo";
-  version = "0.4.0.0";
-  sha256 = "10y8mhpazcpwwvg1avc0zxq534rwavg82q69l7wm5np24sb5lrv8";
-  extraLibraries = [ ncurses ];
-  meta = {
-    homepage = "https://github.com/judah/terminfo";
-    description = "Haskell bindings to the terminfo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
deleted file mode 100644
index 12919ec17b8..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, HUnit, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-hunit";
-  version = "0.3.0.1";
-  sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
-  buildDepends = [ extensibleExceptions HUnit testFramework ];
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "HUnit support for the test-framework package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
deleted file mode 100644
index a012d8a047e..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, QuickCheck, random, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-quickcheck2";
-  version = "0.3.0.3";
-  sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
-  buildDepends = [
-    extensibleExceptions QuickCheck random testFramework
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "QuickCheck2 support for the test-framework package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
deleted file mode 100644
index 5837ea46741..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, smallcheck, testFramework, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-smallcheck";
-  version = "0.2";
-  sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
-  buildDepends = [ smallcheck testFramework transformers ];
-  meta = {
-    homepage = "https://github.com/feuerbach/smallcheck";
-    description = "Support for SmallCheck tests in test-framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
deleted file mode 100644
index a7881a7ebfc..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs, haskellSrcExts, testFramework }:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-th-prime";
-  version = "0.0.7";
-  sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p";
-  buildDepends = [ cpphs haskellSrcExts testFramework ];
-  meta = {
-    description = "Template Haskell for test framework";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
deleted file mode 100644
index 21c719c538d..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, haskellSrcExts, languageHaskellExtract, regexPosix
-, testFramework
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-th";
-  version = "0.2.4";
-  sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b";
-  buildDepends = [
-    haskellSrcExts languageHaskellExtract regexPosix testFramework
-  ];
-  meta = {
-    homepage = "http://github.com/finnsson/test-generator";
-    description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
deleted file mode 100644
index b4ba1fd1009..00000000000
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix
-, time, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework";
-  version = "0.8.1.0";
-  sha256 = "1js7jbdw0xijpjlca3yh7mw427s3rjkymm1qi565r928pbsbdkhm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal ansiWlPprint hostname random regexPosix time xml
-  ];
-  meta = {
-    homepage = "https://batterseapower.github.io/test-framework/";
-    description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-simple/default.nix b/pkgs/development/libraries/haskell/test-simple/default.nix
deleted file mode 100644
index 181c92147e3..00000000000
--- a/pkgs/development/libraries/haskell/test-simple/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, executablePath, mtl, QuickCheck, statePlus }:
-
-cabal.mkDerivation (self: {
-  pname = "test-simple";
-  version = "0.1.7";
-  sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
-  buildDepends = [ mtl QuickCheck statePlus ];
-  testDepends = [ executablePath mtl QuickCheck ];
-  meta = {
-    description = "Simple Perl inspired testing";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix
deleted file mode 100644
index e45d49fb5a8..00000000000
--- a/pkgs/development/libraries/haskell/testing-feat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, tagshare }:
-
-cabal.mkDerivation (self: {
-  pname = "testing-feat";
-  version = "0.4.0.2";
-  sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
-  buildDepends = [ mtl QuickCheck tagshare ];
-  meta = {
-    description = "Functional Enumeration of Algebraic Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
deleted file mode 100644
index f8bff923c6d..00000000000
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, networkUri, pandocTypes, parsec, split, syb
-, temporary, text, utf8String, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "texmath";
-  version = "0.8.0.1";
-  sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl networkUri pandocTypes parsec syb xml ];
-  testDepends = [ filepath split temporary text utf8String xml ];
-  meta = {
-    homepage = "http://github.com/jgm/texmath";
-    description = "Conversion between formats used to represent mathematics";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-binary/default.nix b/pkgs/development/libraries/haskell/text-binary/default.nix
deleted file mode 100644
index 9e6205b7001..00000000000
--- a/pkgs/development/libraries/haskell/text-binary/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, text }:
-
-cabal.mkDerivation (self: {
-  pname = "text-binary";
-  version = "0.1.0";
-  sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
-  buildDepends = [ binary text ];
-  meta = {
-    homepage = "https://github.com/kawu/text-binary";
-    description = "Binary instances for text types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix
deleted file mode 100644
index c1bc8c8bc8e..00000000000
--- a/pkgs/development/libraries/haskell/text-format/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doubleConversion, text, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "text-format";
-  version = "0.3.1.1";
-  sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
-  buildDepends = [ doubleConversion text time transformers ];
-  meta = {
-    homepage = "https://github.com/bos/text-format";
-    description = "Text formatting";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
deleted file mode 100644
index 000b689b276..00000000000
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text-icu";
-  version = "0.7.0.0";
-  sha256 = "1fvq6qi9kvw722v2m9d40vwwa2irswfapqfjcrym9c2swdagxnry";
-  buildDepends = [ deepseq text ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
-  ];
-  extraLibraries = [ icu ];
-  meta = {
-    homepage = "https://github.com/bos/text-icu";
-    description = "Bindings to the ICU library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
deleted file mode 100644
index 2f34dbb0b46..00000000000
--- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hspec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "text-stream-decode";
-  version = "0.1.0.5";
-  sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
-  buildDepends = [ text ];
-  testDepends = [ deepseq hspec text ];
-  meta = {
-    homepage = "http://github.com/fpco/text-stream-decode";
-    description = "Streaming decoding functions for UTF encodings. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
deleted file mode 100644
index 05a0f899f93..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.2.3";
-  sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
deleted file mode 100644
index 3908a7a0cae..00000000000
--- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "1.1.1.3";
-  sha256 = "1yrzg449nbbzh2fb9mdmf2jjfhk2g87kr9m2ibssbsqx53p98z0c";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.2.0.3.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix
deleted file mode 100644
index d0d2112a5e2..00000000000
--- a/pkgs/development/libraries/haskell/text/1.2.0.3.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "1.2.0.3";
-  sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck quickcheckUnicode random testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix
deleted file mode 100644
index 4b123bc3164..00000000000
--- a/pkgs/development/libraries/haskell/tf-random/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, primitive, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "tf-random";
-  version = "0.5";
-  sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
-  buildDepends = [ primitive random time ];
-  meta = {
-    description = "High-quality splittable pseudorandom number generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
deleted file mode 100644
index 94919bba6e4..00000000000
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, mtl, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-desugar";
-  version = "1.4.2";
-  sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9";
-  buildDepends = [ mtl syb ];
-  testDepends = [ hspec HUnit mtl syb ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
-    description = "Functions to desugar Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-expand-syns/default.nix b/pkgs/development/libraries/haskell/th-expand-syns/default.nix
deleted file mode 100644
index 5cb842ab388..00000000000
--- a/pkgs/development/libraries/haskell/th-expand-syns/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-expand-syns";
-  version = "0.3.0.4";
-  sha256 = "05qgfam7zq02848icvddds67ch5d8py7r30izg4lp0df0kzn08yq";
-  buildDepends = [ syb ];
-  meta = {
-    description = "Expands type synonyms in Template Haskell ASTs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
deleted file mode 100644
index 285329912df..00000000000
--- a/pkgs/development/libraries/haskell/th-extras/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "th-extras";
-  version = "0.0.0.2";
-  sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
-  buildDepends = [ syb ];
-  meta = {
-    homepage = "https://github.com/mokus0/th-extras";
-    description = "A grab bag of functions for use with Template Haskell";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
deleted file mode 100644
index e81a8cf921e..00000000000
--- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, QuickCheck, text, thLift, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "th-lift-instances";
-  version = "0.1.4";
-  sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4";
-  buildDepends = [ text thLift vector ];
-  testDepends = [ doctest filepath QuickCheck text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/bennofs/th-lift-instances/";
-    description = "Lift instances for template-haskell for common data types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
deleted file mode 100644
index 28fdedbde75..00000000000
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "th-lift";
-  version = "0.7";
-  sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza";
-  meta = {
-    homepage = "http://github.com/mboes/th-lift";
-    description = "Derive Template Haskell's Lift class for datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
deleted file mode 100644
index 8f6da0bd038..00000000000
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, thLift, thReifyMany }:
-
-cabal.mkDerivation (self: {
-  pname = "th-orphans";
-  version = "0.8.2";
-  sha256 = "19d4ls2plxmn5n9c99503mvi99ffp6y6zxi564zf6cdfgw8v73fy";
-  buildDepends = [ thLift thReifyMany ];
-  jailbreak = true;
-  meta = {
-    description = "Orphan instances for TH datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/th-reify-many/default.nix b/pkgs/development/libraries/haskell/th-reify-many/default.nix
deleted file mode 100644
index 940f8c8c29d..00000000000
--- a/pkgs/development/libraries/haskell/th-reify-many/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, safe, thExpandSyns }:
-
-cabal.mkDerivation (self: {
-  pname = "th-reify-many";
-  version = "0.1.2";
-  sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9";
-  buildDepends = [ mtl safe thExpandSyns ];
-  meta = {
-    homepage = "http://github.com/mgsloan/th-reify-many";
-    description = "Recurseively reify template haskell datatype info";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix
deleted file mode 100644
index 7b989c7ad38..00000000000
--- a/pkgs/development/libraries/haskell/these/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, mtl, profunctors, semigroupoids, semigroups
-, transformers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "these";
-  version = "0.4.2";
-  sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
-  buildDepends = [
-    bifunctors mtl profunctors semigroupoids semigroups transformers
-    vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/isomorphism/these";
-    description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
deleted file mode 100644
index 8d10ea06ae5..00000000000
--- a/pkgs/development/libraries/haskell/thespian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "thespian";
-  version = "0.999";
-  sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://bitbucket.org/alinabi/thespian";
-    description = "Lightweight Erlang-style actors for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thread-local-storage/default.nix b/pkgs/development/libraries/haskell/thread-local-storage/default.nix
deleted file mode 100644
index 5405f903e1d..00000000000
--- a/pkgs/development/libraries/haskell/thread-local-storage/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, atomicPrimops }:
-
-cabal.mkDerivation (self: {
-  pname = "thread-local-storage";
-  version = "0.1.0.3";
-  sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
-  testDepends = [ atomicPrimops ];
-  doCheck = false;
-  meta = {
-    description = "Several options for thread-local-storage (TLS) in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
deleted file mode 100644
index 92942a55e16..00000000000
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "threadmanager";
-  version = "0.1.7";
-  sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
-  meta = {
-    description = "(deprecated in favor of 'threads') Simple thread management";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
deleted file mode 100644
index 96b6fbb172a..00000000000
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "threads";
-  version = "0.5.1.2";
-  sha256 = "1bq2aza6sam4zkgpgf8x4lhkk2na1i8annx9cwad3j68p5vdg929";
-  buildDepends = [ baseUnicodeSymbols stm ];
-  testDepends = [
-    baseUnicodeSymbols concurrentExtra HUnit stm testFramework
-    testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/basvandijk/threads";
-    description = "Fork threads and wait for their result";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
deleted file mode 100644
index 5586c28079b..00000000000
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsecEnumerator, dataDefault, deepseq
-, filepath, hashable, MonadCatchIOTransformers, networkUri, safe
-, snapCore, snapServer, stm, text, time, transformers
-, unorderedContainers, utf8String, vault, websockets
-, websocketsSnap
-}:
-
-cabal.mkDerivation (self: {
-  pname = "threepenny-gui";
-  version = "0.5.0.0";
-  sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsecEnumerator dataDefault deepseq filepath hashable
-    MonadCatchIOTransformers networkUri safe snapCore snapServer stm
-    text time transformers unorderedContainers utf8String vault
-    websockets websocketsSnap
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui";
-    description = "GUI framework that uses the web browser as a display";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
deleted file mode 100644
index 7c18f2c555b..00000000000
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, Cabal, cpphs, deepseq, filepath, mtl
-, profunctors, QuickCheck, random, systemPosixRedirect, text, time
-, vector, vectorSpace, vectorThUnbox
-}:
-
-cabal.mkDerivation (self: {
-  pname = "thyme";
-  version = "0.3.5.5";
-  sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
-  buildDepends = [
-    aeson attoparsec deepseq mtl profunctors QuickCheck random text
-    time vector vectorSpace vectorThUnbox
-  ];
-  testDepends = [
-    attoparsec Cabal filepath mtl profunctors QuickCheck random
-    systemPosixRedirect text time vectorSpace
-  ];
-  buildTools = [ cpphs ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/liyang/thyme";
-    description = "A faster time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix
deleted file mode 100644
index ed9da18c39a..00000000000
--- a/pkgs/development/libraries/haskell/time-compat/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "time-compat";
-  version = "0.1.0.3";
-  sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "http://hub.darcs.net/dag/time-compat";
-    description = "Compatibility with old-time for the time package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time-recurrence/default.nix b/pkgs/development/libraries/haskell/time-recurrence/default.nix
deleted file mode 100644
index 8f0aa711151..00000000000
--- a/pkgs/development/libraries/haskell/time-recurrence/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataOrdlist, HUnit, mtl, testFramework, testFrameworkHunit
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "time-recurrence";
-  version = "0.9.2";
-  sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
-  buildDepends = [ dataOrdlist mtl time ];
-  testDepends = [
-    dataOrdlist HUnit mtl testFramework testFrameworkHunit time
-  ];
-  meta = {
-    homepage = "http://github.com/hellertime/time-recurrence";
-    description = "Generate recurring dates";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
deleted file mode 100644
index 97bdaa852b5..00000000000
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.1.2.4";
-  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time/1.5.nix b/pkgs/development/libraries/haskell/time/1.5.nix
deleted file mode 100644
index ba77c73874d..00000000000
--- a/pkgs/development/libraries/haskell/time/1.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.5";
-  sha256 = "0vj82msx650z473inhr8yav7k38zj7096wam477y77wardx57pdc";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/time";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix
deleted file mode 100644
index 3259d706a68..00000000000
--- a/pkgs/development/libraries/haskell/timeparsers/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, convertible, mtl, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timeparsers";
-  version = "0.3.2";
-  sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
-  buildDepends = [ attoparsec convertible mtl time ];
-  jailbreak = true;
-  meta = {
-    description = "Attoparsec parsers for various Date/Time formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix
deleted file mode 100644
index aea0fe91208..00000000000
--- a/pkgs/development/libraries/haskell/timerep/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timerep";
-  version = "1.0.3";
-  sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p";
-  buildDepends = [ time ];
-  meta = {
-    description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
deleted file mode 100644
index 8b8704c0de7..00000000000
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, extensibleExceptions, time, timezoneSeries }:
-
-cabal.mkDerivation (self: {
-  pname = "timezone-olson";
-  version = "0.1.6";
-  sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z";
-  buildDepends = [ binary extensibleExceptions time timezoneSeries ];
-  meta = {
-    homepage = "http://projects.haskell.org/time-ng/";
-    description = "A pure Haskell parser and renderer for binary Olson timezone files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix
deleted file mode 100644
index d46f2d81254..00000000000
--- a/pkgs/development/libraries/haskell/timezone-series/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, time }:
-
-cabal.mkDerivation (self: {
-  pname = "timezone-series";
-  version = "0.1.4";
-  sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40";
-  buildDepends = [ time ];
-  meta = {
-    homepage = "http://projects.haskell.org/time-ng/";
-    description = "Enhanced timezone handling for Data.Time";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
deleted file mode 100644
index d9b82d13769..00000000000
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, async, byteable, cereal
-, cipherAes, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes
-, cryptohash, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes
-, cryptoRandom, dataDefaultClass, hourglass, mtl, network
-, QuickCheck, tasty, tastyQuickcheck, transformers, x509, x509Store
-, x509Validation
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.2.13";
-  sha256 = "1djjscmyn3wcnlzz1r0clz2nxa2y23rlyjk30xjsdp0m1sq0vdc3";
-  buildDepends = [
-    asn1Encoding asn1Types async byteable cereal cipherAes cipherDes
-    cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
-    cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network
-    transformers x509 x509Store x509Validation
-  ];
-  testDepends = [
-    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass
-    hourglass mtl QuickCheck tasty tastyQuickcheck x509 x509Validation
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/torrent/default.nix b/pkgs/development/libraries/haskell/torrent/default.nix
deleted file mode 100644
index 0133de6c221..00000000000
--- a/pkgs/development/libraries/haskell/torrent/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bencode, binary, filepath, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "torrent";
-  version = "10000.0.0";
-  sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
-  buildDepends = [ bencode binary filepath syb ];
-  meta = {
-    description = "BitTorrent file parser and generater";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix
deleted file mode 100644
index 8b6623d4639..00000000000
--- a/pkgs/development/libraries/haskell/tostring/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "tostring";
-  version = "0.2.1";
-  sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw";
-  buildDepends = [ caseInsensitive text utf8String ];
-  meta = {
-    description = "The ToString class";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
deleted file mode 100644
index d7b9f53951c..00000000000
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-base";
-  version = "0.4.3";
-  sha256 = "0bklr7piiipnh99jnqx262pdyb9hzk852d6hzk5sqppvz5ndcf4y";
-  buildDepends = [ stm transformers ];
-  meta = {
-    homepage = "https://github.com/mvv/transformers-base";
-    description = "Lift computations from the bottom of a transformer stack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
deleted file mode 100644
index d0dc4ae024d..00000000000
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-compat";
-  version = "0.3.3.4";
-  sha256 = "1hab41ggyaxr4xn2szv8y9fg9np8zi8ifhimr33fspid1jz14xr5";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix
deleted file mode 100644
index c989d620f40..00000000000
--- a/pkgs/development/libraries/haskell/transformers-free/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-free";
-  version = "1.0.1";
-  sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Free monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
deleted file mode 100644
index fe2b0f91ef9..00000000000
--- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers";
-  version = "0.3.0.0";
-  sha256 = "14cmfdi4cmirbrc3x2h6ly08j0mb4p59mxbqkqw8rnbsr4g0rap5";
-  meta = {
-    description = "Concrete functor and monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
deleted file mode 100644
index 3557941a9a8..00000000000
--- a/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers";
-  version = "0.4.2.0";
-  sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr";
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    description = "Concrete functor and monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix
deleted file mode 100644
index 2ec410dc0a4..00000000000
--- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "traverse-with-class";
-  version = "0.2.0.3";
-  sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Generic applicative traversals";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tree-view/default.nix b/pkgs/development/libraries/haskell/tree-view/default.nix
deleted file mode 100644
index 6c3adfdb9f4..00000000000
--- a/pkgs/development/libraries/haskell/tree-view/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "tree-view";
-  version = "0.4";
-  sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
-  buildDepends = [ mtl ];
-  meta = {
-    description = "Render trees as foldable HTML and Unicode art";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
deleted file mode 100644
index a73f47afb1c..00000000000
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
-, blazeMarkup, charset, comonad, deepseq, doctest, filepath
-, fingertree, hashable, lens, mtl, parsers, QuickCheck, reducers
-, semigroups, transformers, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "trifecta";
-  version = "1.5.1";
-  sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n";
-  buildDepends = [
-    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
-    charset comonad deepseq fingertree hashable lens mtl parsers
-    reducers semigroups transformers unorderedContainers utf8String
-  ];
-  testDepends = [ doctest filepath parsers QuickCheck ];
-  meta = {
-    homepage = "http://github.com/ekmett/trifecta/";
-    description = "A modern parser combinator library with convenient diagnostics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix
deleted file mode 100644
index b32653032b5..00000000000
--- a/pkgs/development/libraries/haskell/trivia/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, distributive }:
-
-cabal.mkDerivation (self: {
-  pname = "trivia";
-  version = "0.0";
-  sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
-  buildDepends = [ comonad distributive ];
-  meta = {
-    homepage = "https://github.com/fumieval/trivia";
-    description = "The trivial monad and comonad";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
deleted file mode 100644
index 6997d2229ce..00000000000
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, OneTuple }:
-
-cabal.mkDerivation (self: {
-  pname = "tuple";
-  version = "0.3.0.2";
-  sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
-  buildDepends = [ OneTuple ];
-  meta = {
-    description = "Various functions on tuples";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
deleted file mode 100644
index 31542d43ebc..00000000000
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, authenticateOauth, caseInsensitive
-, conduit, conduitExtra, dataDefault, doctest, filepath, hlint
-, hspec, httpClient, httpConduit, httpTypes, lens, lensAeson
-, monadControl, networkUri, resourcet, text, time, transformers
-, transformersBase, twitterTypes, twitterTypesLens, fetchurl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-conduit";
-  version = "0.1.0";
-  sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
-  editedCabalFile = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec authenticateOauth conduit conduitExtra dataDefault
-    httpClient httpConduit httpTypes lens lensAeson networkUri
-    resourcet text time transformers twitterTypes twitterTypesLens
-  ];
-  testDepends = [
-    aeson attoparsec authenticateOauth caseInsensitive conduit
-    conduitExtra dataDefault doctest filepath hlint hspec httpClient
-    httpConduit httpTypes lens lensAeson monadControl networkUri
-    resourcet text time transformers transformersBase twitterTypes
-    twitterTypesLens
-  ];
-  meta = {
-    homepage = "https://github.com/himura/twitter-conduit";
-    description = "Twitter API package with conduit interface and Streaming API support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
deleted file mode 100644
index 85407fc00b2..00000000000
--- a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, text, twitterTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-types-lens";
-  version = "0.6.0";
-  sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3";
-  buildDepends = [ lens text twitterTypes ];
-  meta = {
-    homepage = "https://github.com/himura/twitter-types-lens";
-    description = "Twitter JSON types (lens powered)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
deleted file mode 100644
index 9ed6a77ac2d..00000000000
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, filepath, HUnit, testFramework
-, testFrameworkHunit, testFrameworkThPrime, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "twitter-types";
-  version = "0.6.0";
-  sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn";
-  buildDepends = [ aeson text unorderedContainers ];
-  testDepends = [
-    aeson attoparsec filepath HUnit testFramework testFrameworkHunit
-    testFrameworkThPrime text unorderedContainers
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/himura/twitter-types";
-    description = "Twitter JSON parser and types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix
deleted file mode 100644
index a1e547ca0e2..00000000000
--- a/pkgs/development/libraries/haskell/type-aligned/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-aligned";
-  version = "0.9.3";
-  sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0";
-  meta = {
-    homepage = "https://github.com/atzeus/type-aligned";
-    description = "Various type-aligned sequence data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix
deleted file mode 100644
index 89b6398c5e0..00000000000
--- a/pkgs/development/libraries/haskell/type-eq/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cpphs }:
-
-cabal.mkDerivation (self: {
-  pname = "type-eq";
-  version = "0.4.2";
-  sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar";
-  buildTools = [ cpphs ];
-  meta = {
-    homepage = "http://github.com/glaebhoerl/type-eq";
-    description = "Type equality evidence you can carry around";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
deleted file mode 100644
index de5bc73873f..00000000000
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-equality";
-  version = "0.1.2";
-  sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
-  meta = {
-    homepage = "http://github.com/hesselink/type-equality/";
-    description = "Type equality, coercion/cast and other operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
deleted file mode 100644
index 7bc0c31b86d..00000000000
--- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "type-level-natural-number";
-  version = "2.0";
-  sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
-  meta = {
-    description = "Simple type level natural numbers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/type-natural/default.nix b/pkgs/development/libraries/haskell/type-natural/default.nix
deleted file mode 100644
index 2e56f8c396b..00000000000
--- a/pkgs/development/libraries/haskell/type-natural/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, constraints, equationalReasoning, monomorphic, singletons
-}:
-
-cabal.mkDerivation (self: {
-  pname = "type-natural";
-  version = "0.2.3.1";
-  sha256 = "0qi5b3d0vkm1b2kda3ifw6g7djx91wj7q36la02yadlvmb4jcp1g";
-  buildDepends = [
-    constraints equationalReasoning monomorphic singletons
-  ];
-  meta = {
-    homepage = "https://github.com/konn/type-natural";
-    description = "Type-level natural and proofs of their properties";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/typography-geometry/default.nix b/pkgs/development/libraries/haskell/typography-geometry/default.nix
deleted file mode 100644
index c0b5b5fb1ab..00000000000
--- a/pkgs/development/libraries/haskell/typography-geometry/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parallel, polynomialsBernstein, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "typography-geometry";
-  version = "1.0.0";
-  sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
-  buildDepends = [ parallel polynomialsBernstein vector ];
-  meta = {
-    description = "Drawings for printed text documents";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix
deleted file mode 100644
index 3f964f2ce3d..00000000000
--- a/pkgs/development/libraries/haskell/tz/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tz";
-  version = "0.0.0.8";
-  sha256 = "0rabdqwdj8hx17817zsfsih01agx7n3kja8s0axmm0drq22vlflv";
-  buildDepends = [ binary deepseq time tzdata vector ];
-  testDepends = [
-    bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh time tzdata vector
-  ];
-  preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo";
-  meta = {
-    homepage = "https://github.com/nilcons/haskell-tz";
-    description = "Efficient time zone handling";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix
deleted file mode 100644
index ceae4679247..00000000000
--- a/pkgs/development/libraries/haskell/tzdata/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filemanip, filepath, HUnit, MissingH, testFramework
-, testFrameworkHunit, testFrameworkTh, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tzdata";
-  version = "0.1.20140612.0";
-  sha256 = "03fd3jiw89c8zf2jdz0qps8sb8ipgmjqbbaq4y2aqczv36ha74gh";
-  buildDepends = [ vector ];
-  testDepends = [
-    filemanip filepath HUnit MissingH testFramework testFrameworkHunit
-    testFrameworkTh
-  ];
-  meta = {
-    homepage = "https://github.com/nilcons/haskell-tzdata";
-    description = "Time zone database (as files and as a module)";
-    license = self.stdenv.lib.licenses.asl20;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix
deleted file mode 100644
index 351df38fc0d..00000000000
--- a/pkgs/development/libraries/haskell/unbound-generics/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit
-, tastyQuickcheck, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unbound-generics";
-  version = "0.0.2";
-  sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai";
-  buildDepends = [ contravariant mtl transformers ];
-  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
-  meta = {
-    homepage = "http://github.com/lambdageek/unbound-generics";
-    description = "Reimplementation of Unbound using GHC Generics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
deleted file mode 100644
index 41accd18586..00000000000
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, mtl, RepLib, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "unbound";
-  version = "0.4.3.1";
-  sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
-  buildDepends = [ binary mtl RepLib transformers ];
-  meta = {
-    homepage = "http://code.google.com/p/replib/";
-    description = "Generic support for programming with names and binders";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
deleted file mode 100644
index f03aedad4fd..00000000000
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unbounded-delays";
-  version = "0.1.0.8";
-  sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40";
-  meta = {
-    homepage = "https://github.com/basvandijk/unbounded-delays";
-    description = "Unbounded thread delays and timeouts";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unification-fd/default.nix b/pkgs/development/libraries/haskell/unification-fd/default.nix
deleted file mode 100644
index 5489310e332..00000000000
--- a/pkgs/development/libraries/haskell/unification-fd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, logict, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "unification-fd";
-  version = "0.9.0";
-  sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki";
-  buildDepends = [ logict mtl ];
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Simple generic unification algorithms";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix
deleted file mode 100644
index f17b08b3ab6..00000000000
--- a/pkgs/development/libraries/haskell/union-find/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "union-find";
-  version = "0.2";
-  sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/nominolo/union-find";
-    description = "Efficient union and equivalence testing of sets";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
deleted file mode 100644
index db85f4be78e..00000000000
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, syb, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "uniplate";
-  version = "1.6.12";
-  sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
-  buildDepends = [ hashable syb unorderedContainers ];
-  meta = {
-    homepage = "http://community.haskell.org/~ndm/uniplate/";
-    description = "Help writing simple, concise and fast generic operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unique/default.nix b/pkgs/development/libraries/haskell/unique/default.nix
deleted file mode 100644
index 0325a0da75d..00000000000
--- a/pkgs/development/libraries/haskell/unique/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Unique";
-  version = "0.2";
-  sha256 = "0qylqb71gkvfwnnz4ij22x79y583y409fszqnyqd6dc90gycfm98";
-  meta = {
-    description = "It provides the functionality like unix \"uniq\" utility";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
deleted file mode 100644
index c5834e3f87d..00000000000
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uniqueid";
-  version = "0.1.1";
-  sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268";
-  meta = {
-    homepage = "http://github.com/sebfisch/uniqueid/wikis";
-    description = "Splittable Unique Identifier Supply";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix
deleted file mode 100644
index 2024aacf7ff..00000000000
--- a/pkgs/development/libraries/haskell/units/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnitApprox, mtl, multimap, parsec, singletons, syb, tasty
-, tastyHunit, thDesugar, vectorSpace
-}:
-
-cabal.mkDerivation (self: {
-  pname = "units";
-  version = "2.2";
-  sha256 = "1hd7klv0h2rsq971rbghvgy2921bf0zxikdsl26qw08yb0zirvza";
-  buildDepends = [
-    mtl multimap parsec singletons syb thDesugar vectorSpace
-  ];
-  testDepends = [
-    HUnitApprox mtl multimap parsec singletons syb tasty tastyHunit
-    thDesugar vectorSpace
-  ];
-  meta = {
-    homepage = "https://github.com/goldfirere/units";
-    description = "A domain-specific type system for dimensional analysis";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
deleted file mode 100644
index 4219611f910..00000000000
--- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-bytestring";
-  version = "0.3.7.2";
-  sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s";
-  meta = {
-    homepage = "http://code.haskell.org/~wren/";
-    description = "Unix/Posix-specific functions for ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
deleted file mode 100644
index 7ac3605e6fc..00000000000
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-compat";
-  version = "0.4.1.3";
-  sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb";
-  meta = {
-    homepage = "http://github.com/jystic/unix-compat";
-    description = "Portable POSIX-compatibility layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix
deleted file mode 100644
index c8fa0d244fb..00000000000
--- a/pkgs/development/libraries/haskell/unix-memory/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, tasty, tastyHunit, tastyQuickcheck }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-memory";
-  version = "0.1.2";
-  sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
-  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-unix-memory";
-    description = "Unix memory syscalls";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
deleted file mode 100644
index dc71c43df87..00000000000
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, filepath, hspec, stm, time, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-process-conduit";
-  version = "0.2.2.3";
-  sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
-  buildDepends = [ conduit filepath stm time transformers ];
-  testDepends = [ conduit hspec transformers ];
-  meta = {
-    homepage = "https://github.com/snoyberg/conduit";
-    description = "Run processes on Unix systems, with a conduit interface (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
deleted file mode 100644
index 74bfb292775..00000000000
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, doctest, hspec, QuickCheck, time }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-time";
-  version = "0.3.4";
-  sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5";
-  buildDepends = [ binary ];
-  testDepends = [ doctest hspec QuickCheck time ];
-  meta = {
-    description = "Unix time parser/formatter and utilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
deleted file mode 100644
index 65419a22bb0..00000000000
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "unlambda";
-  version = "0.1.3";
-  sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  hyperlinkSource = false;
-  meta = {
-    description = "Unlambda interpreter";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
deleted file mode 100644
index 07f1b8beb97..00000000000
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unordered-containers";
-  version = "0.2.5.1";
-  sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    ChasingBottoms hashable HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tibbe/unordered-containers";
-    description = "Efficient hashing-based container types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
deleted file mode 100644
index d6e445ebd4e..00000000000
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, networkUri, text, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "uri-encode";
-  version = "1.5.0.3";
-  sha256 = "115wnc7x7gx57qza5az4c1wy0n2f40634529jk0vpxw6bb9b1mzn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ networkUri text utf8String ];
-  jailbreak = true;
-  meta = {
-    description = "Unicode aware uri-encoding";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix
deleted file mode 100644
index 633818d9518..00000000000
--- a/pkgs/development/libraries/haskell/uri/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec, safe, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "uri";
-  version = "0.1.6.3";
-  sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
-  buildDepends = [ parsec safe utf8String ];
-  meta = {
-    homepage = "http://gitorious.org/uri";
-    description = "Library for working with URIs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
deleted file mode 100644
index bfa7f807c53..00000000000
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "url";
-  version = "2.1.3";
-  sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
-  buildDepends = [ utf8String ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Url";
-    description = "A library for working with URLs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
deleted file mode 100644
index e60af0e3152..00000000000
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, split }:
-
-cabal.mkDerivation (self: {
-  pname = "urlencoded";
-  version = "0.4.0";
-  sha256 = "0idh70apfxx8bkbsxda4xhb0b5xf4x237dwi4v55ildrhxx4b68k";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl network split ];
-  meta = {
-    homepage = "https://github.com/pheaver/urlencoded";
-    description = "Generate or process x-www-urlencoded data";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix
deleted file mode 100644
index 5f57d42a2b6..00000000000
--- a/pkgs/development/libraries/haskell/usb/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bindingsLibusb, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "usb";
-  version = "1.2.0.1";
-  sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk";
-  buildDepends = [ bindingsLibusb text vector ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://basvandijk.github.com/usb";
-    description = "Communicate with USB devices";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
deleted file mode 100644
index 056fe5b372c..00000000000
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "utf8-light";
-  version = "0.4.2";
-  sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
-  meta = {
-    description = "Unicode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
deleted file mode 100644
index 405dbecb6ba..00000000000
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "utf8-string";
-  version = "0.3.8";
-  sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  patchPhase = ''
-    sed -ir -e 's|Extensions: | Extensions: UndecidableInstances, |' utf8-string.cabal
-  '';
-  meta = {
-    homepage = "http://github.com/glguy/utf8-string/";
-    description = "Support for reading and writing UTF8 Strings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
deleted file mode 100644
index 438b9c810d8..00000000000
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "utility-ht";
-  version = "0.0.10";
-  sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
-  testDepends = [ QuickCheck ];
-  meta = {
-    description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-interleaved/default.nix b/pkgs/development/libraries/haskell/uu-interleaved/default.nix
deleted file mode 100644
index 63873ab18c5..00000000000
--- a/pkgs/development/libraries/haskell/uu-interleaved/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-interleaved";
-  version = "0.1.0.0";
-  sha256 = "00zq89fjz3r5pj6qbci017cm9y2rsvl265y9d95q0rv6ljhsayzs";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix
deleted file mode 100644
index e20058de46d..00000000000
--- a/pkgs/development/libraries/haskell/uu-options/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-options";
-  version = "0.1.0.1";
-  sha256 = "0dygg4w3rlnf1pnmwq7i6vzz0v90b4g18ipfc5whn1ss1bixwxk4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    lenses mtl transformers uuInterleaved uuParsinglib
-  ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Parse command line options using uu-interleave and uu-parsinglib";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
deleted file mode 100644
index 40533014209..00000000000
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ListLike, time, uuInterleaved }:
-
-cabal.mkDerivation (self: {
-  pname = "uu-parsinglib";
-  version = "2.8.1.1";
-  sha256 = "1mz8sni7mj85b0ih0y1ld7lcj74iq5z2xi1lbwwndpqra9ahc5s6";
-  buildDepends = [ ListLike time uuInterleaved ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-    description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
deleted file mode 100644
index 0c65e8dc1df..00000000000
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cryptohash, deepseq, hashable, HUnit, networkInfo
-, QuickCheck, random, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "uuid";
-  version = "1.3.7";
-  sha256 = "01idfi9vdmcz8fkgnfa0bpz6khx4x2r0rzynzha42irl7881da21";
-  buildDepends = [
-    binary cryptohash deepseq hashable networkInfo random time
-  ];
-  testDepends = [
-    HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/aslatter/uuid";
-    description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
deleted file mode 100644
index 9cfcac5f904..00000000000
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "uulib";
-  version = "0.9.16";
-  sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
-    description = "Haskell Utrecht Tools Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
deleted file mode 100644
index 343f73238ca..00000000000
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum-cairo";
-  version = "0.5";
-  sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc";
-  buildDepends = [
-    cairo deepseq gtk strictConcurrency svgcairo vacuum
-  ];
-  meta = {
-    homepage = "http://code.haskell.org/~dons/code/vacuum-cairo";
-    description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
deleted file mode 100644
index 9c719605537..00000000000
--- a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, graphviz, vacuum }:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum-graphviz";
-  version = "2.1.0.1";
-  sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
-  buildDepends = [ filepath graphviz vacuum ];
-  jailbreak = true;
-  meta = {
-    description = "A library for transforming vacuum graphs into GraphViz output";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
deleted file mode 100644
index 31e265e92ee..00000000000
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ghcPaths }:
-
-cabal.mkDerivation (self: {
-  pname = "vacuum";
-  version = "2.2.0.0";
-  sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
-  extraLibraries = [ ghcPaths ];
-  meta = {
-    homepage = "http://thoughtpolice.github.com/vacuum";
-    description = "Graph representation of the GHC heap";
-    license = self.stdenv.lib.licenses.gpl3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
deleted file mode 100644
index 87f0ed126fa..00000000000
--- a/pkgs/development/libraries/haskell/vado/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, filepath, QuickCheck, text }:
-
-cabal.mkDerivation (self: {
-  pname = "vado";
-  version = "0.0.3";
-  sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ attoparsec filepath text ];
-  testDepends = [ attoparsec filepath QuickCheck text ];
-  meta = {
-    homepage = "https://github.com/hamishmack/vado";
-    description = "Runs commands on remote machines using ssh";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix
deleted file mode 100644
index 903165b2f5f..00000000000
--- a/pkgs/development/libraries/haskell/validation/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, bifunctors, doctest, filepath, lens, QuickCheck
-, semigroupoids, semigroups, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "validation";
-  version = "0.4.2";
-  sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm";
-  buildDepends = [
-    bifunctors lens semigroupoids semigroups transformers
-  ];
-  testDepends = [ doctest filepath QuickCheck ];
-  meta = {
-    homepage = "https://github.com/tonymorris/validation";
-    description = "A data-type like Either but with an accumulating Applicative";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
deleted file mode 100644
index 9eca4f672cb..00000000000
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, unorderedContainers }:
-
-cabal.mkDerivation (self: {
-  pname = "vault";
-  version = "0.3.0.3";
-  sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5";
-  buildDepends = [ hashable unorderedContainers ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/HeinrichApfelmus/vault";
-    description = "a persistent store for values of arbitrary types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
deleted file mode 100644
index 804ee0191f3..00000000000
--- a/pkgs/development/libraries/haskell/vcs-revision/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "vcs-revision";
-  version = "0.0.2";
-  sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
-  meta = {
-    description = "Facilities for accessing the version control revision of the current directory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
deleted file mode 100644
index 5e1d6ebf5b8..00000000000
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, gtk3, mtl, text, vcswrapper }:
-
-cabal.mkDerivation (self: {
-  pname = "vcsgui";
-  version = "0.1.1.0";
-  sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath gtk3 mtl text vcswrapper ];
-  meta = {
-    homepage = "https://github.com/forste/haskellVCSGUI";
-    description = "GUI library for source code management systems";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
deleted file mode 100644
index 335c5b319bc..00000000000
--- a/pkgs/development/libraries/haskell/vcswrapper/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, hxt, mtl, parsec, split, text }:
-
-cabal.mkDerivation (self: {
-  pname = "vcswrapper";
-  version = "0.1.1";
-  sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath hxt mtl parsec split text ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/forste/haskellVCSWrapper";
-    description = "Wrapper for source code management systems";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix
deleted file mode 100644
index 00ee6dacb9e..00000000000
--- a/pkgs/development/libraries/haskell/vect/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "vect";
-  version = "0.4.7";
-  sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A low-dimensional linear algebra library, tailored to computer graphics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
deleted file mode 100644
index b13f6c09c80..00000000000
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-algorithms";
-  version = "0.6.0.3";
-  sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl mwcRandom primitive vector ];
-  testDepends = [ QuickCheck vector ];
-  meta = {
-    homepage = "http://code.haskell.org/~dolio/";
-    description = "Efficient algorithms for vector arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix
deleted file mode 100644
index 1ef75f14a77..00000000000
--- a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, cereal, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-binary-instances";
-  version = "0.2.1.0";
-  sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
-  buildDepends = [ binary cereal vector ];
-  meta = {
-    homepage = "https://github.com/bos/vector-binary-instances";
-    description = "Instances of Data.Binary and Data.Serialize for vector";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-fftw/default.nix b/pkgs/development/libraries/haskell/vector-fftw/default.nix
deleted file mode 100644
index f1bdbfb3d1e..00000000000
--- a/pkgs/development/libraries/haskell/vector-fftw/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fftw, primitive, storableComplex, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-fftw";
-  version = "0.1.3.2";
-  sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
-  buildDepends = [ primitive storableComplex vector ];
-  extraLibraries = [ fftw ];
-  meta = {
-    homepage = "http://hackage.haskell.org/package/vector-fftw";
-    description = "A binding to the fftw library for one-dimensional vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-instances/default.nix b/pkgs/development/libraries/haskell/vector-instances/default.nix
deleted file mode 100644
index c39dc6c371b..00000000000
--- a/pkgs/development/libraries/haskell/vector-instances/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, comonad, keys, pointed, semigroupoids, semigroups, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vector-instances";
-  version = "3.3";
-  sha256 = "0iiw9p2ivcdfsh81vdy4yn6hbigdwclrkssd68hdsg9n6q3fmq5y";
-  buildDepends = [
-    comonad keys pointed semigroupoids semigroups vector
-  ];
-  meta = {
-    homepage = "http://github.com/ekmett/vector-instances";
-    description = "Orphan Instances for 'Data.Vector'";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
deleted file mode 100644
index e7eb15d6556..00000000000
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, vectorSpace }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-space-points";
-  version = "0.2";
-  sha256 = "05wczgvcqwqhcr4v0md4x5vybq6ns8rk6459yqyrc96kaig0sf2i";
-  buildDepends = [ vectorSpace ];
-  meta = {
-    description = "A type for points, as distinct from vectors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
deleted file mode 100644
index 2eb7ca48316..00000000000
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Boolean, MemoTrie, NumInstances }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-space";
-  version = "0.8.7";
-  sha256 = "1i3c34b3ngksmw4blhldap8fiw1jddm2h1qyr92csn3cllj6j1vm";
-  buildDepends = [ Boolean MemoTrie NumInstances ];
-  meta = {
-    description = "Vector & affine spaces, linear maps, and derivatives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
deleted file mode 100644
index 8fdb0f1b254..00000000000
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "vector-th-unbox";
-  version = "0.2.1.0";
-  sha256 = "0r8yxj63hvkm923y8mk1b5kv1b15lqadxhlncc02glvmy8zf1prh";
-  buildDepends = [ vector ];
-  testDepends = [ dataDefault vector ];
-  meta = {
-    description = "Deriver for Data.Vector.Unboxed using Template Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.2.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
deleted file mode 100644
index 011c9b367fa..00000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.12.2";
-  sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25";
-  buildDepends = [ deepseq primitive ];
-  testDepends = [
-    QuickCheck random testFramework testFrameworkQuickcheck2
-    transformers
-  ];
-  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
-  meta = {
-    homepage = "https://github.com/haskell/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
deleted file mode 100644
index 42796bea548..00000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.9.3";
-  sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
-  buildDepends = [ deepseq primitive ];
-  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
-  meta = {
-    homepage = "https://github.com/haskell/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
deleted file mode 100644
index 6ba3c4a86ce..00000000000
--- a/pkgs/development/libraries/haskell/vinyl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, lens, singletons }:
-
-cabal.mkDerivation (self: {
-  pname = "vinyl";
-  version = "0.5";
-  sha256 = "0jm31cynhl8ggmi6ndj7lhfm85cqml67svxm4v3kc8mnw5gj3c59";
-  testDepends = [ doctest lens singletons ];
-  meta = {
-    description = "Extensible Records";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
deleted file mode 100644
index 4d8188792ac..00000000000
--- a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aws, httpConduit, httpTypes, resourcet, text, time
-, xmlConduit, xmlHamlet
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vk-aws-route53";
-  version = "0.1.2";
-  sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
-  buildDepends = [
-    aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet
-  ];
-  meta = {
-    description = "Amazon Route53 DNS service plugin for the aws package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
deleted file mode 100644
index 52a57bd0cae..00000000000
--- a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "vk-posix-pty";
-  version = "0.2.1";
-  sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "https://github.com/proger/posix-pty/tree/fork";
-    description = "Pseudo terminal interaction with subprocesses";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
deleted file mode 100644
index 16f4bfeb8ef..00000000000
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hashable, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "void";
-  version = "0.7";
-  sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
-  buildDepends = [ hashable semigroups ];
-  meta = {
-    homepage = "http://github.com/ekmett/void";
-    description = "A Haskell 98 logically uninhabited data type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
deleted file mode 100644
index 33f0b906973..00000000000
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dataDefault, filepath, mtl, QuickCheck, random, regexBase
-, stm, text, time, vector, vty
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vty-ui";
-  version = "1.8";
-  sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault filepath mtl QuickCheck random regexBase stm text time
-    vector vty
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jtdaugherty.github.com/vty-ui/";
-    description = "An interactive terminal user interface library for Vty";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
deleted file mode 100644
index d91f04f6f26..00000000000
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath
-, hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck
-, quickcheckAssertions, random, smallcheck, stringQq, terminfo
-, testFramework, testFrameworkHunit, testFrameworkSmallcheck, text
-, transformers, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "5.2.6";
-  sha256 = "05d5vczifyzg36w1d4wwa9h27fpwgxaxws5ilmg47gq4zr1a6yxi";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder dataDefault deepseq filepath hashable lens mtl
-    parallel parsec terminfo text transformers utf8String vector
-  ];
-  testDepends = [
-    blazeBuilder Cabal dataDefault deepseq HUnit lens mtl QuickCheck
-    quickcheckAssertions random smallcheck stringQq terminfo
-    testFramework testFrameworkHunit testFrameworkSmallcheck text
-    utf8String vector
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/coreyoconnor/vty";
-    description = "A simple terminal UI library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
deleted file mode 100644
index ce99df0390e..00000000000
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath
-, hspec, httpDate, httpTypes, mimeTypes, network
-, optparseApplicative, systemFileio, systemFilepath, text, time
-, transformers, unixCompat, unorderedContainers, wai, waiExtra
-, warp, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-app-static";
-  version = "3.0.0.3";
-  sha256 = "0krvjnysmfaqds715mp6lhh5am327swi2vja5insmn08da87zhnb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable
-    cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes
-    mimeTypes optparseApplicative systemFileio systemFilepath text time
-    transformers unixCompat unorderedContainers wai waiExtra warp zlib
-  ];
-  testDepends = [
-    hspec httpDate httpTypes mimeTypes network text time transformers
-    unixCompat wai waiExtra zlib
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "WAI application for static serving";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix
deleted file mode 100644
index 5c5c1134396..00000000000
--- a/pkgs/development/libraries/haskell/wai-conduit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, httpTypes, transformers, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-conduit";
-  version = "3.0.0.1";
-  sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym";
-  buildDepends = [ blazeBuilder conduit httpTypes transformers wai ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "conduit wrappers for WAI";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
deleted file mode 100644
index 480a6101487..00000000000
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, base64Bytestring, blazeBuilder
-, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec
-, httpTypes, HUnit, liftedBase, network, resourcet
-, streamingCommons, stringsearch, text, time, transformers, void
-, wai, waiLogger, word8, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-extra";
-  version = "3.0.2.2";
-  sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9";
-  buildDepends = [
-    ansiTerminal base64Bytestring blazeBuilder caseInsensitive
-    dataDefaultClass deepseq fastLogger httpTypes liftedBase network
-    resourcet streamingCommons stringsearch text time transformers void
-    wai waiLogger word8
-  ];
-  testDepends = [
-    fastLogger hspec httpTypes HUnit resourcet text transformers wai
-    zlib
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "Provides some basic WAI handlers and middleware";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
deleted file mode 100644
index 7e457ac3014..00000000000
--- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, fcgi, wai, waiExtra }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-handler-fastcgi";
-  version = "3.0.0";
-  sha256 = "1cvy95qmbrhc1yjcral7f8y2929xp623abc9xasz7j28m4wwmynh";
-  buildDepends = [ wai waiExtra ];
-  extraLibraries = [ fcgi ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "Wai handler to fastcgi";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
deleted file mode 100644
index e37df498ac8..00000000000
--- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, httpTypes, streamingCommons, transformers
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-handler-launch";
-  version = "3.0.0";
-  sha256 = "1dv7w151szjkg9968v870abz11a440pdzy50zwm0xl6blk392nmk";
-  buildDepends = [
-    blazeBuilder httpTypes streamingCommons transformers wai warp
-  ];
-  meta = {
-    description = "Launch a web app in the default browser";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
deleted file mode 100644
index 7acf82bd2fc..00000000000
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive
-, doctest, easyFile, fastLogger, httpTypes, network, unixTime, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-logger";
-  version = "2.2.3";
-  sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w";
-  buildDepends = [
-    autoUpdate blazeBuilder byteorder caseInsensitive easyFile
-    fastLogger httpTypes network unixTime wai
-  ];
-  testDepends = [ doctest ];
-  doCheck = false;
-  meta = {
-    description = "A logging system for WAI";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
deleted file mode 100644
index e9db0b365be..00000000000
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, httpTypes, mtl, text, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-middleware-static";
-  version = "0.6.0.1";
-  sha256 = "1ylf2nm535d3dw0ksa9dfz1b4b78mqzkdrpdfd5pxswcqbgs266d";
-  buildDepends = [ filepath httpTypes mtl text wai ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/scotty-web/wai-middleware-static";
-    description = "WAI middleware that serves requests to static files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
deleted file mode 100644
index 8e08180b9e1..00000000000
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, wai }:
-
-cabal.mkDerivation (self: {
-  pname = "wai-test";
-  version = "3.0.0";
-  sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
-  buildDepends = [ wai ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/book/web-application-interface";
-    description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-util/default.nix b/pkgs/development/libraries/haskell/wai-util/default.nix
deleted file mode 100644
index fc9b964b26d..00000000000
--- a/pkgs/development/libraries/haskell/wai-util/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, httpAccept
-, httpTypes, mimeMail, network, resourcet, text, transformers, wai
-, waiExtra
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-util";
-  version = "0.7";
-  sha256 = "1lmx4f7174hzy4a60r2hq9vm9xhbg8vnb9cyi77zyb5p59s53p73";
-  buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit httpAccept httpTypes
-    mimeMail network resourcet text transformers wai waiExtra
-  ];
-  meta = {
-    homepage = "https://github.com/singpolyma/wai-util";
-    description = "Collection of utility functions for use with WAI";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
deleted file mode 100644
index d225b70f0e7..00000000000
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes
-, network, text, transformers, wai, waiAppStatic, warp, websockets
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wai-websockets";
-  version = "3.0.0.2";
-  sha256 = "1p0ylwc19g63z4qijnis1x5wys5h2avim6s2fn7m2ihrlc3pkhsb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    blazeBuilder caseInsensitive fileEmbed httpTypes network text
-    transformers wai waiAppStatic warp websockets
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "Provide a bridge betweeen WAI and the websockets package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
deleted file mode 100644
index 2effc4fc83b..00000000000
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, hspec, httpTypes, network, text, vault }:
-
-cabal.mkDerivation (self: {
-  pname = "wai";
-  version = "3.0.2";
-  sha256 = "0k67yzr05d6vjwqamnzzggk1mlj9wabqrm26dqbrrc40jj3kddgw";
-  buildDepends = [ blazeBuilder httpTypes network text vault ];
-  testDepends = [ blazeBuilder hspec ];
-  meta = {
-    homepage = "https://github.com/yesodweb/wai";
-    description = "Web Application Interface";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
deleted file mode 100644
index 8b4668dcf5a..00000000000
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls
-, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "warp-tls";
-  version = "3.0.1";
-  sha256 = "0s87ricslidyg6m17q5mllpl47v0d8mvvd6psq4izz5l27dg2xpy";
-  buildDepends = [
-    cprngAes dataDefaultClass network streamingCommons tls wai warp
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "HTTP over SSL/TLS support for Warp via the TLS package";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
deleted file mode 100644
index ae363291803..00000000000
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, autoUpdate, blazeBuilder, caseInsensitive, doctest
-, hashable, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase
-, network, QuickCheck, simpleSendfile, streamingCommons, text, time
-, transformers, unixCompat, void, wai
-}:
-
-cabal.mkDerivation (self: {
-  pname = "warp";
-  version = "3.0.4";
-  sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr";
-  buildDepends = [
-    autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
-    network simpleSendfile streamingCommons text unixCompat void wai
-  ];
-  testDepends = [
-    async autoUpdate blazeBuilder caseInsensitive doctest hashable
-    hspec HTTP httpDate httpTypes HUnit liftedBase network QuickCheck
-    simpleSendfile streamingCommons text time transformers unixCompat
-    void wai
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/yesodweb/wai";
-    description = "A fast, light-weight web server for WAI applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix
deleted file mode 100644
index 7c5c703533a..00000000000
--- a/pkgs/development/libraries/haskell/wcwidth/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, setlocale, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "wcwidth";
-  version = "0.0.2";
-  sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ attoparsec setlocale utf8String ];
-  meta = {
-    homepage = "http://github.com/solidsnack/wcwidth/";
-    description = "Native wcwidth";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
deleted file mode 100644
index 88f26878280..00000000000
--- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, boomerang, mtl, parsec, text, webRoutes }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-boomerang";
-  version = "0.28.3";
-  sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn";
-  buildDepends = [ boomerang mtl parsec text webRoutes ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
deleted file mode 100644
index 299357e2073..00000000000
--- a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happstackServer, text, webRoutes }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-happstack";
-  version = "0.23.9";
-  sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
-  buildDepends = [ happstackServer text webRoutes ];
-  meta = {
-    description = "Adds support for using web-routes with Happstack";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
deleted file mode 100644
index b29d42dc961..00000000000
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck
-, split, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes";
-  version = "0.27.7";
-  sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb";
-  buildDepends = [
-    blazeBuilder httpTypes mtl parsec split text utf8String
-  ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
deleted file mode 100644
index 7433f165e4d..00000000000
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault
-, directoryTree, exceptions, filepath, httpClient, httpTypes
-, liftedBase, monadControl, mtl, network, networkUri, parallel
-, scientific, temporary, text, time, transformers, transformersBase
-, unorderedContainers, vector, zipArchive
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webdriver";
-  version = "0.6.0.4";
-  sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
-  buildDepends = [
-    aeson attoparsec base64Bytestring cond dataDefault directoryTree
-    exceptions filepath httpClient httpTypes liftedBase monadControl
-    mtl network networkUri scientific temporary text time transformers
-    transformersBase unorderedContainers vector zipArchive
-  ];
-  testDepends = [ parallel text ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/kallisti-dev/hs-webdriver";
-    description = "a Haskell client for the Selenium WebDriver protocol";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix
deleted file mode 100644
index 63b8566b924..00000000000
--- a/pkgs/development/libraries/haskell/webkit/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango, text
-, webkit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webkit";
-  version = "0.13.1.1";
-  sha256 = "0652as9wq0ajaqmcx14y2svishccgrywyagrbzga7m06r3h94dz5";
-  buildDepends = [ cairo glib gtk mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ webkit ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Webkit library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/webkitgtk3/default.nix b/pkgs/development/libraries/haskell/webkitgtk3/default.nix
deleted file mode 100644
index 4f1d8a15cf7..00000000000
--- a/pkgs/development/libraries/haskell/webkitgtk3/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
-, webkitgtk
-}:
-
-cabal.mkDerivation (self: {
-  pname = "webkitgtk3";
-  version = "0.13.1.1";
-  sha256 = "0lm52xsgf3sayj5d32fyf9fy89zinn7c4z6rq4qw2bsnsdw8hcyb";
-  buildDepends = [ cairo glib gtk3 mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ webkitgtk ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Webkit library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.stdenv.lib.platforms.linux;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix
deleted file mode 100644
index 72bd7feb781..00000000000
--- a/pkgs/development/libraries/haskell/websockets-snap/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, mtl, snapCore, snapServer, websockets }:
-
-cabal.mkDerivation (self: {
-  pname = "websockets-snap";
-  version = "0.9.0.0";
-  sha256 = "051y62xga7drrfllv10giyr49z1z9ql8681dgwynmdad5x6asf85";
-  buildDepends = [ enumerator mtl snapCore snapServer websockets ];
-  jailbreak = true;
-  meta = {
-    description = "Snap integration for the websockets library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
deleted file mode 100644
index 79e03b748e6..00000000000
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, binary, blazeBuilder
-, caseInsensitive, entropy, HUnit, mtl, network, QuickCheck, random
-, SHA, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "websockets";
-  version = "0.9.2.1";
-  sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s";
-  buildDepends = [
-    attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy mtl network random SHA text
-  ];
-  testDepends = [
-    attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy HUnit mtl network QuickCheck random SHA testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://jaspervdj.be/websockets";
-    description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix
deleted file mode 100644
index ce1dd579697..00000000000
--- a/pkgs/development/libraries/haskell/wizards/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, controlMonadFree, haskeline, mtl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "wizards";
-  version = "1.0.1";
-  sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca";
-  buildDepends = [ controlMonadFree haskeline mtl transformers ];
-  meta = {
-    description = "High level, generic library for interrogative user interfaces";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
deleted file mode 100644
index 0507b1ea1a6..00000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework
-, testFrameworkHunit, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-extras";
-  version = "3.5.0.3";
-  sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp";
-  buildDepends = [ nats semigroupoids semigroups text utf8String ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "http://github.com/ekmett/wl-pprint-extras/";
-    description = "A free monad based on the Wadler/Leijen pretty printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
deleted file mode 100644
index 6f2e62008f5..00000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, nats, semigroups, terminfo, text, transformers
-, wlPprintExtras
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-terminfo";
-  version = "3.7.1.3";
-  sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
-  buildDepends = [
-    nats semigroups terminfo text transformers wlPprintExtras
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/ekmett/wl-pprint-terminfo/";
-    description = "A color pretty printer with terminfo support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
deleted file mode 100644
index 9ec7c2e1743..00000000000
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint-text";
-  version = "1.1.0.3";
-  sha256 = "1ghrkqdfsdkn71mpipbxiaar2gd8mdyd3dxbsz68awwnlpapy4f3";
-  buildDepends = [ text ];
-  jailbreak = true;
-  meta = {
-    description = "A Wadler/Leijen Pretty Printer for Text values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix
deleted file mode 100644
index a0ee669395d..00000000000
--- a/pkgs/development/libraries/haskell/wl-pprint/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "wl-pprint";
-  version = "1.1";
-  sha256 = "16kp3fkh0x9kgzk6fdqrm8m0v7b5cgbv0m3x63ybbp5vxbhand06";
-  meta = {
-    description = "The Wadler/Leijen Pretty Printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/word-trie/default.nix b/pkgs/development/libraries/haskell/word-trie/default.nix
deleted file mode 100644
index f817254aa62..00000000000
--- a/pkgs/development/libraries/haskell/word-trie/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, derive, hspec, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "word-trie";
-  version = "0.2.0.4";
-  sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f";
-  buildDepends = [ binary derive ];
-  testDepends = [ binary derive hspec QuickCheck ];
-  meta = {
-    homepage = "https://github.com/yi-editor/word-trie";
-    description = "Implementation of a finite trie over words";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
deleted file mode 100644
index ad6b5915383..00000000000
--- a/pkgs/development/libraries/haskell/word8/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec }:
-
-cabal.mkDerivation (self: {
-  pname = "word8";
-  version = "0.1.1";
-  sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r";
-  testDepends = [ hspec ];
-  meta = {
-    description = "Word8 library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wordexp/default.nix b/pkgs/development/libraries/haskell/wordexp/default.nix
deleted file mode 100644
index 7d03b1adea5..00000000000
--- a/pkgs/development/libraries/haskell/wordexp/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, c2hs, semigroups }:
-
-cabal.mkDerivation (self: {
-  pname = "wordexp";
-  version = "0.2.0.0";
-  sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
-  buildDepends = [ semigroups ];
-  buildTools = [ c2hs ];
-  meta = {
-    description = "wordexp(3) wrappers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
deleted file mode 100644
index 8b6e7151273..00000000000
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonPretty, aesonQq, attoparsec, base16Bytestring
-, base64Bytestring, byteable, caseInsensitive, cryptohash, doctest
-, exceptions, filepath, hashable, httpClient, httpClientTls
-, httpTypes, HUnit, lens, lensAeson, mimeTypes, networkInfo
-, PSQueue, QuickCheck, snapCore, snapServer, temporary
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time, transformers, unixCompat, unorderedContainers, uuid
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wreq";
-  version = "0.3.0.1";
-  sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec base16Bytestring byteable caseInsensitive
-    cryptohash exceptions hashable httpClient httpClientTls httpTypes
-    lens lensAeson mimeTypes PSQueue text time unorderedContainers
-  ];
-  testDepends = [
-    aeson aesonPretty aesonQq base64Bytestring caseInsensitive doctest
-    filepath hashable httpClient httpTypes HUnit lens lensAeson
-    networkInfo QuickCheck snapCore snapServer temporary testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text transformers
-    unixCompat uuid
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.serpentine.com/wreq";
-    description = "An easy-to-use HTTP client library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
deleted file mode 100644
index 72a8648cab6..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Only in wxc-0.91.0.0: dist
-diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
---- wxc-0.91.0.0-orig/Setup.hs	2014-10-31 13:30:15.514809137 +0100
-+++ wxc-0.91.0.0/Setup.hs	2014-10-31 13:33:53.606372005 +0100
-@@ -507,5 +507,3 @@
-         inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest

- 

-     installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)

--    ldconfig inst_lib_dir

--

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
deleted file mode 100644
index 4e824124050..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, stm, wxcore }:
-
-cabal.mkDerivation (self: {
-  pname = "wx";
-  version = "0.91.0.0";
-  sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
-  buildDepends = [ stm wxcore ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
deleted file mode 100644
index 2a184043251..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa, wxdirect, wxGTK }:
-
-cabal.mkDerivation (self: {
-  pname = "wxc";
-  version = "0.91.0.0";
-  sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
-  buildDepends = [ wxdirect ];
-  extraLibraries = [ libX11 mesa wxGTK ];
-  noHaddock = true;
-  patches = [ ./no-ldconfig.patch ];
-  postInstall = ''
-    cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
-  '';
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell C++ wrapper";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
deleted file mode 100644
index 7d1bebe1d88..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect
-, wxGTK
-}:
-
-cabal.mkDerivation (self: {
-  pname = "wxcore";
-  version = "0.91.0.0";
-  sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
-  buildDepends = [ filepath parsec stm time wxc wxdirect ];
-  extraLibraries = [ libX11 mesa wxGTK ];
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "wxHaskell core";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
deleted file mode 100644
index c178207e699..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, parsec, strict, time }:
-
-cabal.mkDerivation (self: {
-  pname = "wxdirect";
-  version = "0.91.0.0";
-  sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath parsec strict time ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/WxHaskell";
-    description = "helper tool for building wxHaskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
deleted file mode 100644
index 36486dbf40e..00000000000
--- a/pkgs/development/libraries/haskell/x509-store/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
-, pem, x509
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509-store";
-  version = "1.5.0";
-  sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5";
-  buildDepends = [
-    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem x509
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X.509 collection accessing and storing methods";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
deleted file mode 100644
index 87bb4ed1fec..00000000000
--- a/pkgs/development/libraries/haskell/x509-system/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, pem, x509, x509Store }:
-
-cabal.mkDerivation (self: {
-  pname = "x509-system";
-  version = "1.5.0";
-  sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3";
-  buildDepends = [ filepath mtl pem x509 x509Store ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "Handle per-operating-system X.509 accessors and storage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix
deleted file mode 100644
index 1caec0606bc..00000000000
--- a/pkgs/development/libraries/haskell/x509-validation/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, byteable, cryptohash
-, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath
-, hourglass, mtl, network, pem, x509, x509Store
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509-validation";
-  version = "1.5.1";
-  sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x";
-  buildDepends = [
-    asn1Encoding asn1Types byteable cryptohash cryptoPubkey
-    cryptoPubkeyTypes dataDefaultClass filepath hourglass mtl network
-    pem x509 x509Store
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X.509 Certificate and CRL validation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
deleted file mode 100644
index 201b727e2fc..00000000000
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
-, cryptoPubkeyTypes, filepath, hourglass, mtl, pem, tasty
-, tastyQuickcheck
-}:
-
-cabal.mkDerivation (self: {
-  pname = "x509";
-  version = "1.5.0.1";
-  sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba";
-  buildDepends = [
-    asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
-    filepath hourglass mtl pem
-  ];
-  testDepends = [
-    asn1Types cryptoPubkeyTypes hourglass mtl tasty tastyQuickcheck
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-certificate";
-    description = "X509 reader and writer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
deleted file mode 100644
index bc92d97b1ca..00000000000
--- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "xdg-basedir";
-  version = "0.2.2";
-  sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
-  buildDepends = [ filepath ];
-  meta = {
-    homepage = "http://github.com/willdonnelly/xdg-basedir";
-    description = "A basic implementation of the XDG Base Directory specification";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
deleted file mode 100644
index 1ced4424f53..00000000000
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xdot";
-  version = "0.2.4.6";
-  sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ cairo graphviz gtk mtl polyparse text ];
-  jailbreak = true;
-  meta = {
-    description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
deleted file mode 100644
index be1e32afbe3..00000000000
--- a/pkgs/development/libraries/haskell/xhtml/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "xhtml";
-  version = "3000.2.1";
-  sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
-  meta = {
-    homepage = "https://github.com/haskell/xhtml";
-    description = "An XHTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix
deleted file mode 100644
index e2fdfa0d1a7..00000000000
--- a/pkgs/development/libraries/haskell/xlsx/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit, dataDefault, digest, HUnit, lens, smallcheck
-, tasty, tastyHunit, tastySmallcheck, text, time, transformers
-, utf8String, xmlConduit, xmlTypes, zipArchive, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xlsx";
-  version = "0.1.0.3";
-  sha256 = "1i1dfb6gv4h3nc9ja7yxjzb8g207vzp58dnk4rgfcfglyvadn8kp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    conduit dataDefault digest lens text time transformers utf8String
-    xmlConduit xmlTypes zipArchive zlib
-  ];
-  testDepends = [
-    HUnit smallcheck tasty tastyHunit tastySmallcheck time
-  ];
-  meta = {
-    homepage = "https://github.com/qrilka/xlsx";
-    description = "Simple and incomplete Excel file parser/writer";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix b/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix
deleted file mode 100644
index fc0efcff226..00000000000
--- a/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, dlist, mtl, text, xmlConduit, xmlTypes }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-conduit-writer";
-  version = "0.1.1.1";
-  sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b";
-  buildDepends = [ dlist mtl text xmlConduit xmlTypes ];
-  testDepends = [ text ];
-  meta = {
-    homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer";
-    description = "Warm and fuzzy creation of XML documents";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
deleted file mode 100644
index 8a352a27ba3..00000000000
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, conduit
-, conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl
-, resourcet, systemFilepath, text, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-conduit";
-  version = "1.2.3.1";
-  sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8";
-  buildDepends = [
-    attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra
-    dataDefault deepseq monadControl resourcet systemFilepath text
-    transformers xmlTypes
-  ];
-  testDepends = [
-    blazeMarkup conduit hspec HUnit resourcet text transformers
-    xmlTypes
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/xml";
-    description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
deleted file mode 100644
index e1c0c862078..00000000000
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-hamlet";
-  version = "0.4.0.9";
-  sha256 = "0vm4jhvjf53a33sisnhghg0m9pcv2fx676rl90vbm2xcd9rqlj82";
-  buildDepends = [ parsec shakespeare text xmlConduit ];
-  testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Hamlet-style quasiquoter for XML content";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
deleted file mode 100644
index 405f165c6a7..00000000000
--- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens
-, text, xmlConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-html-conduit-lens";
-  version = "0.3.2.1";
-  sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
-  buildDepends = [ htmlConduit lens text xmlConduit ];
-  testDepends = [
-    doctest hspec hspecExpectationsLens lens xmlConduit
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
-    description = "Optics for xml-conduit and html-conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix
deleted file mode 100644
index 033afd9ee53..00000000000
--- a/pkgs/development/libraries/haskell/xml-lens/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, text, xmlConduit }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-lens";
-  version = "0.1.6.2";
-  sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz";
-  buildDepends = [ lens text xmlConduit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/fumieval/xml-lens";
-    description = "Lenses, traversals, prisms for xml-conduit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
deleted file mode 100644
index a673fa2eddd..00000000000
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xml-types";
-  version = "0.3.4";
-  sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y";
-  buildDepends = [ deepseq text ];
-  meta = {
-    homepage = "https://john-millikin.com/software/haskell-xml/";
-    description = "Basic types for representing XML";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
deleted file mode 100644
index 9066dc8b553..00000000000
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, text }:
-
-cabal.mkDerivation (self: {
-  pname = "xml";
-  version = "1.3.13";
-  sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
-  buildDepends = [ text ];
-  meta = {
-    homepage = "http://code.galois.com";
-    description = "A simple XML library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix
deleted file mode 100644
index 9f4b08d5bbc..00000000000
--- a/pkgs/development/libraries/haskell/xmlgen/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, filepath, HUnit, hxt, mtl, QuickCheck, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmlgen";
-  version = "0.6.2.1";
-  sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-  buildDepends = [ blazeBuilder mtl text ];
-  testDepends = [ filepath HUnit hxt QuickCheck text ];
-  doCheck = false;
-  meta = {
-    description = "Fast XML generation library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
deleted file mode 100644
index 1f4b2474d75..00000000000
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xmlhtml";
-  version = "0.2.3.3";
-  sha256 = "0n95284z24ddgw7v8zjqzanyrshxydcxs4ivchpj88gh5r3ryv5j";
-  buildDepends = [
-    blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
-  ];
-  meta = {
-    description = "XML parser and renderer with HTML 5 quirks mode";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix b/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
deleted file mode 100644
index 80a503704cb..00000000000
--- a/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, gtk, xmonad }:
-
-cabal.mkDerivation (self: {
-  pname = "xmonad-screenshot";
-  version = "0.1.1.0";
-  sha256 = "1iy6c8dis5jkgamkbbgxvbajz8f03bwhwdwk46l6wvlgmb072wl4";
-  buildDepends = [ gtk xmonad ];
-  meta = {
-    homepage = "http://github.com/supki/xmonad-screenshot";
-    description = "Workspaces screenshooting utility for XMonad";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix
deleted file mode 100644
index 7fe91aad0e7..00000000000
--- a/pkgs/development/libraries/haskell/xorshift/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, time }:
-
-cabal.mkDerivation (self: {
-  pname = "xorshift";
-  version = "2.0.1";
-  sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
-  buildDepends = [ random time ];
-  meta = {
-    description = "Haskell implementation of the xorshift random generator";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix
deleted file mode 100644
index 906db96ba5c..00000000000
--- a/pkgs/development/libraries/haskell/xournal-parser/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, attoparsecConduit, conduit, conduitExtra
-, exceptions, lens, mtl, strict, text, transformers, xmlConduit
-, xmlTypes, xournalTypes, zlibConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xournal-parser";
-  version = "0.5.0.3";
-  sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly";
-  buildDepends = [
-    attoparsec attoparsecConduit conduit conduitExtra exceptions lens
-    mtl strict text transformers xmlConduit xmlTypes xournalTypes
-    zlibConduit
-  ];
-  meta = {
-    homepage = "http://ianwookim.org/hoodle";
-    description = "Xournal file parser";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix
deleted file mode 100644
index 9f0be91114a..00000000000
--- a/pkgs/development/libraries/haskell/xournal-types/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, lens, strict, TypeCompose }:
-
-cabal.mkDerivation (self: {
-  pname = "xournal-types";
-  version = "0.5.0.2";
-  sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
-  buildDepends = [ cereal lens strict TypeCompose ];
-  jailbreak = true;
-  meta = {
-    description = "Data types for programs for xournal file format";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
deleted file mode 100644
index 4b1edfb5e8b..00000000000
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, cssText, hspec, HUnit, networkUri, tagsoup
-, text, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xss-sanitize";
-  version = "0.3.5.4";
-  sha256 = "1h9dj234sj216g676la0h73nwm0fw4snik31qi0s754vyy6bcygf";
-  buildDepends = [
-    attoparsec cssText networkUri tagsoup text utf8String
-  ];
-  testDepends = [
-    attoparsec cssText hspec HUnit networkUri tagsoup text utf8String
-  ];
-  meta = {
-    homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
-    description = "sanitize untrusted HTML to prevent XSS attacks";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xtest/default.nix b/pkgs/development/libraries/haskell/xtest/default.nix
deleted file mode 100644
index dd381439d67..00000000000
--- a/pkgs/development/libraries/haskell/xtest/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libXtst, X11 }:
-
-cabal.mkDerivation (self: {
-  pname = "xtest";
-  version = "0.2";
-  sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
-  buildDepends = [ X11 ];
-  extraLibraries = [ libXtst ];
-  meta = {
-    description = "Thin FFI bindings to X11 XTest library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yaml-light/default.nix b/pkgs/development/libraries/haskell/yaml-light/default.nix
deleted file mode 100644
index 460e2833d99..00000000000
--- a/pkgs/development/libraries/haskell/yaml-light/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HsSyck }:
-
-cabal.mkDerivation (self: {
-  pname = "yaml-light";
-  version = "0.1.4";
-  sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
-  buildDepends = [ HsSyck ];
-  meta = {
-    description = "A light-weight wrapper with utility functions around HsSyck";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
deleted file mode 100644
index bf63586eed4..00000000000
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions
-, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific
-, text, transformers, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yaml";
-  version = "0.8.10.1";
-  sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    aeson attoparsec conduit enclosedExceptions filepath resourcet
-    scientific text transformers unorderedContainers vector
-  ];
-  testDepends = [
-    aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text
-    transformers unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/yaml/";
-    description = "Support for parsing and rendering YAML documents";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
deleted file mode 100644
index a52a921ed64..00000000000
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "yap";
-  version = "0.2";
-  sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
-  jailbreak = true;
-  meta = {
-    description = "yet another prelude - a simplistic refactoring with algebraic classes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
deleted file mode 100644
index 2cb6609ab77..00000000000
--- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cryptohash, hspec, persistent, pwstoreFast, text
-, yesodAuth, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-auth-hashdb";
-  version = "1.4.1.1";
-  sha256 = "0bb37iawsdq3m5p1sjdnz954f3nfdmvvhm0hxap1z2hf9dk516ci";
-  buildDepends = [
-    cryptohash persistent pwstoreFast text yesodAuth yesodCore
-    yesodForm yesodPersistent
-  ];
-  testDepends = [ hspec text ];
-  meta = {
-    homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-    description = "Authentication plugin for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
deleted file mode 100644
index cf705ac8fc9..00000000000
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring
-, binary, blazeBuilder, blazeHtml, blazeMarkup, byteable, conduit
-, conduitExtra, cryptohash, dataDefault, emailValidate, fileEmbed
-, httpClient, httpConduit, httpTypes, liftedBase, mimeMail
-, networkUri, persistent, persistentTemplate, random, resourcet
-, safe, shakespeare, text, time, transformers, unorderedContainers
-, wai, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-auth";
-  version = "1.4.1";
-  sha256 = "1nvc5ni4bwhb10ayr75s3z44ynv9kq3lp6kgd536xyagbi054gdp";
-  buildDepends = [
-    aeson authenticate base16Bytestring base64Bytestring binary
-    blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra
-    cryptohash dataDefault emailValidate fileEmbed httpClient
-    httpConduit httpTypes liftedBase mimeMail networkUri persistent
-    persistentTemplate random resourcet safe shakespeare text time
-    transformers unorderedContainers wai yesodCore yesodForm
-    yesodPersistent
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Authentication for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
deleted file mode 100644
index 7033bff4d15..00000000000
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify
-, ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
-, network, optparseApplicative, parsec, projectTemplate, resourcet
-, shakespeare, split, streamingCommons, systemFileio
-, systemFilepath, tar, text, time, transformers, transformersCompat
-, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-bin";
-  version = "1.4.1";
-  sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra
-    dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
-    httpReverseProxy httpTypes liftedBase network optparseApplicative
-    parsec projectTemplate resourcet shakespeare split streamingCommons
-    systemFileio systemFilepath tar text time transformers
-    transformersCompat unixCompat unorderedContainers wai waiExtra warp
-    yaml zlib
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "The yesod helper executable";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
deleted file mode 100644
index 571778cfdc4..00000000000
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml
-, blazeMarkup, caseInsensitive, cereal, clientsession, conduit
-, conduitExtra, cookie, dataDefault, deepseq, exceptions
-, fastLogger, hspec, hspecExpectations, httpTypes, HUnit
-, liftedBase, monadControl, monadLogger, mtl, mwcRandom, network
-, parsec, pathPieces, primitive, QuickCheck, random, resourcet
-, safe, shakespeare, streamingCommons, text, time, transformers
-, transformersBase, unixCompat, unorderedContainers, vector, wai
-, waiExtra, waiLogger, warp, word8
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-core";
-  version = "1.4.7.2";
-  sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y";
-  buildDepends = [
-    aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive
-    cereal clientsession conduit conduitExtra cookie dataDefault
-    deepseq exceptions fastLogger httpTypes liftedBase monadControl
-    monadLogger mtl mwcRandom parsec pathPieces primitive random
-    resourcet safe shakespeare text time transformers transformersBase
-    unixCompat unorderedContainers vector wai waiExtra waiLogger warp
-    word8
-  ];
-  testDepends = [
-    async blazeBuilder clientsession conduit conduitExtra cookie hspec
-    hspecExpectations httpTypes HUnit liftedBase mwcRandom network
-    pathPieces QuickCheck random resourcet shakespeare streamingCommons
-    text transformers wai waiExtra
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
deleted file mode 100644
index 6a65dfefe21..00000000000
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yesodCore }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-default";
-  version = "1.2.0";
-  sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
-  buildDepends = [ yesodCore ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Default config and main functions for your yesod application (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
deleted file mode 100644
index f052a38357d..00000000000
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, dataDefault, emailValidate, hspec, networkUri
-, persistent, resourcet, shakespeare, text, time, transformers, wai
-, xssSanitize, yesodCore, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-form";
-  version = "1.4.3";
-  sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr";
-  buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
-    dataDefault emailValidate networkUri persistent resourcet
-    shakespeare text time transformers wai xssSanitize yesodCore
-    yesodPersistent
-  ];
-  testDepends = [ hspec text time ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Form handling support for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
deleted file mode 100644
index 1964abe7dc8..00000000000
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yesodCore }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-json";
-  version = "1.2.0";
-  sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
-  buildDepends = [ yesodCore ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Generate content for Yesod using the aeson package. (deprecated)";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-markdown/default.nix b/pkgs/development/libraries/haskell/yesod-markdown/default.nix
deleted file mode 100644
index bf77f9fea9d..00000000000
--- a/pkgs/development/libraries/haskell/yesod-markdown/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, pandoc, persistent, shakespeare
-, texmath, text, xssSanitize, yesodCore, yesodForm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-markdown";
-  version = "0.9.3.1";
-  sha256 = "1spbgcsq1lkywp19k7ksiy6rsh2n060mxzh33k0ngbxxg566n08i";
-  buildDepends = [
-    blazeHtml blazeMarkup pandoc persistent shakespeare texmath text
-    xssSanitize yesodCore yesodForm
-  ];
-  meta = {
-    homepage = "http://github.com/pbrisbin/yesod-markdown";
-    description = "Tools for using markdown in a yesod application";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix b/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
deleted file mode 100644
index a6bf924c3c8..00000000000
--- a/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeHtml, blazeMarkup, shakespeare, text, time
-, xmlConduit, yesodCore
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-newsfeed";
-  version = "1.4.0.1";
-  sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
-  buildDepends = [
-    blazeHtml blazeMarkup shakespeare text time xmlConduit yesodCore
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Helper functions and data types for producing News feeds";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-pagination/default.nix b/pkgs/development/libraries/haskell/yesod-pagination/default.nix
deleted file mode 100644
index 38b89445cb7..00000000000
--- a/pkgs/development/libraries/haskell/yesod-pagination/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, esqueleto, hspec, monadLogger, persistent
-, persistentSqlite, resourcePool, resourcet, shakespeare
-, utf8String, waiTest, yesod, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-pagination";
-  version = "2.0.0";
-  sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
-  buildDepends = [ esqueleto yesod ];
-  testDepends = [
-    hspec monadLogger persistent persistentSqlite resourcePool
-    resourcet shakespeare utf8String waiTest yesod yesodTest
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/joelteon/yesod-pagination";
-    description = "Pagination in Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
deleted file mode 100644
index 845fc1c18ff..00000000000
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite
-, persistentTemplate, resourcePool, resourcet, text, transformers
-, waiExtra, yesodCore
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-persistent";
-  version = "1.4.0.1";
-  sha256 = "08648n6b4xhsqbvqh8vpsf3481hvzhrkyqbzs303s6fz683mn0zw";
-  buildDepends = [
-    blazeBuilder conduit persistent persistentTemplate resourcePool
-    resourcet transformers yesodCore
-  ];
-  testDepends = [
-    blazeBuilder conduit hspec persistent persistentSqlite text
-    waiExtra yesodCore
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Some helpers for using Persistent from Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
deleted file mode 100644
index 668cbfda1eb..00000000000
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, pathPieces, text, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-routes";
-  version = "1.2.0.7";
-  sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
-  buildDepends = [ pathPieces text vector ];
-  testDepends = [ hspec HUnit pathPieces text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Efficient routing for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
deleted file mode 100644
index 60a94cfb20d..00000000000
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, attoparsec, base64Bytestring, blazeBuilder
-, byteable, conduit, conduitExtra, cryptohash, cryptohashConduit
-, cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin
-, hspec, httpTypes, HUnit, mimeTypes, resourcet, systemFileio
-, systemFilepath, text, transformers, unixCompat
-, unorderedContainers, wai, waiAppStatic, waiExtra, yesodCore
-, yesodTest
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-static";
-  version = "1.4.0.3";
-  sha256 = "15rwlw76rfh18l3ap73aqmwz4bafmxbr5pchyarll14ps0rjs74g";
-  buildDepends = [
-    async attoparsec base64Bytestring blazeBuilder byteable conduit
-    conduitExtra cryptohash cryptohashConduit cssText dataDefault
-    fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet
-    systemFileio systemFilepath text transformers unixCompat
-    unorderedContainers wai waiAppStatic yesodCore
-  ];
-  testDepends = [
-    async base64Bytestring byteable conduit conduitExtra cryptohash
-    cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec
-    httpTypes HUnit mimeTypes resourcet systemFileio systemFilepath
-    text transformers unixCompat unorderedContainers wai waiAppStatic
-    waiExtra yesodCore yesodTest
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Static file serving subsite for Yesod Web Framework";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
deleted file mode 100644
index 50a6369f186..00000000000
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, caseInsensitive, cookie, hspec, hspecCore, htmlConduit, httpTypes
-, HUnit, monadControl, network, persistent, text, time
-, transformers, wai, waiExtra, xmlConduit, xmlTypes, yesodCore
-, yesodForm
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-test";
-  version = "1.4.2";
-  sha256 = "09iia8vligw41ayhp1fp797n783avb0sf89z8midindrhb5plfbl";
-  buildDepends = [
-    attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
-    cookie hspecCore htmlConduit httpTypes HUnit monadControl network
-    persistent text time transformers wai waiExtra xmlConduit xmlTypes
-    yesodCore
-  ];
-  testDepends = [
-    hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com";
-    description = "integration testing for WAI/Yesod Applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
deleted file mode 100644
index 4b5679512a9..00000000000
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault
-, fastLogger, monadControl, monadLogger, safe, semigroups
-, shakespeare, streamingCommons, text, transformers
-, unorderedContainers, wai, waiExtra, waiLogger, warp, yaml
-, yesodAuth, yesodCore, yesodForm, yesodPersistent
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod";
-  version = "1.4.1.4";
-  sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
-  buildDepends = [
-    aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
-    monadControl monadLogger safe semigroups shakespeare
-    streamingCommons text transformers unorderedContainers wai waiExtra
-    waiLogger warp yaml yesodAuth yesodCore yesodForm yesodPersistent
-  ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Creation of type-safe, RESTful web applications";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
deleted file mode 100644
index 4685a08511a..00000000000
--- a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, dataDefault, filepath, mtl, text, transformersBase
-, vector, yi, yiLanguage, yiRope
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-fuzzy-open";
-  version = "0.1.0";
-  sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
-  buildDepends = [
-    binary dataDefault filepath mtl text transformersBase vector yi
-    yiLanguage yiRope
-  ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-fuzzy-open";
-    description = "Fuzzy open plugin for Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-language/default.nix b/pkgs/development/libraries/haskell/yi-language/default.nix
deleted file mode 100644
index ec5070cac99..00000000000
--- a/pkgs/development/libraries/haskell/yi-language/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, binary, dataDefault, derive, filepath, hashable
-, hspec, lens, ooPrototypes, pointedlist, QuickCheck, regexBase
-, regexTdfa, transformersBase, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-language";
-  version = "0.1.1.0";
-  sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
-  buildDepends = [
-    binary dataDefault derive hashable lens ooPrototypes pointedlist
-    regexBase regexTdfa transformersBase unorderedContainers
-  ];
-  testDepends = [
-    binary dataDefault derive filepath hashable hspec lens pointedlist
-    QuickCheck regexBase regexTdfa transformersBase unorderedContainers
-  ];
-  buildTools = [ alex ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-language";
-    description = "Collection of language-related Yi libraries";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-monokai/default.nix b/pkgs/development/libraries/haskell/yi-monokai/default.nix
deleted file mode 100644
index ddae06b7f22..00000000000
--- a/pkgs/development/libraries/haskell/yi-monokai/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yi }:
-
-cabal.mkDerivation (self: {
-  pname = "yi-monokai";
-  version = "0.1.1.2";
-  sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
-  buildDepends = [ yi ];
-  meta = {
-    homepage = "https://github.com/Fuuzetsu/yi-monokai";
-    description = "Monokai colour theme for the Yi text editor";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix
deleted file mode 100644
index a92f086f3a6..00000000000
--- a/pkgs/development/libraries/haskell/yi-rope/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, charsetdetectAe, dataDefault, deepseq, fingertree
-, hspec, QuickCheck, quickcheckInstances, text, textIcu
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yi-rope";
-  version = "0.7.0.0";
-  sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2";
-  buildDepends = [
-    binary charsetdetectAe dataDefault deepseq fingertree text textIcu
-  ];
-  testDepends = [ hspec QuickCheck quickcheckInstances text ];
-  meta = {
-    description = "A rope data structure used by Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yi-snippet/default.nix b/pkgs/development/libraries/haskell/yi-snippet/default.nix
deleted file mode 100644
index b1cb7041ff0..00000000000
--- a/pkgs/development/libraries/haskell/yi-snippet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, yi, yiRope }:
-
-cabal.mkDerivation (self: {
-  pname = "yi-snippet";
-  version = "0.1.0.0";
-  sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
-  buildDepends = [ yi yiRope ];
-  meta = {
-    homepage = "https://github.com/yi-editor/yi-snippet";
-    description = "Snippet support for Yi";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
deleted file mode 100644
index ea3991eebe9..00000000000
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate
-, pandoc, parsec, scientific, split, text, time
-, unorderedContainers, xhtml, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yst";
-  version = "0.4.1.1";
-  sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec
-    scientific split text time unorderedContainers xhtml yaml
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/jgm/yst";
-    description = "Builds a static website from templates and data in YAML or CSV files";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
deleted file mode 100644
index 37528689a38..00000000000
--- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2
-, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq-haskell";
-  version = "0.8.4";
-  sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3";
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
-  ];
-  extraLibraries = [ zeromq ];
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 2.1.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
deleted file mode 100644
index f4449cdc856..00000000000
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers
-, QuickCheck, semigroups, transformers, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq3-haskell";
-  version = "0.5.2";
-  sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
-  buildDepends = [
-    async MonadCatchIOTransformers semigroups transformers
-  ];
-  testDepends = [
-    ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
-    transformers
-  ];
-  pkgconfigDepends = [ zeromq ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 3.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
deleted file mode 100644
index 4b7c333c07c..00000000000
--- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, async, exceptions, QuickCheck, semigroups, tasty
-, tastyHunit, tastyQuickcheck, transformers, zeromq
-}:
-
-cabal.mkDerivation (self: {
-  pname = "zeromq4-haskell";
-  version = "0.6.2";
-  sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb";
-  buildDepends = [ async exceptions semigroups transformers ];
-  testDepends = [
-    async QuickCheck tasty tastyHunit tastyQuickcheck
-  ];
-  pkgconfigDepends = [ zeromq ];
-  meta = {
-    homepage = "http://github.com/twittner/zeromq-haskell/";
-    description = "Bindings to ZeroMQ 4.x";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
deleted file mode 100644
index 67f2c2453b6..00000000000
--- a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zip-archive";
-  version = "0.2.2.1";
-  sha256 = "0w9l3kdlwkc3yvyxb152s9qwzmc0kjp6d1cbk7yfkpw3081qgckn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary digest filepath mtl text time zlib ];
-  testDepends = [ HUnit time ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jgm/zip-archive";
-    description = "Library for creating and modifying zip archives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
deleted file mode 100644
index 8369b2a3eb5..00000000000
--- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zip-archive";
-  version = "0.2.3.5";
-  sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ binary digest filepath mtl text time zlib ];
-  testDepends = [ HUnit time ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/jgm/zip-archive";
-    description = "Library for creating and modifying zip archives";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
deleted file mode 100644
index f2db123aa17..00000000000
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, multirec }:
-
-cabal.mkDerivation (self: {
-  pname = "zipper";
-  version = "0.4.2";
-  sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
-  buildDepends = [ multirec ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic zipper for families of recursive datatypes";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zippers/default.nix b/pkgs/development/libraries/haskell/zippers/default.nix
deleted file mode 100644
index 939de519fb1..00000000000
--- a/pkgs/development/libraries/haskell/zippers/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, doctest, filepath, lens, profunctors, semigroupoids }:
-
-cabal.mkDerivation (self: {
-  pname = "zippers";
-  version = "0.2";
-  sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
-  buildDepends = [ lens profunctors semigroupoids ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/zippers/";
-    description = "Traversal based zippers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
deleted file mode 100644
index a14d685e968..00000000000
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, QuickCheck, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-bindings";
-  version = "0.1.1.5";
-  sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
-  buildDepends = [ zlib ];
-  testDepends = [ hspec QuickCheck zlib ];
-  meta = {
-    homepage = "http://github.com/snoyberg/zlib-bindings";
-    description = "Low-level bindings to the zlib package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
deleted file mode 100644
index 3d91442022d..00000000000
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, conduit }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-conduit";
-  version = "1.1.0";
-  sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
-  buildDepends = [ conduit ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://github.com/snoyberg/conduit";
-    description = "Streaming compression/decompression via conduits. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
deleted file mode 100644
index 4b133b4c055..00000000000
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, enumerator, transformers, zlibBindings }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib-enum";
-  version = "0.2.3.1";
-  sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ enumerator transformers zlibBindings ];
-  meta = {
-    homepage = "http://github.com/maltem/zlib-enum";
-    description = "Enumerator interface for zlib compression";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/default.nix
deleted file mode 100644
index dad288c8fd0..00000000000
--- a/pkgs/development/libraries/haskell/zlib/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.4.2";
-  sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 6476fb663ef..86b1a2c72a5 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hiredis-${version}";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
     rev = "v${version}";
-    sha256 = "195ih8jprw0q253nvhnmfv9dsm8pss6pdf4x3c88q4mfsyw8pg76";
+    sha256 = "15rzq7n7z9h143smrnd34f9gh24swwal6r9z9xlxsl0jxabiv71l";
   };
 
   PREFIX = "\${out}";
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
new file mode 100644
index 00000000000..63cc7477385
--- /dev/null
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "htmlcxx-${version}";
+  version = "0.85";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
+    sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb";
+  };
+
+  patches = [ ./ptrdiff.patch ];
+
+  meta = {
+    homepage = http://htmlcxx.sourceforge.net/;
+    description = "htmlcxx is a simple non-validating css1 and html parser for C++.";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch
new file mode 100644
index 00000000000..6348ba24f8d
--- /dev/null
+++ b/pkgs/development/libraries/htmlcxx/ptrdiff.patch
@@ -0,0 +1,13 @@
+diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h
+*** htmlcxx-orig-0.85/html/tree.h	2015-09-02 13:57:17.988688798 +0200
+--- htmlcxx-0.85/html/tree.h	2015-09-02 13:57:52.737768811 +0200
+***************
+*** 45,50 ****
+--- 45,51 ----
+  #ifndef tree_hh_
+  #define tree_hh_
+  
++ #include <cstddef>
+  #include <cassert>
+  #include <memory>
+  #include <stdexcept>
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 9d5b11501fc..e2f06cab5cf 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
 
 let
-  version = "2.3";
+  version = "2.5.0";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv";
+    sha256 = "108lh05pl4i5w7hmkw07k9wklk5pbh705pw1qyz5zvp6yicbmd73";
   };
 
   patches = [ ./build-shared.patch ];
@@ -42,7 +42,5 @@ in stdenv.mkDerivation {
     homepage = https://github.com/joyent/http-parser;
 
     license = stdenv.lib.licenses.mit;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index f5a3857ec28..c357d808cac 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   # <http://hydra.bordeaux.inria.fr/build/51474/nixlog/1/raw>.
   doCheck = !stdenv.isCygwin;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";
 
     longDescription = ''
@@ -63,11 +63,11 @@ stdenv.mkDerivation rec {
     '';
 
     # http://www.open-mpi.org/projects/hwloc/license.php
-    license = "revised-BSD";
+    license = licenses.bsd3;
 
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index e95cb7ad097..909f4e936a9 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation {
   configureFlags = "--disable-debug" +
     stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath";
 
+  # remove dependency on bootstrap-tools in early stdenv build
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
new file mode 100644
index 00000000000..25c8d7e561b
--- /dev/null
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libiconv }:
+
+stdenv.mkDerivation rec {
+  name = "idnkit-1.0";
+
+  src = fetchurl {
+    url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz";
+    sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n";
+  };
+
+  buildInputs = [ libiconv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.nic.ad.jp/ja/idn/idnkit;
+    description = "provides functionalities about i18n domain name processing";
+    license = "idnkit-2 license";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 5350630dac4..fbba11c10c9 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, autoreconfHook }:
 
-let version = "9.15";
+let version = "9.16";
 in
 stdenv.mkDerivation {
   name = "ijs-${version}";
 
   src = fetchurl {
     url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
-    sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
+    sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y";
   };
 
   prePatch = "cd ijs";
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 816a9c023e1..742048c9ae6 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, openexr, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, automake, autoconf, libtool, which }:
 
-stdenv.mkDerivation {
-  name = "ilmbase-${openexr.source.version}";
-  
-  src = openexr.source.src;
+stdenv.mkDerivation rec {
+  name = "ilmbase-2.2.0";
 
-  prePatch = ''
-    cd IlmBase
-  '';
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
+  };
 
   preConfigure = ''
     ./bootstrap
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 50703f907d3..3ff608a4ac3 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
+{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "imlib2-1.4.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg";
   };
 
-  buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ];
+  buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index f71c273f6d0..bd2f328e257 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl }:
 
+let
+  inherit (stdenv.lib) optional;
+in
 stdenv.mkDerivation rec{
   name = "iniparser-3.1";
 
@@ -10,12 +13,11 @@ stdenv.mkDerivation rec{
 
   patches = ./no-usr.patch;
 
-  buildFlags = "libiniparser.so";
+  # TODO: Build dylib on Darwin
+  buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ];
 
   installPhase = ''
     mkdir -p $out/lib
-    cp libiniparser.so.0 $out/lib
-    ln -s libiniparser.so.0 $out/lib/libiniparser.so
 
     mkdir -p $out/include
     cp src/*.h $out/include
@@ -25,7 +27,13 @@ stdenv.mkDerivation rec{
       bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
     done;
     cp -r html $out/share/doc/${name}
-  '';
+
+  '' + (if stdenv.isDarwin then ''
+    cp libiniparser.a $out/lib
+  '' else ''
+    cp libiniparser.so.0 $out/lib
+    ln -s libiniparser.so.0 $out/lib/libiniparser.so
+  '');
 
   meta = {
     homepage = http://ndevilla.free.fr/iniparser;
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
new file mode 100644
index 00000000000..7bf4e746db4
--- /dev/null
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+let version = "7.0.2"; in # meta.homepage might change after a major update
+stdenv.mkDerivation {
+  name = "ip2location-c-${version}";
+
+  src = fetchurl {
+    sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
+    url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  # Checks require a database, which require registration (although sample
+  # databases are available, downloading them for just 1 test seems excessive):
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Library to look up locations of host names and IP addresses";
+    longDescription = ''
+      A C library to find the country, region, city,coordinates,
+      zip code, time zone, ISP, domain name, connection type, area code,
+      weather, MCC, MNC, mobile brand name, elevation and usage type of
+      any IP address or host name in the IP2Location databases.
+    '';
+    homepage = http://www.ip2location.com/developers/c-7;
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index a682b3a6b82..8acd872fcb3 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,21 +2,16 @@
 
 
 stdenv.mkDerivation rec {
-  # Version 3843 is required for supertuxkart
-  name = "irrlicht-1.8-svn-3843";
+  name = "irrlicht-${version}-svn-${revision}";
+  version = "1.8";
+  revision = "5104"; # newest revision as of 05-16-15
 
   src = fetchsvn {
-    url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
-    rev = 3843;
-    sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+    url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
+    rev = "${revision}";
+    sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
   };
 
-  patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
-
-  postPatch = ''
-    sed -i /stdcall-alias/d source/Irrlicht/Makefile
-  '';
-
   preConfigure = ''
     cd source/Irrlicht
   '';
@@ -30,11 +25,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  postInstall = ''
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
-  '';
-
   buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
 
   meta = {
diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
new file mode 100644
index 00000000000..a682b3a6b82
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
@@ -0,0 +1,45 @@
+{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
+
+
+stdenv.mkDerivation rec {
+  # Version 3843 is required for supertuxkart
+  name = "irrlicht-1.8-svn-3843";
+
+  src = fetchsvn {
+    url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
+    rev = 3843;
+    sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+  };
+
+  patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
+
+  postPatch = ''
+    sed -i /stdcall-alias/d source/Irrlicht/Makefile
+  '';
+
+  preConfigure = ''
+    cd source/Irrlicht
+  '';
+
+  buildPhase = ''
+    make sharedlib NDEBUG=1
+  '';
+
+  preInstall = ''
+    sed -i s,/usr/local/lib,$out/lib, Makefile
+    mkdir -p $out/lib
+  '';
+
+  postInstall = ''
+    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
+    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
+  '';
+
+  buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
+
+  meta = {
+    homepage = http://irrlicht.sourceforge.net/;
+    license = stdenv.lib.licenses.zlib;
+    description = "Open source high performance realtime 3D engine written in C++";
+  };
+}
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
new file mode 100644
index 00000000000..63140dba37f
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
+
+  src = fetchurl {
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
+    sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
+  };
+
+  buildInputs = [ gmp ];
+  patches = [ ./fix-gcc-build.diff ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.kotnet.org/~skimo/isl/;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index 67620881bca..d7143b8747e 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/0.14.1.nix
index 5fa009277e1..8196dec283a 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -1,24 +1,21 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.14";
+  name = "isl-0.14.1";
 
   src = fetchurl {
-    url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
-    sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y";
+    url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+    sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";
   };
 
   buildInputs = [ gmp ];
 
   enableParallelBuilding = true;
 
-  doCheck = true;
-
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.15.0.nix
new file mode 100644
index 00000000000..eca3372ad4d
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.15.0.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "isl-0.15";
+
+  src = fetchurl {
+    url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+    sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh";
+  };
+
+  buildInputs = [ gmp ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.kotnet.org/~skimo/isl/;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff
new file mode 100644
index 00000000000..6fbd1f9d478
--- /dev/null
+++ b/pkgs/development/libraries/isl/fix-gcc-build.diff
@@ -0,0 +1,12 @@
+diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h
+--- isl-0.11.1/include/isl/int.h        2012-11-29 09:47:32.000000000 +0100
++++ isl-0.11.1.new/include/isl/int.h    2013-10-27 15:35:31.348553812 +0100
+@@ -14,7 +14,7 @@
+ #include <string.h>
+ #include <gmp.h>
+ #if defined(__cplusplus)
+-#include <iostream>
++#include <ostream>
+ #endif
+ 
+ #if defined(__cplusplus)
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 7b78c39924f..f0f9cc65cb2 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1mvq9p85khsl818i4vbszyfab0fd45mdrwrxjkzw05mk1xcyc1br";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.digip.org/jansson/";
     description = "C library for encoding, decoding and manipulating JSON data";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index a642c0acb34..82d86d46fad 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, unzip, xlibs, libjpeg }:
+{ stdenv, fetchurl, unzip, libjpeg }:
 
 stdenv.mkDerivation rec {
   name = "jasper-1.900.1";
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     ./jasper-CVE-2014-9029.diff
   ];
 
+  # outputs TODO: why reconf
   nativeBuildInputs = [ unzip autoreconfHook ];
   propagatedBuildInputs = [ libjpeg ];
 
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index b398a7a1147..d14e444f298 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -23,5 +23,6 @@ in antBuild {
     homepage = http://www.junit.org/;
     description = "A framework for repeatable tests in Java";
     license = stdenv.lib.licenses.epl10;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 34aaded7cb4..74aa8c9ba16 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       cp -v *.jar "$out/share/java"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An implementation of JavaScript written in Java";
 
     longDescription =
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
 
     homepage = http://www.mozilla.org/rhino/;
 
-    license = [ "MPLv1.1" /* or */ "GPLv2+" ];
+    license = with licenses; [ mpl11 /* or */ gpl2Plus ];
   };
 }
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index 2e0c75c1452..7dba9e02519 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile
-  '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) ''
+  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
     substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \
       --replace "CC = gcc" "CC = clang"
   '';
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index b08f5b7dd76..4e13c9b1d93 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jemalloc-3.6.0";
+  name = "jemalloc-4.0.2";
 
   src = fetchurl {
     url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2";
-    sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71";
+    sha256 = "04a6iw9wiwiknd7v3l3i7vpmc5nvv52islnb1hz9idmdk259r2hd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index d8b85847975..923d8af59bf 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,31 +1,45 @@
-{ stdenv, fetchurl, cmake, python }:
+{ stdenv, fetchFromGitHub, cmake, python }:
 
-let
-  basename = "jsoncpp";
-  version = "1.6.0";
-in
 stdenv.mkDerivation rec {
-  name = "${basename}-${version}";
-  src = fetchurl {
-    url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
-    sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
+  name = "jsoncpp-${version}";
+  version = "1.6.5";
+
+  src = fetchFromGitHub {
+    owner = "open-source-parsers";
+    repo = "jsoncpp";
+    rev = version;
+    sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
   };
 
-  nativeBuildInputs =
-    [
-      # cmake can be built with the system jsoncpp, or its own bundled version.
-      # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
-      # we make a bootstrapping build with the bundled version.
-      (cmake.override { jsoncpp = null; })
-      python
-    ];
+  /* During darwin bootstrap, we have a cp that doesn't understand the
+   * --reflink=auto flag, which is used in the default unpackPhase for dirs
+   */
+  unpackPhase = ''
+    cp -a ${src} ${src.name}
+    chmod -R +w ${src.name}
+    export sourceRoot=${src.name}
+  '';
+
+  # Hack to be able to run the test, broken because we use
+  # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
+  preBuild = ''
+    export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH"
+  '';
+
+  nativeBuildInputs = [ cmake python ];
+
+  cmakeFlags = [
+    "-DJSONCPP_LIB_BUILD_SHARED=ON"
+    "-DJSONCPP_LIB_BUILD_STATIC=OFF"
+    "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
+  ];
 
   meta = {
     inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ mit ];
+    maintainers = with stdenv.lib.maintainers; [ ttuegel page ];
+    license = stdenv.lib.licenses.mit;
     branch = "1.6";
   };
 }
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index 13b50286380..6e2c085f3ba 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   # gcc 4.8 optimisations break judy.
   # http://sourceforge.net/p/judy/mailman/message/31995144/
-  preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) ''
+  preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
     configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
   '';
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
new file mode 100644
index 00000000000..e6961f16d27
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -0,0 +1,217 @@
+# 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.
+
+{ pkgs, newScope, qt5 ? null, debug ? false }:
+
+let inherit (pkgs) autonix stdenv symlinkJoin; in
+
+with autonix; let inherit (stdenv) lib; in
+
+let
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
+
+let
+
+  qt5 = qt5_;
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames = builtins.fromJSON (builtins.readFile ./renames.json);
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
+
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.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";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
+
+  scope =
+    # packages in this collection
+    self //
+    # packages pinned to this version of Qt 5
+    {
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkit_qt5 = pkgs.polkit_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;
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
+                libgcrypt libgit2 modemmanager networkmanager perl
+                perlPackages qimageblitz xorg zlib;
+        boost = boost155;
+        gif = giflib;
+        glib2 = glib;
+        jpeg = libjpeg;
+        libintl = gettext;
+        liblzma = lzma;
+        pythoninterp = python;
+        pythonlibrary = python;
+        sharedmimeinfo = shared_mime_info;
+      }
+    );
+
+  self = super // {
+    extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
+      buildInputs = [];
+      nativeBuildInputs = [];
+      propagatedBuildInputs = [];
+      propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
+      propagatedUserEnvPkgs = [];
+      cmakeFlags = ["-DBUILD_TESTING=OFF"];
+      patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
+      meta = {
+        license = stdenv.lib.licenses.bsd2;
+        platforms = stdenv.lib.platforms.linux;
+        maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+        homepage = "http://www.kde.org";
+      };
+    });
+
+    frameworkintegration = extendDerivation super.frameworkintegration {
+      buildInputs = [ scope.xorg.libXcursor ];
+    };
+
+    kauth = extendDerivation super.kauth {
+      buildInputs = [ scope.polkit_qt5 ];
+      patches = [ ./kauth/kauth-policy-install.patch ];
+    };
+
+    kcmutils = extendDerivation super.kcmutils {
+      patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
+    };
+
+    kconfigwidgets = extendDerivation super.kconfigwidgets {
+      patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
+    };
+
+    kdelibs4support = extendDerivation super.kdelibs4support {
+      buildInputs = [ scope.networkmanager scope.xorg.libSM ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+      ];
+    };
+
+    kdoctools = extendDerivation super.kdoctools {
+      propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+        "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
+      ];
+      patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
+    };
+
+    ki18n = extendDerivation super.ki18n {
+      propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
+    };
+
+    kimageformats = extendDerivation super.kimageformats {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
+    };
+
+    kinit = extendDerivation super.kinit {
+      patches = [./kinit/0001-kinit-libpath.patch];
+    };
+
+    kpackage = extendDerivation super.kpackage {
+      patches = [ ./kpackage/0001-allow-external-paths.patch ];
+    };
+
+    kservice = extendDerivation super.kservice {
+      buildInputs = [ scope.kwindowsystem ];
+      patches = [
+        ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+        ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+      ];
+    };
+
+    ktexteditor = extendDerivation super.ktexteditor {
+      patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+    };
+
+    networkmanager-qt = extendDerivation super.networkmanager-qt {
+      propagatedBuildInputs = [ scope.networkmanager ];
+    };
+  };
+
+in self
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
index 2b220244c59..6122ddf4b3a 100755
--- a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
@@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX
 
 autonixDepsKf5=""
 if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
 else
     autonixDepsKF5="$1/dist/build/kf5-deps"
 fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
index 9717716faf5..9717716faf5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch
index 340155256f2..340155256f2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
index 47b8dfad180..47b8dfad180 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
index 3bd946cbd84..3bd946cbd84 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch
index 4e3a33efab3..4e3a33efab3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
index a6ccb2085d3..9c76079a382 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
@@ -1,8 +1,17 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
 diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
+index 9e775b6..0ac5646 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,
+@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
          if (!libpath.isEmpty()) {
              if (!l.load()) {
                  if (libpath_relative) {
@@ -15,10 +24,10 @@ index 3c3c913..f510620 100644
 -                    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/../
++                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/plugins/../../
 +                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
++                  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);
@@ -28,3 +37,6 @@ index 3c3c913..f510620 100644
                  }
              }
              if (!l.isLoaded()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch
index 440e979c008..440e979c008 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch
index e9bc418544a..e9bc418544a 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
index 7e21ebfe86f..7e21ebfe86f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch
index c2e77a537c5..c2e77a537c5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.json b/pkgs/development/libraries/kde-frameworks-5.10/packages.json
new file mode 100644
index 00000000000..c5e704e62b1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.json
@@ -0,0 +1,2090 @@
+{
+    "kwallet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kwallet-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwallet-5.10.0.tar.xz",
+            "name": "kwallet-5.10.0.tar.xz",
+            "sha256": "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4"
+        },
+        "buildInputs": [
+            "ecm",
+            "gpgme",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5gpgmepp",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "libgcrypt",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdewebkit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5webkitwidgets"
+        ],
+        "name": "kdewebkit-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz",
+            "name": "kdewebkit-5.10.0.tar.xz",
+            "sha256": "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5wallet",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5webkitwidgets",
+            "qt5widgets"
+        ]
+    },
+    "kbookmarks": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5widgetsaddons",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kbookmarks-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz",
+            "name": "kbookmarks-5.10.0.tar.xz",
+            "sha256": "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "threadweaver": {
+        "nativeBuildInputs": [
+            "cmake",
+            "snippetextractor"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "threadweaver-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/threadweaver-5.10.0.tar.xz",
+            "name": "threadweaver-5.10.0.tar.xz",
+            "sha256": "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5threadweaver",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcompletion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kcompletion-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcompletion-5.10.0.tar.xz",
+            "name": "kcompletion-5.10.0.tar.xz",
+            "sha256": "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwidgetsaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwidgetsaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz",
+            "name": "kwidgetsaddons-5.10.0.tar.xz",
+            "sha256": "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets"
+        ]
+    },
+    "kxmlrpcclient": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio"
+        ],
+        "name": "kxmlrpcclient-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz",
+            "name": "kxmlrpcclient-5.10.0.tar.xz",
+            "sha256": "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "kf5kio",
+            "qt5test"
+        ]
+    },
+    "extra-cmake-modules": {
+        "nativeBuildInputs": [
+            "cmake",
+            "qcollectiongenerator_executable",
+            "sphinx_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "extra-cmake-modules-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz",
+            "name": "extra-cmake-modules-5.10.0.tar.xz",
+            "sha256": "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "flex",
+            "gobject",
+            "gstreamer",
+            "lcms",
+            "libart",
+            "libxslt",
+            "openexr",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qt5core",
+            "qt5linguisttools",
+            "sqlite",
+            "strigi",
+            "usb",
+            "xine",
+            "xmms"
+        ]
+    },
+    "kidletime": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kidletime-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kidletime-5.10.0.tar.xz",
+            "name": "kidletime-5.10.0.tar.xz",
+            "sha256": "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "x11_xcb",
+            "xcb"
+        ]
+    },
+    "kitemmodels": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kitemmodels-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz",
+            "name": "kitemmodels-5.10.0.tar.xz",
+            "sha256": "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6"
+        },
+        "buildInputs": [
+            "ecm",
+            "grantlee",
+            "qt5",
+            "qt5core",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "attica": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "attica-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/attica-5.10.0.tar.xz",
+            "name": "attica-5.10.0.tar.xz",
+            "sha256": "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwindowsystem": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwindowsystem-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz",
+            "name": "kwindowsystem-5.10.0.tar.xz",
+            "sha256": "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5winextras",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "ki18n": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ki18n-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ki18n-5.10.0.tar.xz",
+            "name": "ki18n-5.10.0.tar.xz",
+            "sha256": "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs"
+        },
+        "buildInputs": [
+            "ecm",
+            "libintl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5script",
+            "qt5test"
+        ]
+    },
+    "knewstuff": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5attica",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5widgets"
+        ],
+        "name": "knewstuff-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knewstuff-5.10.0.tar.xz",
+            "name": "knewstuff-5.10.0.tar.xz",
+            "sha256": "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5attica",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdelibs4support": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kdewin",
+            "kf5archive",
+            "kf5auth",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5guiaddons",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5notifications",
+            "kf5parts",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5windowsystem",
+            "qt5dbus",
+            "qt5printsupport",
+            "qt5xml"
+        ],
+        "name": "kdelibs4support-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz",
+            "name": "kdelibs4support-5.10.0.tar.xz",
+            "sha256": "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "docbookxml4",
+            "ecm",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "gobject",
+            "gstreamer",
+            "kdewin",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5crash",
+            "kf5dbusaddons",
+            "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",
+            "qt5network",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "sqlite",
+            "usb",
+            "x11",
+            "xine",
+            "xmms"
+        ]
+    },
+    "sonnet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "sonnet-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/sonnet-5.10.0.tar.xz",
+            "name": "sonnet-5.10.0.tar.xz",
+            "sha256": "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93"
+        },
+        "buildInputs": [
+            "aspell",
+            "ecm",
+            "enchant",
+            "hspell",
+            "hunspell",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "zlib"
+        ]
+    },
+    "networkmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "networkmanager-qt-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz",
+            "name": "networkmanager-qt-5.10.0.tar.xz",
+            "sha256": "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4"
+        },
+        "buildInputs": [
+            "ecm",
+            "networkmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5test"
+        ]
+    },
+    "solid": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "solid-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/solid-5.10.0.tar.xz",
+            "name": "solid-5.10.0.tar.xz",
+            "sha256": "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864"
+        },
+        "buildInputs": [
+            "bison",
+            "ecm",
+            "flex",
+            "iokit",
+            "mediaplayerinfo",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "udev"
+        ]
+    },
+    "modemmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "modemmanager-qt-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz",
+            "name": "modemmanager-qt-5.10.0.tar.xz",
+            "sha256": "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5modemmanagerqt",
+            "modemmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kactivities": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kactivities-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kactivities-5.10.0.tar.xz",
+            "name": "kactivities-5.10.0.tar.xz",
+            "sha256": "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk"
+        },
+        "buildInputs": [
+            "boost",
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kpeople": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kpeople-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpeople-5.10.0.tar.xz",
+            "name": "kpeople-5.10.0.tar.xz",
+            "sha256": "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5service",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kcrash": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcrash-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcrash-5.10.0.tar.xz",
+            "name": "kcrash-5.10.0.tar.xz",
+            "sha256": "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kglobalaccel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus",
+            "qt5widgets"
+        ],
+        "name": "kglobalaccel-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz",
+            "name": "kglobalaccel-5.10.0.tar.xz",
+            "sha256": "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kitemviews": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kitemviews-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kitemviews-5.10.0.tar.xz",
+            "name": "kitemviews-5.10.0.tar.xz",
+            "sha256": "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kplotting": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kplotting-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kplotting-5.10.0.tar.xz",
+            "name": "kplotting-5.10.0.tar.xz",
+            "sha256": "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kauth": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kauth-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kauth-5.10.0.tar.xz",
+            "name": "kauth-5.10.0.tar.xz",
+            "sha256": "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "plasma-framework": {
+        "nativeBuildInputs": [
+            "cmake",
+            "sh"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5package",
+            "kf5service"
+        ],
+        "name": "plasma-framework-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz",
+            "name": "plasma-framework-5.10.0.tar.xz",
+            "sha256": "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "gpgme",
+            "kactivities",
+            "kcoreaddons",
+            "kde4support",
+            "kdeclarative",
+            "kdepimlibs",
+            "kdesu",
+            "kf5",
+            "kf5activities",
+            "kf5archive",
+            "kf5auth",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5idletime",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5js",
+            "kf5karchive",
+            "kf5kauth",
+            "kf5kbookmarks",
+            "kf5kcodecs",
+            "kf5kcompletion",
+            "kf5kconfig",
+            "kf5kconfigwidgets",
+            "kf5kcoreaddons",
+            "kf5kcrash",
+            "kf5kdbusaddons",
+            "kf5kde4support",
+            "kf5kdeclarative",
+            "kf5kdesu",
+            "kf5kdoctools",
+            "kf5kf5globalaccel",
+            "kf5kguiaddons",
+            "kf5ki18n",
+            "kf5kiconthemes",
+            "kf5kidletime",
+            "kf5kinit",
+            "kf5kio",
+            "kf5kjobwidgets",
+            "kf5kjs",
+            "kf5knotifications",
+            "kf5kparts",
+            "kf5kross",
+            "kf5kservice",
+            "kf5ktextwidgets",
+            "kf5kunitconversion",
+            "kf5kwallet",
+            "kf5kwidgetsaddons",
+            "kf5kwindowsystem",
+            "kf5notifications",
+            "kf5package",
+            "kf5parts",
+            "kf5service",
+            "kf5solid",
+            "kf5sonnet",
+            "kf5su",
+            "kf5textwidgets",
+            "kf5threadweaver",
+            "kf5unitconversion",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "opengl",
+            "qca2",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5script",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "solid",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kguiaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kguiaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz",
+            "name": "kguiaddons-5.10.0.tar.xz",
+            "sha256": "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kservice": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5coreaddons"
+        ],
+        "name": "kservice-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kservice-5.10.0.tar.xz",
+            "name": "kservice-5.10.0.tar.xz",
+            "sha256": "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "khtml": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5core"
+        ],
+        "name": "khtml-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz",
+            "name": "khtml-5.10.0.tar.xz",
+            "sha256": "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2"
+        },
+        "buildInputs": [
+            "ecm",
+            "gif",
+            "jpeg",
+            "kdewin",
+            "kf5archive",
+            "kf5codecs",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "openssl",
+            "perl",
+            "phonon4qt5",
+            "png",
+            "qt5",
+            "qt5test",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kded": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kded-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kded-5.10.0.tar.xz",
+            "name": "kded-5.10.0.tar.xz",
+            "sha256": "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5init",
+            "kf5service",
+            "qt5"
+        ]
+    },
+    "kpty": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpty-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpty-5.10.0.tar.xz",
+            "name": "kpty-5.10.0.tar.xz",
+            "sha256": "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "qt5",
+            "utempter"
+        ]
+    },
+    "kross": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "qt5script",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kross-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz",
+            "name": "kross-5.10.0.tar.xz",
+            "sha256": "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5script",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kxmlgui": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5configwidgets",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kxmlgui-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz",
+            "name": "kxmlgui-5.10.0.tar.xz",
+            "sha256": "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5attica",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5printsupport",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5xml"
+        ],
+        "name": "kconfig-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kconfig-5.10.0.tar.xz",
+            "name": "kconfig-5.10.0.tar.xz",
+            "sha256": "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kinit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kinit-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kinit-5.10.0.tar.xz",
+            "name": "kinit-5.10.0.tar.xz",
+            "sha256": "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "libcap",
+            "qt5",
+            "x11"
+        ]
+    },
+    "kpackage": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpackage-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpackage-5.10.0.tar.xz",
+            "name": "kpackage-5.10.0.tar.xz",
+            "sha256": "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "karchive": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "karchive-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/karchive-5.10.0.tar.xz",
+            "name": "karchive-5.10.0.tar.xz",
+            "sha256": "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw"
+        },
+        "buildInputs": [
+            "bzip2",
+            "ecm",
+            "kf5archive",
+            "liblzma",
+            "qt5core",
+            "qt5test",
+            "zlib"
+        ]
+    },
+    "kdesu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5pty"
+        ],
+        "name": "kdesu-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdesu-5.10.0.tar.xz",
+            "name": "kdesu-5.10.0.tar.xz",
+            "sha256": "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5pty",
+            "kf5service",
+            "qt5core",
+            "x11"
+        ]
+    },
+    "kimageformats": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kimageformats-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kimageformats-5.10.0.tar.xz",
+            "name": "kimageformats-5.10.0.tar.xz",
+            "sha256": "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay"
+        },
+        "buildInputs": [
+            "ecm",
+            "jasper",
+            "openexr",
+            "qt5gui",
+            "qt5printsupport",
+            "qt5test"
+        ]
+    },
+    "kmediaplayer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5parts"
+        ],
+        "name": "kmediaplayer-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz",
+            "name": "kmediaplayer-5.10.0.tar.xz",
+            "sha256": "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5parts",
+            "kf5xmlgui",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "ktexteditor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktexteditor-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz",
+            "name": "ktexteditor-5.10.0.tar.xz",
+            "sha256": "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5sonnet",
+            "libgit2",
+            "perl",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qt5xmlpatterns"
+        ]
+    },
+    "kdesignerplugin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesignerplugin-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz",
+            "name": "kdesignerplugin-5.10.0.tar.xz",
+            "sha256": "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5plotting",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5core",
+            "qt5designer",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kparts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio",
+            "kf5textwidgets",
+            "kf5xmlgui"
+        ],
+        "name": "kparts-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kparts-5.10.0.tar.xz",
+            "name": "kparts-5.10.0.tar.xz",
+            "sha256": "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5notifications",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcmutils": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5service"
+        ],
+        "name": "kcmutils-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcmutils-5.10.0.tar.xz",
+            "name": "kcmutils-5.10.0.tar.xz",
+            "sha256": "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5package",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "frameworkintegration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5iconthemes"
+        ],
+        "name": "frameworkintegration-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz",
+            "name": "frameworkintegration-5.10.0.tar.xz",
+            "sha256": "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "oxygenfont",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kiconthemes": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kiconthemes-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz",
+            "name": "kiconthemes-5.10.0.tar.xz",
+            "sha256": "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kjs-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz",
+            "name": "kjs-5.10.0.tar.xz",
+            "sha256": "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "pcre",
+            "perl",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "knotifyconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifyconfig-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz",
+            "name": "knotifyconfig-5.10.0.tar.xz",
+            "sha256": "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kio": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5service",
+            "kf5solid",
+            "kf5xmlgui",
+            "qt5network"
+        ],
+        "name": "kio-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kio-5.10.0.tar.xz",
+            "name": "kio-5.10.0.tar.xz",
+            "sha256": "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r"
+        },
+        "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",
+            "libxslt",
+            "openssl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "qt5xml",
+            "strigi",
+            "x11",
+            "zlib"
+        ]
+    },
+    "kunitconversion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kunitconversion-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz",
+            "name": "kunitconversion-5.10.0.tar.xz",
+            "sha256": "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kdnssd": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5network"
+        ],
+        "name": "kdnssd-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdnssd-5.10.0.tar.xz",
+            "name": "kdnssd-5.10.0.tar.xz",
+            "sha256": "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi"
+        },
+        "buildInputs": [
+            "avahi",
+            "dnssd",
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5network"
+        ]
+    },
+    "knotifications": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifications-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knotifications-5.10.0.tar.xz",
+            "name": "knotifications-5.10.0.tar.xz",
+            "sha256": "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p"
+        },
+        "buildInputs": [
+            "dbusmenu-qt5",
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5windowsystem",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kdbusaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus"
+        ],
+        "name": "kdbusaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz",
+            "name": "kdbusaddons-5.10.0.tar.xz",
+            "sha256": "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5dbus",
+            "qt5test",
+            "qt5x11extras"
+        ]
+    },
+    "kemoticons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5service",
+            "qt5gui"
+        ],
+        "name": "kemoticons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kemoticons-5.10.0.tar.xz",
+            "name": "kemoticons-5.10.0.tar.xz",
+            "sha256": "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5service",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdoctools": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kdoctools-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdoctools-5.10.0.tar.xz",
+            "name": "kdoctools-5.10.0.tar.xz",
+            "sha256": "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp"
+        },
+        "buildInputs": [
+            "docbookxml4",
+            "docbookxsl",
+            "ecm",
+            "kf5archive",
+            "kf5doctools",
+            "kf5i18n",
+            "libxml2",
+            "libxslt",
+            "qt5core"
+        ]
+    },
+    "kapidox": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapidox-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kapidox-5.10.0.tar.xz",
+            "name": "kapidox-5.10.0.tar.xz",
+            "sha256": "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4"
+        },
+        "buildInputs": [
+            "pythoninterp"
+        ]
+    },
+    "kcoreaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcoreaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz",
+            "name": "kcoreaddons-5.10.0.tar.xz",
+            "sha256": "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1"
+        },
+        "buildInputs": [
+            "ecm",
+            "fam",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "krunner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5plasma",
+            "qt5core"
+        ],
+        "name": "krunner-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz",
+            "name": "krunner-5.10.0.tar.xz",
+            "sha256": "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5service",
+            "kf5solid",
+            "kf5threadweaver",
+            "qt5",
+            "qt5gui",
+            "qt5quick",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjobwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons",
+            "qt5widgets"
+        ],
+        "name": "kjobwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz",
+            "name": "kjobwidgets-5.10.0.tar.xz",
+            "sha256": "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kcodecs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcodecs-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcodecs-5.10.0.tar.xz",
+            "name": "kcodecs-5.10.0.tar.xz",
+            "sha256": "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "kconfigwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5widgetsaddons"
+        ],
+        "name": "kconfigwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz",
+            "name": "kconfigwidgets-5.10.0.tar.xz",
+            "sha256": "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test"
+        ]
+    },
+    "kdeclarative": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5package",
+            "qt5qml"
+        ],
+        "name": "kdeclarative-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz",
+            "name": "kdeclarative-5.10.0.tar.xz",
+            "sha256": "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg"
+        },
+        "buildInputs": [
+            "activeapp",
+            "ecm",
+            "epoxy",
+            "kf5config",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5package",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5test"
+        ]
+    },
+    "ktextwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5sonnet",
+            "qt5widgets"
+        ],
+        "name": "ktextwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz",
+            "name": "ktextwidgets-5.10.0.tar.xz",
+            "sha256": "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5sonnet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjsembed": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5js"
+        ],
+        "name": "kjsembed-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz",
+            "name": "kjsembed-5.10.0.tar.xz",
+            "sha256": "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5js",
+            "qt5"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
new file mode 100755
index 00000000000..9d226db2c04
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
+
+# 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) \
+    "${KDE_MIRROR}/stable/frameworks/5.10/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch
index 9a22c0bdbcd..9a22c0bdbcd 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/renames.json b/pkgs/development/libraries/kde-frameworks-5.10/renames.json
new file mode 100644
index 00000000000..4da5f8272ee
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/renames.json
@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh
index a8d9b7e0e36..a8d9b7e0e36 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
new file mode 100644
index 00000000000..229f28f9095
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
@@ -0,0 +1,228 @@
+# 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.
+
+{ pkgs, newScope, qt5 ? null, debug ? false }:
+
+let inherit (pkgs) autonix stdenv symlinkJoin; in
+
+with autonix; let inherit (stdenv) lib; in
+
+let
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
+
+let
+
+  qt5 = qt5_;
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames = builtins.fromJSON (builtins.readFile ./renames.json);
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
+
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.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";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
+
+  scope =
+    # packages in this collection
+    self //
+    # packages pinned to this version of Qt 5
+    {
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkit_qt5 = pkgs.polkit_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;
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
+                libgcrypt libgit2 modemmanager networkmanager perl
+                perlPackages qimageblitz xorg zlib;
+        boost = boost155;
+        gif = giflib;
+        glib2 = glib;
+        jpeg = libjpeg;
+        libintl = gettext;
+        liblzma = lzma;
+        pythoninterp = python;
+        pythonlibrary = python;
+        sharedmimeinfo = shared_mime_info;
+      }
+    );
+
+  self = super // {
+    bluez-qt = overrideDerivation super.bluez-qt (drv: {
+      preConfigure = ''
+        substituteInPlace CMakeLists.txt \
+          --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      '';
+    });
+
+    extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
+      buildInputs = [];
+      nativeBuildInputs = [];
+      propagatedBuildInputs = [];
+      propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
+      propagatedUserEnvPkgs = [];
+      cmakeFlags = ["-DBUILD_TESTING=OFF"];
+      patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
+      meta = {
+        license = stdenv.lib.licenses.bsd2;
+        platforms = stdenv.lib.platforms.linux;
+        maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+        homepage = "http://www.kde.org";
+      };
+    });
+
+    frameworkintegration = extendDerivation super.frameworkintegration {
+      buildInputs = [ scope.xorg.libXcursor ];
+    };
+
+    kauth = extendDerivation super.kauth {
+      buildInputs = [ scope.polkit_qt5 ];
+      patches = [ ./kauth/kauth-policy-install.patch ];
+    };
+
+    kcmutils = extendDerivation super.kcmutils {
+      patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
+    };
+
+    kconfigwidgets = extendDerivation super.kconfigwidgets {
+      patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
+    };
+
+    kdelibs4support = extendDerivation super.kdelibs4support {
+      buildInputs = [ scope.networkmanager scope.xorg.libSM ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+      ];
+    };
+
+    kdoctools = extendDerivation super.kdoctools {
+      propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+        "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
+      ];
+      patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
+    };
+
+    ki18n = extendDerivation super.ki18n {
+      propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
+    };
+
+    kimageformats = extendDerivation super.kimageformats {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
+    };
+
+    kinit = extendDerivation super.kinit {
+      patches = [./kinit/0001-kinit-libpath.patch];
+    };
+
+    kpackage = extendDerivation super.kpackage {
+      patches = [ ./kpackage/0001-allow-external-paths.patch ];
+    };
+
+    kservice = extendDerivation super.kservice {
+      buildInputs = [ scope.kwindowsystem ];
+      patches = [
+        ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+        ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+      ];
+    };
+
+    ktexteditor = extendDerivation super.ktexteditor {
+      patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+    };
+
+    kwallet = extendDerivation super.kwallet {
+      buildInputs = [ scope.kdoctools ];
+    };
+
+    networkmanager-qt = extendDerivation super.networkmanager-qt {
+      propagatedBuildInputs = [ scope.networkmanager ];
+    };
+  };
+
+in self
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
new file mode 100755
index 00000000000..6122ddf4b3a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
@@ -0,0 +1,22 @@
+#!/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 haskellPackages.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.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 00000000000..9717716faf5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+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.12/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch
new file mode 100644
index 00000000000..340155256f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+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.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 00000000000..47b8dfad180
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 00000000000..3bd946cbd84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.12/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 00000000000..4e3a33efab3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+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.12/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch
new file mode 100644
index 00000000000..9c76079a382
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch
@@ -0,0 +1,42 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 9e775b6..0ac5646 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -660,15 +660,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/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/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()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 00000000000..440e979c008
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+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.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 00000000000..e9bc418544a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 00000000000..7e21ebfe86f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+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.12/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch
new file mode 100644
index 00000000000..c2e77a537c5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch
@@ -0,0 +1,48 @@
+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.12/packages.json b/pkgs/development/libraries/kde-frameworks-5.12/packages.json
new file mode 100644
index 00000000000..f5951517266
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.json
@@ -0,0 +1,2116 @@
+{
+    "kwallet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kwallet-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwallet-5.12.0.tar.xz",
+            "name": "kwallet-5.12.0.tar.xz",
+            "sha256": "0i45qf4j42172jr4mz3xzw589frp4xw86b2j3rhgzipfi26cx3zd"
+        },
+        "buildInputs": [
+            "ecm",
+            "gpgme",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5gpgmepp",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "libgcrypt",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdewebkit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5webkitwidgets"
+        ],
+        "name": "kdewebkit-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdewebkit-5.12.0.tar.xz",
+            "name": "kdewebkit-5.12.0.tar.xz",
+            "sha256": "09r0bvjgvb9ar13whr4ar21r4kzjwa4zipn6iqzx9n0xxwn2mxjv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5wallet",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5webkitwidgets",
+            "qt5widgets"
+        ]
+    },
+    "kbookmarks": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5widgetsaddons",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kbookmarks-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kbookmarks-5.12.0.tar.xz",
+            "name": "kbookmarks-5.12.0.tar.xz",
+            "sha256": "07xayi77h9wg2f4pnwgjbicbfqk42lphqvcha9sn97p0hnzl1g5h"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "bluez-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "bluez-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/bluez-qt-5.12.0.tar.xz",
+            "name": "bluez-qt-5.12.0.tar.xz",
+            "sha256": "1asgcvspwra52ywfk6v4mv1fdxkshyh5zyqnwljbbs1a1n8g8gl0"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quicktest",
+            "qt5test"
+        ]
+    },
+    "threadweaver": {
+        "nativeBuildInputs": [
+            "cmake",
+            "snippetextractor"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "threadweaver-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/threadweaver-5.12.0.tar.xz",
+            "name": "threadweaver-5.12.0.tar.xz",
+            "sha256": "1xswh5k48n3nq5v8zgc3qyldky8pq3xgsbsgjg1is5pgayw4j08b"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5threadweaver",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcompletion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kcompletion-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcompletion-5.12.0.tar.xz",
+            "name": "kcompletion-5.12.0.tar.xz",
+            "sha256": "0g4gvc9r0l7ng7jv0hkp8khhlckgwzpix5hsjjcmzggfkhsl4sj0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwidgetsaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwidgetsaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwidgetsaddons-5.12.0.tar.xz",
+            "name": "kwidgetsaddons-5.12.0.tar.xz",
+            "sha256": "12n3c3j6nawrhgc9mqk627q1brjvbdxkm52g0mnm5c5ql953gqs6"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets"
+        ]
+    },
+    "kxmlrpcclient": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio"
+        ],
+        "name": "kxmlrpcclient-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kxmlrpcclient-5.12.0.tar.xz",
+            "name": "kxmlrpcclient-5.12.0.tar.xz",
+            "sha256": "1ysw61kcx0i6il6r782jdyr2a9n8hy0j5mgpd7slr57mrcfgsivd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "kf5kio",
+            "qt5test"
+        ]
+    },
+    "extra-cmake-modules": {
+        "nativeBuildInputs": [
+            "cmake",
+            "qcollectiongenerator_executable",
+            "sphinx_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "extra-cmake-modules-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/extra-cmake-modules-5.12.0.tar.xz",
+            "name": "extra-cmake-modules-5.12.0.tar.xz",
+            "sha256": "14n77sn493m8kzr42wv13mdgxpnbx7x64bvw37ircrx8wmf4002i"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "flex",
+            "gobject",
+            "gstreamer",
+            "lcms",
+            "libart",
+            "libxslt",
+            "openexr",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qt5core",
+            "qt5linguisttools",
+            "sqlite",
+            "strigi",
+            "usb",
+            "xine",
+            "xmms"
+        ]
+    },
+    "kidletime": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kidletime-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kidletime-5.12.0.tar.xz",
+            "name": "kidletime-5.12.0.tar.xz",
+            "sha256": "1rpvj4q07sc17an4274pcszdsqjdl8x33ln3lmw5x2q27v5d22qc"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "x11_xcb",
+            "xcb"
+        ]
+    },
+    "kitemmodels": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kitemmodels-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kitemmodels-5.12.0.tar.xz",
+            "name": "kitemmodels-5.12.0.tar.xz",
+            "sha256": "0wmsb59svzk0iay9ynbjbdgqxph1cpvifvvnlxc67a5nzhgk5cms"
+        },
+        "buildInputs": [
+            "ecm",
+            "grantlee",
+            "qt5",
+            "qt5core",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "attica": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "attica-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/attica-5.12.0.tar.xz",
+            "name": "attica-5.12.0.tar.xz",
+            "sha256": "05311rr7zsfwzq3569gg2gkq6rksvhdji1x0jv8zxax5a1n40gc7"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwindowsystem": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwindowsystem-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwindowsystem-5.12.0.tar.xz",
+            "name": "kwindowsystem-5.12.0.tar.xz",
+            "sha256": "0fjxhf07r186cmp0mjvinrwxg4z90zlyvycqhy0n18fdp67szckl"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5winextras",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "ki18n": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ki18n-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ki18n-5.12.0.tar.xz",
+            "name": "ki18n-5.12.0.tar.xz",
+            "sha256": "11bivhaiqk8rlnz288ghnbjp3i2kdivmrzscjjnyqw25rpjj4drz"
+        },
+        "buildInputs": [
+            "ecm",
+            "libintl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5script",
+            "qt5test"
+        ]
+    },
+    "knewstuff": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5attica",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5widgets"
+        ],
+        "name": "knewstuff-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knewstuff-5.12.0.tar.xz",
+            "name": "knewstuff-5.12.0.tar.xz",
+            "sha256": "03zxj81a4hy46azh047xxfmr4mjp8ri7hzcxspi31hmr8gf1hxv9"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5attica",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdelibs4support": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kdewin",
+            "kf5archive",
+            "kf5auth",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5guiaddons",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5notifications",
+            "kf5parts",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5windowsystem",
+            "qt5dbus",
+            "qt5printsupport",
+            "qt5xml"
+        ],
+        "name": "kdelibs4support-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kdelibs4support-5.12.0.tar.xz",
+            "name": "kdelibs4support-5.12.0.tar.xz",
+            "sha256": "0hbs1gwqgx4sc8cma1q5pyanf2kj5brfz9dph5xcf32bijz2ds4f"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "docbookxml4",
+            "ecm",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "gobject",
+            "gstreamer",
+            "kdewin",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5crash",
+            "kf5dbusaddons",
+            "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",
+            "qt5network",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "sqlite",
+            "usb",
+            "x11",
+            "xine",
+            "xmms"
+        ]
+    },
+    "sonnet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "sonnet-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/sonnet-5.12.0.tar.xz",
+            "name": "sonnet-5.12.0.tar.xz",
+            "sha256": "1rr5dbs9477mf8lacmk5dcvw0h3s597l4miwm4j3rmn9jpvlcm1l"
+        },
+        "buildInputs": [
+            "aspell",
+            "ecm",
+            "enchant",
+            "hspell",
+            "hunspell",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "zlib"
+        ]
+    },
+    "networkmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "networkmanager-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/networkmanager-qt-5.12.0.tar.xz",
+            "name": "networkmanager-qt-5.12.0.tar.xz",
+            "sha256": "0znwp1nyw47dpq48m1c1y250msm2lh9hipzjmgvh2mqr60vvy094"
+        },
+        "buildInputs": [
+            "ecm",
+            "networkmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5test"
+        ]
+    },
+    "solid": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "solid-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/solid-5.12.0.tar.xz",
+            "name": "solid-5.12.0.tar.xz",
+            "sha256": "0s3xjrc5v350s0w26jpzb427h0nx6bhqldv7qswknrqir5x6zymj"
+        },
+        "buildInputs": [
+            "bison",
+            "ecm",
+            "flex",
+            "iokit",
+            "mediaplayerinfo",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "udev"
+        ]
+    },
+    "modemmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "modemmanager-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/modemmanager-qt-5.12.0.tar.xz",
+            "name": "modemmanager-qt-5.12.0.tar.xz",
+            "sha256": "1s9ayfpkpkkrqss3x2swb2fzg5zxja8qkawwy59crf9xjfk3gwxi"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5modemmanagerqt",
+            "modemmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kactivities": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kactivities-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kactivities-5.12.0.tar.xz",
+            "name": "kactivities-5.12.0.tar.xz",
+            "sha256": "1rv5fb5gx7nkksy857aqbsvgkkw0fc0zs8yab3b4hyv4ybqx4j2q"
+        },
+        "buildInputs": [
+            "boost",
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kpeople": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kpeople-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpeople-5.12.0.tar.xz",
+            "name": "kpeople-5.12.0.tar.xz",
+            "sha256": "0p8qamrxcfxb0f7fsrjn1k5vhi8hmd2iph6b5bjblfpwgw2f44r8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5service",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kcrash": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcrash-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcrash-5.12.0.tar.xz",
+            "name": "kcrash-5.12.0.tar.xz",
+            "sha256": "00m69f0wrykrdhiyasfpwykrkh4r05hldr8yjvw2sn62gb1s45pg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kglobalaccel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus",
+            "qt5widgets"
+        ],
+        "name": "kglobalaccel-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kglobalaccel-5.12.0.tar.xz",
+            "name": "kglobalaccel-5.12.0.tar.xz",
+            "sha256": "1p8kj31m4lyy6dr85383v6j8bg622xmw3x8kyiijlckd1zf2bmr8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kitemviews": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kitemviews-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kitemviews-5.12.0.tar.xz",
+            "name": "kitemviews-5.12.0.tar.xz",
+            "sha256": "0swlp9kynsw708mm9b4bh2r9rcwqxqmkwaga4gg33cjchf0y8862"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kplotting": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kplotting-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kplotting-5.12.0.tar.xz",
+            "name": "kplotting-5.12.0.tar.xz",
+            "sha256": "1xh0lbi7fxsz3gj2y762r9md85l8fp0l6kj5577444k4vswgaial"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kauth": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kauth-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kauth-5.12.0.tar.xz",
+            "name": "kauth-5.12.0.tar.xz",
+            "sha256": "1ky3f16z4w0p97yzdfn3v4qs50wcir5p18cq6sakjhp95fxj1m2y"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "plasma-framework": {
+        "nativeBuildInputs": [
+            "cmake",
+            "sh"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5package",
+            "kf5service"
+        ],
+        "name": "plasma-framework-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/plasma-framework-5.12.0.tar.xz",
+            "name": "plasma-framework-5.12.0.tar.xz",
+            "sha256": "07ma5nr3v3r9x9gc5sb3rhghci8cl0mm11f8dfawl3bvyzzhq3hm"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "gpgme",
+            "kactivities",
+            "kcoreaddons",
+            "kde4support",
+            "kdeclarative",
+            "kdepimlibs",
+            "kdesu",
+            "kf5",
+            "kf5activities",
+            "kf5archive",
+            "kf5auth",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5idletime",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5js",
+            "kf5karchive",
+            "kf5kauth",
+            "kf5kbookmarks",
+            "kf5kcodecs",
+            "kf5kcompletion",
+            "kf5kconfig",
+            "kf5kconfigwidgets",
+            "kf5kcoreaddons",
+            "kf5kcrash",
+            "kf5kdbusaddons",
+            "kf5kde4support",
+            "kf5kdeclarative",
+            "kf5kdesu",
+            "kf5kdoctools",
+            "kf5kf5globalaccel",
+            "kf5kguiaddons",
+            "kf5ki18n",
+            "kf5kiconthemes",
+            "kf5kidletime",
+            "kf5kinit",
+            "kf5kio",
+            "kf5kjobwidgets",
+            "kf5kjs",
+            "kf5knotifications",
+            "kf5kparts",
+            "kf5kross",
+            "kf5kservice",
+            "kf5ktextwidgets",
+            "kf5kunitconversion",
+            "kf5kwallet",
+            "kf5kwidgetsaddons",
+            "kf5kwindowsystem",
+            "kf5notifications",
+            "kf5package",
+            "kf5parts",
+            "kf5service",
+            "kf5solid",
+            "kf5sonnet",
+            "kf5su",
+            "kf5textwidgets",
+            "kf5threadweaver",
+            "kf5unitconversion",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "opengl",
+            "qca2",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5script",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "solid",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kguiaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kguiaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kguiaddons-5.12.0.tar.xz",
+            "name": "kguiaddons-5.12.0.tar.xz",
+            "sha256": "0s49vn617vaddnrpryivrpwmcdb95xincx2x86bsybdsss8nawp3"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kservice": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5coreaddons"
+        ],
+        "name": "kservice-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kservice-5.12.0.tar.xz",
+            "name": "kservice-5.12.0.tar.xz",
+            "sha256": "12zfxvzv34hbcwi325izlahr65cgd465hsj29ib3lgr0aadi8r0b"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "khtml": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5core"
+        ],
+        "name": "khtml-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/khtml-5.12.0.tar.xz",
+            "name": "khtml-5.12.0.tar.xz",
+            "sha256": "0f76x8zy81dd7y0qwkf7drwa3k2f4yzbr13w2i89yaa078l7p9sw"
+        },
+        "buildInputs": [
+            "ecm",
+            "gif",
+            "jpeg",
+            "kdewin",
+            "kf5archive",
+            "kf5codecs",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "openssl",
+            "perl",
+            "phonon4qt5",
+            "png",
+            "qt5",
+            "qt5test",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kded": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kded-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kded-5.12.0.tar.xz",
+            "name": "kded-5.12.0.tar.xz",
+            "sha256": "1876gc1kkz41kcmy78lnl212paygfhj0syvswbdpx3nq4gyyrkyx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5init",
+            "kf5service",
+            "qt5"
+        ]
+    },
+    "kpty": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpty-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpty-5.12.0.tar.xz",
+            "name": "kpty-5.12.0.tar.xz",
+            "sha256": "0gpvjdsag5fmdz5fmjna7wb6j64cpwzfk6rljg938xg0pidms6wc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "qt5",
+            "utempter"
+        ]
+    },
+    "kross": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "qt5script",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kross-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kross-5.12.0.tar.xz",
+            "name": "kross-5.12.0.tar.xz",
+            "sha256": "1s7vxsp992y8r39m1val4mylfcl084wsj391y5z333cdryr4wqwq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5script",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kxmlgui": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5configwidgets",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kxmlgui-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kxmlgui-5.12.0.tar.xz",
+            "name": "kxmlgui-5.12.0.tar.xz",
+            "sha256": "1v9nf3hrymikgy3d7lh9xcyw8dx1ndl8gsgmzfbxjli60fjniiyl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5attica",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5printsupport",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5xml"
+        ],
+        "name": "kconfig-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kconfig-5.12.0.tar.xz",
+            "name": "kconfig-5.12.0.tar.xz",
+            "sha256": "1dxdf01kswigv7cdad9zjxg5iri479hi8gib3b72pwm24m0wc5ac"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kinit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kinit-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kinit-5.12.0.tar.xz",
+            "name": "kinit-5.12.0.tar.xz",
+            "sha256": "19w1wgv9javrfmfq52bdvaazd3hqlf6hwdw09hc5935b043zx6cz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "libcap",
+            "qt5",
+            "x11"
+        ]
+    },
+    "kpackage": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpackage-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpackage-5.12.0.tar.xz",
+            "name": "kpackage-5.12.0.tar.xz",
+            "sha256": "1a8cn1zqv930nmda8n45fnwc5al1iw7xdgqvydbgds7q0mqwg7l5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "karchive": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "karchive-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/karchive-5.12.0.tar.xz",
+            "name": "karchive-5.12.0.tar.xz",
+            "sha256": "0dh6pskw1picj3f6a4bbhd9j9ki8l738x7f9dxfwcx05mzsliyl8"
+        },
+        "buildInputs": [
+            "bzip2",
+            "ecm",
+            "kf5archive",
+            "liblzma",
+            "qt5core",
+            "qt5test",
+            "zlib"
+        ]
+    },
+    "kdesu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5pty"
+        ],
+        "name": "kdesu-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdesu-5.12.0.tar.xz",
+            "name": "kdesu-5.12.0.tar.xz",
+            "sha256": "1ks695j7wnb7j6vca7a3cb0ii0li4g7sdyksvqsmkxbb1rrpg11f"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5pty",
+            "kf5service",
+            "qt5core",
+            "x11"
+        ]
+    },
+    "kimageformats": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kimageformats-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kimageformats-5.12.0.tar.xz",
+            "name": "kimageformats-5.12.0.tar.xz",
+            "sha256": "1h91xwj4xjv8z5a9hnid7zqcs35cwxv6hf3kwaag35vllm2cs0s7"
+        },
+        "buildInputs": [
+            "ecm",
+            "jasper",
+            "openexr",
+            "qt5gui",
+            "qt5printsupport",
+            "qt5test"
+        ]
+    },
+    "kmediaplayer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5parts"
+        ],
+        "name": "kmediaplayer-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kmediaplayer-5.12.0.tar.xz",
+            "name": "kmediaplayer-5.12.0.tar.xz",
+            "sha256": "0yr5jjpfnjgfrzqpksl85k6jsgihdb5spf0k9478ryyzpzw3as15"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5parts",
+            "kf5xmlgui",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "ktexteditor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktexteditor-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ktexteditor-5.12.0.tar.xz",
+            "name": "ktexteditor-5.12.0.tar.xz",
+            "sha256": "09fcyxanl744mrbpxw5sa1bvf18d9hcs305jaim8bgfw58gz7prl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5sonnet",
+            "libgit2",
+            "perl",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qt5xmlpatterns"
+        ]
+    },
+    "kdesignerplugin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesignerplugin-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdesignerplugin-5.12.0.tar.xz",
+            "name": "kdesignerplugin-5.12.0.tar.xz",
+            "sha256": "05n5pfqabmmy5y8dvk7xz51nyky4k44vxhv7k9fq231cza07w3dg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5plotting",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5core",
+            "qt5designer",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kparts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio",
+            "kf5textwidgets",
+            "kf5xmlgui"
+        ],
+        "name": "kparts-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kparts-5.12.0.tar.xz",
+            "name": "kparts-5.12.0.tar.xz",
+            "sha256": "075iqmjdmg8jlbmnpp4jjfr4way4i4c5zwg4c1d4cgd14rr9vm1r"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5notifications",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcmutils": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5service"
+        ],
+        "name": "kcmutils-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcmutils-5.12.0.tar.xz",
+            "name": "kcmutils-5.12.0.tar.xz",
+            "sha256": "1bnrybzfzhb98ihxcvxjgd6agbr16grhdp8zrbq0lhqbaivyfrzd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5package",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "frameworkintegration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5iconthemes"
+        ],
+        "name": "frameworkintegration-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/frameworkintegration-5.12.0.tar.xz",
+            "name": "frameworkintegration-5.12.0.tar.xz",
+            "sha256": "0pi1gsc2k681f7913ald5d4i53riv2nwj09plalkabydh8kcd55j"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "oxygenfont",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kiconthemes": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kiconthemes-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kiconthemes-5.12.0.tar.xz",
+            "name": "kiconthemes-5.12.0.tar.xz",
+            "sha256": "0myaqpi1pavjyf2pyvkb2v87vwpyzwd2bvm5bh88va1p1kw747a5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kjs-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kjs-5.12.0.tar.xz",
+            "name": "kjs-5.12.0.tar.xz",
+            "sha256": "1ajcnpphn3vdkx4xwb762bvj0ws7l2h5sxq53cz3lzvznn9q99ps"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "pcre",
+            "perl",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "knotifyconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifyconfig-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knotifyconfig-5.12.0.tar.xz",
+            "name": "knotifyconfig-5.12.0.tar.xz",
+            "sha256": "0gznp2m7hlrbl6y7d3p8g6nwdgpk1h2iyy810cs6cjhs5n7b7bfk"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kio": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5service",
+            "kf5solid",
+            "kf5xmlgui",
+            "qt5network"
+        ],
+        "name": "kio-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kio-5.12.0.tar.xz",
+            "name": "kio-5.12.0.tar.xz",
+            "sha256": "139jngyaa1rm159qj0ivjk9bd18rb6sp9n8290xsqwpfvs6ixn7w"
+        },
+        "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",
+            "libxslt",
+            "openssl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "qt5xml",
+            "strigi",
+            "x11",
+            "zlib"
+        ]
+    },
+    "kunitconversion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kunitconversion-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kunitconversion-5.12.0.tar.xz",
+            "name": "kunitconversion-5.12.0.tar.xz",
+            "sha256": "0gmxqjryjzhhr75clbs7swd765asfaf0b7ivnqk99j0dzdg1yh8m"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kdnssd": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5network"
+        ],
+        "name": "kdnssd-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdnssd-5.12.0.tar.xz",
+            "name": "kdnssd-5.12.0.tar.xz",
+            "sha256": "1v8nml6fmabail6d9wybfqmg02kymg15x5ng4vc08z9wrn1jvxrd"
+        },
+        "buildInputs": [
+            "avahi",
+            "dnssd",
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5network"
+        ]
+    },
+    "knotifications": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifications-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knotifications-5.12.0.tar.xz",
+            "name": "knotifications-5.12.0.tar.xz",
+            "sha256": "08clp98lpplk2k6c4r1l01yh16ssn4ipfc6w8wiahqipp6gzw1bv"
+        },
+        "buildInputs": [
+            "dbusmenu-qt5",
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5windowsystem",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kdbusaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus"
+        ],
+        "name": "kdbusaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdbusaddons-5.12.0.tar.xz",
+            "name": "kdbusaddons-5.12.0.tar.xz",
+            "sha256": "1nfanafpsi67lmszf8lf3zyjghb3j0jfbc5s7vsa19zbxz9dsh3d"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5dbus",
+            "qt5test",
+            "qt5x11extras"
+        ]
+    },
+    "kemoticons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5service",
+            "qt5gui"
+        ],
+        "name": "kemoticons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kemoticons-5.12.0.tar.xz",
+            "name": "kemoticons-5.12.0.tar.xz",
+            "sha256": "11wm832xv59vlwnlq314vr7j151mfv7s5xsgab1h0w1ypf8nbggv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5service",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdoctools": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kdoctools-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdoctools-5.12.0.tar.xz",
+            "name": "kdoctools-5.12.0.tar.xz",
+            "sha256": "0if3lss9ywwkpcgb8k6vi6b35vl5xxy77gdsbmvd2w2r83p2s6n4"
+        },
+        "buildInputs": [
+            "docbookxml4",
+            "docbookxsl",
+            "ecm",
+            "kf5archive",
+            "kf5doctools",
+            "kf5i18n",
+            "libxml2",
+            "libxslt",
+            "qt5core"
+        ]
+    },
+    "kapidox": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapidox-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kapidox-5.12.0.tar.xz",
+            "name": "kapidox-5.12.0.tar.xz",
+            "sha256": "0pcmyp92l63klxjz3valpk9kr9rh3ny663hqlfj1qcbl5qx10fic"
+        },
+        "buildInputs": [
+            "pythoninterp"
+        ]
+    },
+    "kcoreaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcoreaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcoreaddons-5.12.0.tar.xz",
+            "name": "kcoreaddons-5.12.0.tar.xz",
+            "sha256": "1w113966p2wsr6ddwifzpc6lvx2hpr2qziq7kn4ycjpq3fc6whl7"
+        },
+        "buildInputs": [
+            "ecm",
+            "fam",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "krunner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5plasma",
+            "qt5core"
+        ],
+        "name": "krunner-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/krunner-5.12.0.tar.xz",
+            "name": "krunner-5.12.0.tar.xz",
+            "sha256": "167zz32q5ghxc672yp372livdr37wx24769726izhfhqh22gqbpz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5service",
+            "kf5solid",
+            "kf5threadweaver",
+            "qt5",
+            "qt5gui",
+            "qt5quick",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjobwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons",
+            "qt5widgets"
+        ],
+        "name": "kjobwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kjobwidgets-5.12.0.tar.xz",
+            "name": "kjobwidgets-5.12.0.tar.xz",
+            "sha256": "1vrxcsy4jad2dzjhwlb44l18fckb1h5p3f4w6q8493clribc27kj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kcodecs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcodecs-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcodecs-5.12.0.tar.xz",
+            "name": "kcodecs-5.12.0.tar.xz",
+            "sha256": "1xwz1ipf53azhcpm91c8q1q1i5v4avbnfapgz45hr223ilfkdmpy"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "kconfigwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5widgetsaddons"
+        ],
+        "name": "kconfigwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kconfigwidgets-5.12.0.tar.xz",
+            "name": "kconfigwidgets-5.12.0.tar.xz",
+            "sha256": "1xwk6alrfpgm3pblhdglzglazvjp9i5kzcg212ngad8q9z05c4jg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test"
+        ]
+    },
+    "kdeclarative": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5package",
+            "qt5qml"
+        ],
+        "name": "kdeclarative-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdeclarative-5.12.0.tar.xz",
+            "name": "kdeclarative-5.12.0.tar.xz",
+            "sha256": "0k6c6ar5xi0m2p4s81p0057i13zpihakniscx5v9yz1ncv7sl8gm"
+        },
+        "buildInputs": [
+            "activeapp",
+            "ecm",
+            "epoxy",
+            "kf5config",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5package",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5test"
+        ]
+    },
+    "ktextwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5sonnet",
+            "qt5widgets"
+        ],
+        "name": "ktextwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ktextwidgets-5.12.0.tar.xz",
+            "name": "ktextwidgets-5.12.0.tar.xz",
+            "sha256": "0m2813dm3xs9q2rwvbkynckgbbh0q51swhibhdyirggl1xc8vvf0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5sonnet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kjsembed": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5js"
+        ],
+        "name": "kjsembed-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kjsembed-5.12.0.tar.xz",
+            "name": "kjsembed-5.12.0.tar.xz",
+            "sha256": "0fmgpi0c62y2658xaf0d825azywmpy77vg97k788liqy0d1ykhvh"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5js",
+            "qt5"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
new file mode 100755
index 00000000000..b859a87f32f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
+
+# 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) \
+    "${KDE_MIRROR}/stable/frameworks/5.12/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch
new file mode 100644
index 00000000000..9a22c0bdbcd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch
@@ -0,0 +1,13 @@
+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.12/renames.json b/pkgs/development/libraries/kde-frameworks-5.12/renames.json
new file mode 100644
index 00000000000..e469d582b1c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/renames.json
@@ -0,0 +1,71 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5bluezqt": "bluez-qt",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix
new file mode 100644
index 00000000000..98721876c12
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "attica";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix
new file mode 100644
index 00000000000..8b6b3509f0d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix
@@ -0,0 +1,49 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kauth
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kfilemetadata
+, ki18n
+, kidletime
+, kio
+, lmdb
+, qtbase
+, qtquick1
+, solid
+}:
+
+kdeFramework {
+  name = "baloo";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kauth
+    kconfig
+    kcrash
+    kdbusaddons
+    ki18n
+    kidletime
+    kio
+    lmdb
+    qtquick1
+    solid
+  ];
+  propagatedBuildInputs = [
+    kcoreaddons
+    kfilemetadata
+    qtbase
+  ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/baloo_file"
+    wrapKDEProgram "$out/bin/baloo_file_extractor"
+    wrapKDEProgram "$out/bin/balooctl"
+    wrapKDEProgram "$out/bin/baloosearch"
+    wrapKDEProgram "$out/bin/balooshow"
+    wrapKDEProgram "$out/bin/baloo-monitor"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix
new file mode 100644
index 00000000000..f981b0516f7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "bluez-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative ];
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/default.nix
new file mode 100644
index 00000000000..1ff433c13c8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/default.nix
@@ -0,0 +1,112 @@
+# Maintainer's Notes:
+#
+# How To Update
+#  1. Edit the URL in ./manifest.sh
+#  2. Run ./manifest.sh
+#  3. Fix build errors.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib stdenv;
+
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+
+  kdeFramework = args:
+    let
+      inherit (args) name;
+      inherit (srcs."${name}") src version;
+    in stdenv.mkDerivation (args // {
+      name = "${name}-${version}";
+      inherit src;
+
+      cmakeFlags =
+        (args.cmakeFlags or [])
+        ++ [ "-DBUILD_TESTING=OFF" ]
+        ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+      meta = {
+        license = with lib.licenses; [
+          lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+        ];
+        platforms = lib.platforms.linux;
+        homepage = "http://www.kde.org";
+      } // (args.meta or {});
+    });
+
+  addPackages = self: with self; {
+    attica = callPackage ./attica.nix {};
+    baloo = callPackage ./baloo.nix {};
+    bluez-qt = callPackage ./bluez-qt.nix {};
+    extra-cmake-modules = callPackage ./extra-cmake-modules {};
+    frameworkintegration = callPackage ./frameworkintegration.nix {};
+    kactivities = callPackage ./kactivities.nix {};
+    kapidox = callPackage ./kapidox.nix {};
+    karchive = callPackage ./karchive.nix {};
+    kauth = callPackage ./kauth {};
+    kbookmarks = callPackage ./kbookmarks.nix {};
+    kcmutils = callPackage ./kcmutils {};
+    kcodecs = callPackage ./kcodecs.nix {};
+    kcompletion = callPackage ./kcompletion.nix {};
+    kconfig = callPackage ./kconfig.nix {};
+    kconfigwidgets = callPackage ./kconfigwidgets {};
+    kcoreaddons = callPackage ./kcoreaddons.nix {};
+    kcrash = callPackage ./kcrash.nix {};
+    kdbusaddons = callPackage ./kdbusaddons.nix {};
+    kdeclarative = callPackage ./kdeclarative.nix {};
+    kded = callPackage ./kded.nix {};
+    kdelibs4support = callPackage ./kdelibs4support.nix {};
+    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+    kdewebkit = callPackage ./kdewebkit.nix {};
+    kdesu = callPackage ./kdesu.nix {};
+    kdnssd = callPackage ./kdnssd.nix {};
+    kdoctools = callPackage ./kdoctools {};
+    kemoticons = callPackage ./kemoticons.nix {};
+    kfilemetadata = callPackage ./kfilemetadata.nix {};
+    kglobalaccel = callPackage ./kglobalaccel.nix {};
+    kguiaddons = callPackage ./kguiaddons.nix {};
+    khtml = callPackage ./khtml.nix {};
+    ki18n = callPackage ./ki18n.nix {};
+    kiconthemes = callPackage ./kiconthemes.nix {};
+    kidletime = callPackage ./kidletime.nix {};
+    kimageformats = callPackage ./kimageformats.nix {};
+    kinit = callPackage ./kinit {};
+    kio = callPackage ./kio.nix {};
+    kitemmodels = callPackage ./kitemmodels.nix {};
+    kitemviews = callPackage ./kitemviews.nix {};
+    kjobwidgets = callPackage ./kjobwidgets.nix {};
+    kjs = callPackage ./kjs.nix {};
+    kjsembed = callPackage ./kjsembed.nix {};
+    kmediaplayer = callPackage ./kmediaplayer.nix {};
+    knewstuff = callPackage ./knewstuff.nix {};
+    knotifications = callPackage ./knotifications.nix {};
+    knotifyconfig = callPackage ./knotifyconfig.nix {};
+    kpackage = callPackage ./kpackage {};
+    kparts = callPackage ./kparts.nix {};
+    kpeople = callPackage ./kpeople.nix {};
+    kplotting = callPackage ./kplotting.nix {};
+    kpty = callPackage ./kpty.nix {};
+    kross = callPackage ./kross.nix {};
+    krunner = callPackage ./krunner.nix {};
+    kservice = callPackage ./kservice {};
+    ktexteditor = callPackage ./ktexteditor {};
+    ktextwidgets = callPackage ./ktextwidgets.nix {};
+    kunitconversion = callPackage ./kunitconversion.nix {};
+    kwallet = callPackage ./kwallet.nix {};
+    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+    kwindowsystem = callPackage ./kwindowsystem.nix {};
+    kxmlgui = callPackage ./kxmlgui.nix {};
+    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+    plasma-framework = callPackage ./plasma-framework {};
+    solid = callPackage ./solid.nix {};
+    sonnet = callPackage ./sonnet.nix {};
+    threadweaver = callPackage ./threadweaver.nix {};
+  };
+
+  newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);
+
+in lib.makeScope newScope addPackages
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 00000000000..9717716faf5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+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.13/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix
new file mode 100644
index 00000000000..4d669b72a89
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+  setupHook = ./setup-hook.sh;
+  patches = [ ./0001-extra-cmake-modules-paths.patch ];
+
+  # It is OK to propagate these inputs as long as
+  # extra-cmake-modules is never a propagated input
+  # of some other derivation.
+  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
+
+  meta = {
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh
new file mode 100644
index 00000000000..ce9aafb90e8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh
@@ -0,0 +1,4 @@
+wrapKDEProgram() {
+    KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1}
+    wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@"
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh
new file mode 100755
index 00000000000..a329d8b8562
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.13/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+workdir=$(pwd)
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        url="${src:2}"
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameversion="${filename%.tar.*}"
+        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+        cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$version";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+    fi
+done
+
+echo "}" >>../srcs.nix
+
+cd ..
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix
new file mode 100644
index 00000000000..ad30cc87ecf
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix
@@ -0,0 +1,34 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kbookmarks
+, kcompletion
+, kconfig
+, kconfigwidgets
+, ki18n
+, kiconthemes
+, kio
+, knotifications
+, kwidgetsaddons
+, libXcursor
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "frameworkintegration";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kbookmarks
+    kcompletion
+    kconfig
+    ki18n
+    kio
+    knotifications
+    kwidgetsaddons
+    libXcursor
+    qtx11extras
+  ];
+  propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix
new file mode 100644
index 00000000000..c8e296bad80
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix
@@ -0,0 +1,42 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, boost
+, kcmutils
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kdeclarative
+, kglobalaccel
+, ki18n
+, kio
+, kservice
+, kwindowsystem
+, kxmlgui
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kactivities";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    boost
+    kcmutils
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kdeclarative
+    kglobalaccel
+    ki18n
+    kio
+    kservice
+    kwindowsystem
+    kxmlgui
+    qtdeclarative
+  ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kactivitymanagerd"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix
new file mode 100644
index 00000000000..647be8f052c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix
@@ -0,0 +1,12 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, python
+}:
+
+kdeFramework {
+  name = "kapidox";
+  nativeBuildInputs = [ extra-cmake-modules python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix
new file mode 100644
index 00000000000..a8d9a0003c3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "karchive";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix
new file mode 100644
index 00000000000..42a10019334
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, polkitQt
+}:
+
+kdeFramework {
+  name = "kauth";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkitQt ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  patches = [ ./kauth-policy-install.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch
new file mode 100644
index 00000000000..340155256f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+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.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix
new file mode 100644
index 00000000000..1a469ab4db6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kiconthemes
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kbookmarks";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kiconthemes
+    kxmlgui
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix
new file mode 100644
index 00000000000..ac7a5af06a4
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix
@@ -0,0 +1,31 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfigwidgets
+, kcoreaddons
+, kdeclarative
+, ki18n
+, kiconthemes
+, kitemviews
+, kpackage
+, kservice
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kcmutils";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons
+    kdeclarative
+    ki18n
+    kiconthemes
+    kitemviews
+    kpackage
+    kxmlgui
+  ];
+  propagatedBuildInputs = [ kconfigwidgets kservice ];
+  patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 00000000000..47b8dfad180
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix
new file mode 100644
index 00000000000..53a69a69b69
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kcodecs";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix
new file mode 100644
index 00000000000..e393774f16a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kwidgetsaddons
+}:
+
+kdeFramework {
+  name = "kcompletion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix
new file mode 100644
index 00000000000..ce890745767
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kconfig";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kreadconfig5"
+    wrapKDEProgram "$out/bin/kwriteconfig5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix
new file mode 100644
index 00000000000..d16f7f92bea
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix
@@ -0,0 +1,24 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kauth
+, kcodecs
+, kconfig
+, kdoctools
+, kguiaddons
+, ki18n
+, kwidgetsaddons
+}:
+
+kdeFramework {
+  name = "kconfigwidgets";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kguiaddons ki18n ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ];
+  patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/preparetips5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 00000000000..3bd946cbd84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix
new file mode 100644
index 00000000000..43c21bb51ef
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, shared_mime_info
+}:
+
+kdeFramework {
+  name = "kcoreaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ shared_mime_info ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix
new file mode 100644
index 00000000000..b919c7ad222
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwindowsystem
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kcrash";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix
new file mode 100644
index 00000000000..eb76e14705e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kdbusaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kquitapp5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix
new file mode 100644
index 00000000000..b62a13f8fa9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix
@@ -0,0 +1,30 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, epoxy
+, kconfig
+, kglobalaccel
+, kguiaddons
+, ki18n
+, kiconthemes
+, kio
+, kpackage
+, kwidgetsaddons
+, kwindowsystem
+, pkgconfig
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kdeclarative";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem
+  ];
+  propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kpackagelauncherqml"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix
new file mode 100644
index 00000000000..47ae2d68c68
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdoctools
+, kinit
+, kservice
+}:
+
+kdeFramework {
+  name = "kded";
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix
new file mode 100644
index 00000000000..f54fa3e9be6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix
@@ -0,0 +1,58 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, docbook_xml_dtd_45
+, kauth
+, karchive
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdesignerplugin
+, kdoctools
+, kemoticons
+, kglobalaccel
+, kguiaddons
+, ki18n
+, kiconthemes
+, kio
+, kitemmodels
+, kinit
+, knotifications
+, kparts
+, kservice
+, ktextwidgets
+, kunitconversion
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, networkmanager
+, qtsvg
+, qtx11extras
+, xlibs
+}:
+
+# TODO: debug docbook detection
+
+kdeFramework {
+  name = "kdelibs4support";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
+  propagatedBuildInputs = [
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
+    kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels
+    kinit knotifications kparts ktextwidgets kunitconversion
+    kwindowsystem
+  ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXML4_DTD_VERSION=4.5"
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix
new file mode 100644
index 00000000000..100d16d64bc
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix
@@ -0,0 +1,30 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdewebkit
+, kdoctools
+, kiconthemes
+, kio
+, kitemviews
+, kplotting
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+, sonnet
+}:
+
+kdeFramework {
+  name = "kdesignerplugin";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
+    kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons
+    kxmlgui sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix
new file mode 100644
index 00000000000..4503d8bcd10
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, ki18n
+, kpty
+, kservice
+}:
+
+kdeFramework {
+  name = "kdesu";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons ki18n kservice ];
+  propagatedBuildInputs = [ kpty ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix
new file mode 100644
index 00000000000..52ae0162b86
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, ki18n
+, kio
+, kjobwidgets
+, kparts
+, kservice
+, kwallet
+, qtwebkit
+}:
+
+kdeFramework {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ];
+  propagatedBuildInputs = [ qtwebkit ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix
new file mode 100644
index 00000000000..f00432b0c9c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, avahi
+}:
+
+kdeFramework {
+  name = "kdnssd";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix
new file mode 100644
index 00000000000..0ec13d1a15c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix
@@ -0,0 +1,24 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, docbook_xml_dtd_45
+, docbook5_xsl
+, karchive
+, ki18n
+, perl
+, perlPackages
+}:
+
+kdeFramework {
+  name = "kdoctools";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive ki18n ];
+  propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+  ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 00000000000..4e3a33efab3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+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.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix
new file mode 100644
index 00000000000..d165f84e3a2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kservice
+}:
+
+kdeFramework {
+  name = "kemoticons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive kconfig kcoreaddons ];
+  propagatedBuildInputs = [ kservice ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix
new file mode 100644
index 00000000000..53c509417f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, attr
+, ebook_tools
+, exiv2
+, ffmpeg
+, karchive
+, ki18n
+, popplerQt
+, qtbase
+, taglib
+}:
+
+kdeFramework {
+  name = "kfilemetadata";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ];
+  propagatedBuildInputs = [ qtbase ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix
new file mode 100644
index 00000000000..f7c5ea56266
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kwindowsystem
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kglobalaccel";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kglobalaccel5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix
new file mode 100644
index 00000000000..bc4e9ab1184
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kguiaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix
new file mode 100644
index 00000000000..45dd45089c4
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix
@@ -0,0 +1,35 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, giflib
+, karchive
+, kcodecs
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kio
+, kjs
+, knotifications
+, kparts
+, ktextwidgets
+, kwallet
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, perl
+, phonon
+, qtx11extras
+, sonnet
+}:
+
+kdeFramework {
+  name = "khtml";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    giflib karchive kglobalaccel kiconthemes knotifications kwallet
+    kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet
+  ];
+  propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix
new file mode 100644
index 00000000000..915e3294b46
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, gettext
+, python
+, qtscript
+}:
+
+kdeFramework {
+  name = "ki18n";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtscript ];
+  propagatedNativeBuildInputs = [ gettext python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix
new file mode 100644
index 00000000000..862c17f104f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfigwidgets
+, ki18n
+, kitemviews
+, qtsvg
+}:
+
+kdeFramework {
+  name = "kiconthemes";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix
new file mode 100644
index 00000000000..fc086560023
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtbase
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kidletime";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix
new file mode 100644
index 00000000000..49d66bbcc2c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ilmbase
+}:
+
+kdeFramework {
+  name = "kimageformats";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch
new file mode 100644
index 00000000000..9c76079a382
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch
@@ -0,0 +1,42 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 9e775b6..0ac5646 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -660,15 +660,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/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/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()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix
new file mode 100644
index 00000000000..47f1aec72de
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix
@@ -0,0 +1,24 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcrash
+, kdoctools
+, ki18n
+, kio
+, kservice
+, kwindowsystem
+, libcap
+, libcap_progs
+}:
+
+# TODO: setuid wrapper
+
+kdeFramework {
+  name = "kinit";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+  buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ];
+  patches = [ ./0001-kinit-libpath.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix
new file mode 100644
index 00000000000..6605de03e38
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix
@@ -0,0 +1,48 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, acl
+, karchive
+, kbookmarks
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdoctools
+, ki18n
+, kiconthemes
+, kitemviews
+, kjobwidgets
+, knotifications
+, kservice
+, ktextwidgets
+, kwallet
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, qtscript
+, qtx11extras
+, solid
+}:
+
+kdeFramework {
+  name = "kio";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes
+    knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem
+    qtscript qtx11extras
+  ];
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid
+  ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kcookiejar5"
+    wrapKDEProgram "$out/bin/ktelnetservice5"
+    wrapKDEProgram "$out/bin/ktrash5"
+    wrapKDEProgram "$out/bin/kmailservice5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix
new file mode 100644
index 00000000000..a9024d771cc
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemmodels";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix
new file mode 100644
index 00000000000..931019ce495
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemviews";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix
new file mode 100644
index 00000000000..c3f1d37f858
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwidgetsaddons
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kjobwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix
new file mode 100644
index 00000000000..902674d49b7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kdoctools
+}:
+
+kdeFramework {
+  name = "kjs";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kjs5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix
new file mode 100644
index 00000000000..bbc5169a1cc
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kdoctools
+, ki18n
+, kjs
+, qtsvg
+}:
+
+kdeFramework {
+  name = "kjsembed";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ ki18n kjs ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kjscmd5"
+    wrapKDEProgram "$out/bin/kjsconsole"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix
new file mode 100644
index 00000000000..460458b2232
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kparts
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kmediaplayer";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kxmlgui ];
+  propagatedBuildInputs = [ kparts ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix
new file mode 100644
index 00000000000..d0b884f8f68
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix
@@ -0,0 +1,29 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, attica
+, karchive
+, kcompletion
+, kconfig
+, kcoreaddons
+, ki18n
+, kiconthemes
+, kio
+, kitemviews
+, kservice
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "knewstuff";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    kitemviews ktextwidgets kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ attica kservice kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix
new file mode 100644
index 00000000000..f3aa29f018c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kcoreaddons
+, kwindowsystem
+, phonon
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "knotifications";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs kconfig kcoreaddons kwindowsystem
+    phonon qtx11extras
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix
new file mode 100644
index 00000000000..f6509a166d4
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, ki18n
+, kio
+, phonon
+}:
+
+kdeFramework {
+  name = "knotifyconfig";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 00000000000..440e979c008
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+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.13/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix
new file mode 100644
index 00000000000..f7c3689503b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kdoctools
+, ki18n
+}:
+
+kdeFramework {
+  name = "kpackage";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ karchive kconfig ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  patches = [ ./0001-allow-external-paths.patch ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kpackagetool5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix
new file mode 100644
index 00000000000..96c1b984ab7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix
@@ -0,0 +1,27 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, ki18n
+, kiconthemes
+, kio
+, kjobwidgets
+, knotifications
+, kservice
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kparts";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications
+    kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix
new file mode 100644
index 00000000000..ffc028d97c3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix
@@ -0,0 +1,20 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, ki18n
+, kitemviews
+, kservice
+, kwidgetsaddons
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kpeople";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix
new file mode 100644
index 00000000000..c16f51b5ac3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kplotting";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix
new file mode 100644
index 00000000000..72ac842a00a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, ki18n
+}:
+
+kdeFramework {
+  name = "kpty";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix
new file mode 100644
index 00000000000..ca14e9827e2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcompletion
+, kcoreaddons
+, kdoctools
+, ki18n
+, kiconthemes
+, kio
+, kparts
+, kwidgetsaddons
+, kxmlgui
+, qtscript
+}:
+
+kdeFramework {
+  name = "kross";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix
new file mode 100644
index 00000000000..618494ef5c5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix
@@ -0,0 +1,24 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, ki18n
+, kio
+, kservice
+, plasma-framework
+, qtquick1
+, solid
+, threadweaver
+}:
+
+kdeFramework {
+  name = "krunner";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver
+  ];
+  propagatedBuildInputs = [ plasma-framework ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix
new file mode 100644
index 00000000000..b46797f5e0e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdoctools
+, ki18n
+, kwindowsystem
+}:
+
+kdeFramework {
+  name = "kservice";
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  propagatedBuildInputs = [ kconfig ];
+  patches = [
+    ./kservice-kbuildsycoca-follow-symlinks.patch
+    ./kservice-kbuildsycoca-no-canonicalize-path.patch
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 00000000000..e9bc418544a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+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.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 00000000000..7e21ebfe86f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+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.13/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh
new file mode 100644
index 00000000000..007876a0b30
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh
@@ -0,0 +1,13 @@
+export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca"
+
+KSERVICE_BUILD_KDESYCOCA=
+
+buildKdeSycoca() {
+    if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then
+        echo "building kdesycoca database in $KDESYCOCA"
+        mkdir -p "$(dirname $KDESYCOCA)"
+        kbuildsycoca5 --nosignal
+    fi
+}
+
+preFixupPhases+=" buildKdeSycoca"
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch
new file mode 100644
index 00000000000..c2e77a537c5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch
@@ -0,0 +1,48 @@
+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.13/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix
new file mode 100644
index 00000000000..8c02e602c5d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix
@@ -0,0 +1,27 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kguiaddons
+, ki18n
+, kio
+, kiconthemes
+, kparts
+, perl
+, qtscript
+, qtxmlpatterns
+, sonnet
+}:
+
+kdeFramework {
+  name = "ktexteditor";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio kparts
+    qtscript qtxmlpatterns sonnet
+  ];
+  patches = [ ./0001-no-qcoreapplication.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix
new file mode 100644
index 00000000000..e27839162ef
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, kconfigwidgets
+, ki18n
+, kiconthemes
+, kservice
+, kwindowsystem
+, sonnet
+}:
+
+kdeFramework {
+  name = "ktextwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
+  ];
+  propagatedBuildInputs = [ ki18n sonnet ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix
new file mode 100644
index 00000000000..6c6a4caeb98
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ki18n
+}:
+
+kdeFramework {
+  name = "kunitconversion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix
new file mode 100644
index 00000000000..267ddf8303d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix
@@ -0,0 +1,30 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kdoctools
+, ki18n
+, kiconthemes
+, knotifications
+, kservice
+, kwidgetsaddons
+, kwindowsystem
+, libgcrypt
+}:
+
+kdeFramework {
+  name = "kwallet";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications
+    kservice kwidgetsaddons kwindowsystem libgcrypt
+  ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/kwalletd5"
+    wrapKDEProgram "$out/bin/kwallet-query"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix
new file mode 100644
index 00000000000..d95f44d3fec
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kwidgetsaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix
new file mode 100644
index 00000000000..09ab1f2200d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kwindowsystem";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix
new file mode 100644
index 00000000000..6e1398d2f84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, attica
+, kconfig
+, kconfigwidgets
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kitemviews
+, ktextwidgets
+, kwindowsystem
+, sonnet
+}:
+
+kdeFramework {
+  name = "kxmlgui";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes
+    kitemviews ktextwidgets kwindowsystem sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix
new file mode 100644
index 00000000000..b28c00a33be
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ki18n
+, kio
+}:
+
+kdeFramework {
+  name = "kxmlrpcclient";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix
new file mode 100644
index 00000000000..7d7f769d6a9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, modemmanager
+}:
+
+kdeFramework {
+  name = "modemmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ modemmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix
new file mode 100644
index 00000000000..333378bd143
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, networkmanager
+}:
+
+kdeFramework {
+  name = "networkmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ networkmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix
new file mode 100644
index 00000000000..d838996f99c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix
@@ -0,0 +1,40 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kactivities
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeclarative
+, kdoctools
+, kglobalaccel
+, kguiaddons
+, ki18n
+, kiconthemes
+, kio
+, knotifications
+, kpackage
+, kservice
+, kwindowsystem
+, kxmlgui
+, qtscript
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "plasma-framework";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kactivities karchive kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes
+    kio knotifications kwindowsystem kxmlgui qtscript qtx11extras
+  ];
+  propagatedBuildInputs = [ kpackage kservice ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/plasmapkg2"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix
new file mode 100644
index 00000000000..06b0797cbc1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "solid";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  postInstall = ''
+    wrapKDEProgram "$out/bin/solid-hardware5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix
new file mode 100644
index 00000000000..943fe04a1c9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, hunspell
+}:
+
+kdeFramework {
+  name = "sonnet";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix
new file mode 100644
index 00000000000..9cfb9c2006a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix
@@ -0,0 +1,549 @@
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+  kiconthemes = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kiconthemes-5.13.0.tar.xz";
+      sha256 = "1zsqmq1vzpiflnhr4ydwyg84cfima2hh0m61pgsxki98a8cfjz78";
+      name = "kiconthemes-5.13.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kitemmodels-5.13.0.tar.xz";
+      sha256 = "1bcnssm0sp4xs2wm9x65705671y97bhgjlbqvngdw95qr8mjalda";
+      name = "kitemmodels-5.13.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kactivities-5.13.0.tar.xz";
+      sha256 = "0k1f3iliwws30f9d3gfrx3cxqcmr3v9w0p4nxnk35qa7bflkw2jp";
+      name = "kactivities-5.13.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/threadweaver-5.13.0.tar.xz";
+      sha256 = "06hvraianc559plk50rfg4a7rwykq7s9ak343xylm37mg3sx3myn";
+      name = "threadweaver-5.13.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz";
+      sha256 = "0ccylfkph8kxni2kfbdk7zzvywsn447kkvfx5xm63l19acff74c8";
+      name = "bluez-qt-5.13.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/plasma-framework-5.13.0.tar.xz";
+      sha256 = "0fk3a7xzhi761kl2xwxhxv2kp4cblqzn7ylk6q60x2cr3vd3jxgb";
+      name = "plasma-framework-5.13.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kguiaddons-5.13.0.tar.xz";
+      sha256 = "0p33i1hwzcbczxdw8mnkknb35v7n8m6x9jr9gysvzhg76l2z6ca7";
+      name = "kguiaddons-5.13.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/ktexteditor-5.13.0.tar.xz";
+      sha256 = "1paiqpi73pvhqjcgk9l7agqk4s9pw9fghh1ipfw6clklrkpwjy2f";
+      name = "ktexteditor-5.13.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kinit-5.13.0.tar.xz";
+      sha256 = "06jcznxw346g6cr08ykgl2bc8wfann5s4rs0py6ah1al5py87jbq";
+      name = "kinit-5.13.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kxmlgui-5.13.0.tar.xz";
+      sha256 = "06i873lsy0k67jdipzakc5gxmya82s8mkprkzb7pvac2ird2y66q";
+      name = "kxmlgui-5.13.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdbusaddons-5.13.0.tar.xz";
+      sha256 = "1w118l5qc0kn5fmv5dqaxidxjsgzzq4ak9pk6vgafrdf7f79dy82";
+      name = "kdbusaddons-5.13.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kunitconversion-5.13.0.tar.xz";
+      sha256 = "1cff7ighx6r64vv5wc88gnnq4k0c6c18k92nlj56b61g94sjx5xp";
+      name = "kunitconversion-5.13.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kemoticons-5.13.0.tar.xz";
+      sha256 = "0cxi6gldp9qpi47g0chg6bhr17w43bv36pf2gg2dsy5mymnw1iaj";
+      name = "kemoticons-5.13.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kcompletion-5.13.0.tar.xz";
+      sha256 = "0j47bwi7sw2khyi3qp0b77npgf40wfax1j9zic68xg1yjf4y52b4";
+      name = "kcompletion-5.13.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kpackage-5.13.0.tar.xz";
+      sha256 = "0ybdzx33gcpb4j18vnv99hbycrlwxzhwblz07m1a0q1k2x004hla";
+      name = "kpackage-5.13.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kpty-5.13.0.tar.xz";
+      sha256 = "0c37zv1lrdma4659chmh27naxflhjz614h385im0m717hx67v5v0";
+      name = "kpty-5.13.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kservice-5.13.0.tar.xz";
+      sha256 = "1a7pz9m948xfiqphm29k7wnc24qv5xm8zb7f61mfbmzic18p4076";
+      name = "kservice-5.13.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kwidgetsaddons-5.13.0.tar.xz";
+      sha256 = "19s31brrqhb1vncc4rkik42l4si28ky3d5ysvnyx7mw2jip4929i";
+      name = "kwidgetsaddons-5.13.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kimageformats-5.13.0.tar.xz";
+      sha256 = "0lqraljikwkp88wnb1zxmylk7gn7rsp9301jn2qff3i0aa8m56ly";
+      name = "kimageformats-5.13.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kwindowsystem-5.13.0.tar.xz";
+      sha256 = "18ihvj1s4apsb647gbp8ghl083f3idpld693vwi138fsk89nhn67";
+      name = "kwindowsystem-5.13.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kxmlrpcclient-5.13.0.tar.xz";
+      sha256 = "18gdfb2yqzyid6zhx98xwd3vk2bnvxgpsk0dmy0098b9jl5gi39h";
+      name = "kxmlrpcclient-5.13.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kconfig-5.13.0.tar.xz";
+      sha256 = "0qhymvqccl568ib975fx2jpm91ydsixx8lmf2803m89nad3bi77p";
+      name = "kconfig-5.13.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdeclarative-5.13.0.tar.xz";
+      sha256 = "1c65ls02pqg1apmxvw3xhi8d7i4pwvx777jp755zbz6f0k2q5h14";
+      name = "kdeclarative-5.13.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kapidox-5.13.0.tar.xz";
+      sha256 = "0gg72qli7yix0v6riywbw0iw3y28jzk84p161lh7izql8kb463zj";
+      name = "kapidox-5.13.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/knotifyconfig-5.13.0.tar.xz";
+      sha256 = "19my0x60vhhngdzb5nr0cdi5yby4113pzqzg39wslbb1n5mcfqky";
+      name = "knotifyconfig-5.13.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kcodecs-5.13.0.tar.xz";
+      sha256 = "0b1jaxkkqmi7r013vpyhhqaqbg6hwc4nb0bm23nr1az9qasdvxzm";
+      name = "kcodecs-5.13.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdnssd-5.13.0.tar.xz";
+      sha256 = "1jaa8lwqq4y1rl381j85qzxxyqw2if95rs8q5lsm14xq9jgwrf6r";
+      name = "kdnssd-5.13.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/ktextwidgets-5.13.0.tar.xz";
+      sha256 = "1p38j96z19fy1pdc249myl5mm0nbs7nrrhkmgfjig24lamivy98h";
+      name = "ktextwidgets-5.13.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kauth-5.13.0.tar.xz";
+      sha256 = "1j1kx9dypirpw41i8cx8dylwqaqm8rdbkxb0xmvyi7x8pax7rmkk";
+      name = "kauth-5.13.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kplotting-5.13.0.tar.xz";
+      sha256 = "0f4vafy4b473407lm2kazllxzdiq1blvmypab7jlk0bj206vmdhq";
+      name = "kplotting-5.13.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/ki18n-5.13.0.tar.xz";
+      sha256 = "1izriaip8r7cgm36mid6fxsvg661311lm6aalqaxq9xa70lkq3xm";
+      name = "ki18n-5.13.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/knotifications-5.13.0.tar.xz";
+      sha256 = "04n50hkg6h3j49l1bi0igr79vgb8xfw74mbaw5s20nw55y2xyziv";
+      name = "knotifications-5.13.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kitemviews-5.13.0.tar.xz";
+      sha256 = "0iazr2fyhksa3wsfrqaknxs74h66fb6drg9vcg18dml9mv0v9jgw";
+      name = "kitemviews-5.13.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kcoreaddons-5.13.0.tar.xz";
+      sha256 = "0qc9lmc90bhrzaaf611vn7x5z549yvl1dk2ba726qaxb8hf5fhmx";
+      name = "kcoreaddons-5.13.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kwallet-5.13.0.tar.xz";
+      sha256 = "0p7as0ma40dssd171mpi68sdih5fr03lcwvhy3zazhhpf5gjfwv8";
+      name = "kwallet-5.13.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/modemmanager-qt-5.13.0.tar.xz";
+      sha256 = "17a4d7pp2qj7zvxfd8qicj332n25nj6d8xs585fkqlwsk5qvv5mh";
+      name = "modemmanager-qt-5.13.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kio-5.13.0.tar.xz";
+      sha256 = "1m6vids0ahdvqw1wgiss11cb6z2x81acig8x38jgjna8al6dw7y3";
+      name = "kio-5.13.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/baloo-5.13.0.tar.xz";
+      sha256 = "159gkr4xsyj7sb6dqvjlldyl8hdm0sgzhbczb24q182dnwqrmmbq";
+      name = "baloo-5.13.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/karchive-5.13.0.tar.xz";
+      sha256 = "0qg90h4iiyb3frnqs01r440pan1m0mn6y0b4025ync1g50iyf1jz";
+      name = "karchive-5.13.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdoctools-5.13.0.tar.xz";
+      sha256 = "0604rmrg6b8h4pw14kwal04s21f9gkrf495csj3jsm7042z5p6rf";
+      name = "kdoctools-5.13.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kparts-5.13.0.tar.xz";
+      sha256 = "1mqklszbhlk8pdwig88yqa5jpjbdzkz9q618c4029aqiazzjqs39";
+      name = "kparts-5.13.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdewebkit-5.13.0.tar.xz";
+      sha256 = "1n8x0biy5s73qihx9niivhmfdfglnai360k4llpjq9vhd8fassjx";
+      name = "kdewebkit-5.13.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kidletime-5.13.0.tar.xz";
+      sha256 = "1d6p4ld8wday3sb3gdvivigw7vk33akawf531ghc8rhmi7mr2db2";
+      name = "kidletime-5.13.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/extra-cmake-modules-5.13.0.tar.xz";
+      sha256 = "1hnmsghfnl99ihgnp90pbh3ngh4l6n6d5g7ial6bfzrlfn588lms";
+      name = "extra-cmake-modules-5.13.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/frameworkintegration-5.13.0.tar.xz";
+      sha256 = "03pzic63vi1bmcf4vlk2kfcs6fbc9p0plzydizqmm34iiv8k48jb";
+      name = "frameworkintegration-5.13.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/kjs-5.13.0.tar.xz";
+      sha256 = "1ij3f303k1higj5l7l3pxl6qlp8arf3qizbar2d36f3qczyql5r8";
+      name = "kjs-5.13.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/krunner-5.13.0.tar.xz";
+      sha256 = "1yj97lp6ny9m45nankgkq7zdw929mw218pq7yalr21vqqxwvd84a";
+      name = "krunner-5.13.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/khtml-5.13.0.tar.xz";
+      sha256 = "0mykidqkhs0hd6s4i8li25gk8dzysw6imc2lfjbwvyyvx6lyd55m";
+      name = "khtml-5.13.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/kmediaplayer-5.13.0.tar.xz";
+      sha256 = "19kazkjsc2s1wfcslmi46ic1h7jvwdbbc6y9713jb1yymp6jzz30";
+      name = "kmediaplayer-5.13.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/kross-5.13.0.tar.xz";
+      sha256 = "18237mj3bzwj4vdxjxqn1b865syi3z3f1zlrnfslijssgw6qs41m";
+      name = "kross-5.13.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/kjsembed-5.13.0.tar.xz";
+      sha256 = "0inlb47rkfriwnbkkhgb20kc86b38yl9xxwn8cjx80m61sj8ici8";
+      name = "kjsembed-5.13.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/portingAids/kdelibs4support-5.13.0.tar.xz";
+      sha256 = "1hlniaw259yz6vs42w0q7mjycq1vf8ggvsigc09ij8bj7k7ih3s3";
+      name = "kdelibs4support-5.13.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kcrash-5.13.0.tar.xz";
+      sha256 = "07cb6jmf1w74ndcfj4mcpc60xkpnl69jzdd5ljxsi2k1awvjs58n";
+      name = "kcrash-5.13.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kcmutils-5.13.0.tar.xz";
+      sha256 = "13jc3053jf3lg2zrrqi4mcsnma6xd6p56ilaw86bgvdsq1fkr84b";
+      name = "kcmutils-5.13.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/knewstuff-5.13.0.tar.xz";
+      sha256 = "12pyxdb9rq60hcw7k8sh79mq6l5h5zdrixn778yps27ckf69icsr";
+      name = "knewstuff-5.13.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kded-5.13.0.tar.xz";
+      sha256 = "0yfpx2dc2x7jzyxmj0k92ar2rvzabz75dwh09rr93wyzyjr1l7i9";
+      name = "kded-5.13.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kconfigwidgets-5.13.0.tar.xz";
+      sha256 = "1m5n24c34sdr9hfap2riws0n58pka0a0n23gxdzxwbk9z1fj97zy";
+      name = "kconfigwidgets-5.13.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/solid-5.13.0.tar.xz";
+      sha256 = "1s06qbicni2g99kmp7kd06xrps0pqb9d9q04pmmlqdg24fcm0aik";
+      name = "solid-5.13.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kjobwidgets-5.13.0.tar.xz";
+      sha256 = "0vjqidawgca5zr5vfm55lqnvzr9pk0dp1w85pdpp576rsjg34404";
+      name = "kjobwidgets-5.13.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdesignerplugin-5.13.0.tar.xz";
+      sha256 = "0iibam8d34kyvq0qpbfx1ligwcyp84x4ycr01bydnbc58qz6hg3y";
+      name = "kdesignerplugin-5.13.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kglobalaccel-5.13.0.tar.xz";
+      sha256 = "1fdfcyb93p39gbkvmzv43hg33vjsr9g2y9vbr07j38q9vgjipynl";
+      name = "kglobalaccel-5.13.0.tar.xz";
+    };
+  };
+  attica = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/attica-5.13.0.tar.xz";
+      sha256 = "0fxqf8ab8y7lkj0c09zrshwykx2na5yqb3wxlfd8ngd6cyk34r8h";
+      name = "attica-5.13.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kdesu-5.13.0.tar.xz";
+      sha256 = "0413lddgrwhx3jn2xhmi6gllv4cg2136f00bg0zxdnvgjbavj50g";
+      name = "kdesu-5.13.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/sonnet-5.13.0.tar.xz";
+      sha256 = "05j79i2aq6cy2crjwsifsfj5kb74ca0bz9yl1302gkdn6qy3lx57";
+      name = "sonnet-5.13.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kfilemetadata-5.13.0.tar.xz";
+      sha256 = "0c7m1ha1s020jbb5925s859lknq10df1162aal8g99nxvadvkafx";
+      name = "kfilemetadata-5.13.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/networkmanager-qt-5.13.0.tar.xz";
+      sha256 = "16v2vr92yfins23h2h6ddlvlf2iasbz67dr8gzyhwa9kcwr23a19";
+      name = "networkmanager-qt-5.13.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kbookmarks-5.13.0.tar.xz";
+      sha256 = "0gmsvhphilv7aqci51hlvaikgpxhbgi6f41qb1ybkjjh6gfcz6lg";
+      name = "kbookmarks-5.13.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.13.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.13/kpeople-5.13.0.tar.xz";
+      sha256 = "1fw9jgkqv1hx5llpkws0v0pcfjjbh7z9b7z474y7ix2ycg9ikxqn";
+      name = "kpeople-5.13.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix
new file mode 100644
index 00000000000..52817921cc7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "threadweaver";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
deleted file mode 100644
index 397eec61a78..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/default.nix
+++ /dev/null
@@ -1,210 +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;
-        inherit epoxy;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        ModemManager = modemmanager;
-        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 // {
-        propagatedNativeBuildInputs = [ perl perlPackages.URI ];
-        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 ];
-      };
-
-      networkmanager-qt = super.networkmanager-qt // {
-        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
-      };
-
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
-  };
-
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
deleted file mode 100644
index 71dbc50a806..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix
+++ /dev/null
@@ -1,524 +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" "KF5Codecs" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WidgetsAddons" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Package" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5Service" ];
-    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 = [ "Qt5Widgets" ];
-    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" "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 = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ActiveApp" "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Package" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5Package" "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" "KF5DBusAddons" "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" "KF5Archive" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "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" "KF5I18n" "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 = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "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 = [ "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" "Qt5QUIET" "Qt5QuickWidgets" "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" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "KF5DocTools" "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 = [ "KF5Attica" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    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" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpeople = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" "UTEMPTER" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    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" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "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 = [ "KF5I18n" "KF5Sonnet" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "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 = [ "Qt5Gui" ];
-    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 = [ "KF5Config" "KF5ConfigWidgets" "Qt5DBus" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlrpcclient = {
-    buildInputs = [ "ECM" "KF5I18n" "KF5KIO" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  modemmanager-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    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" "KF5Service" ];
-    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.9/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
deleted file mode 100644
index c61618b6e45..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix
+++ /dev/null
@@ -1,589 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz";
-      sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh";
-      name = "kemoticons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz";
-      sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4";
-      name = "kpeople-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz";
-      sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr";
-      name = "kconfigwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz";
-      sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc";
-      name = "ki18n-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz";
-      sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy";
-      name = "kplotting-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz";
-      sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9";
-      name = "kservice-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz";
-      sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06";
-      name = "kbookmarks-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz";
-      sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp";
-      name = "kded-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz";
-      sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0";
-      name = "knewstuff-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz";
-      sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7";
-      name = "knotifyconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz";
-      sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq";
-      name = "threadweaver-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz";
-      sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m";
-      name = "kcmutils-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz";
-      sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z";
-      name = "kwindowsystem-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz";
-      sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9";
-      name = "extra-cmake-modules-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz";
-      sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld";
-      name = "kwallet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz";
-      sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10";
-      name = "kguiaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz";
-      sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x";
-      name = "plasma-framework-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz";
-      sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib";
-      name = "kcodecs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz";
-      sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv";
-      name = "kxmlgui-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz";
-      sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr";
-      name = "ktextwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz";
-      sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav";
-      name = "kinit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz";
-      sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh";
-      name = "kdbusaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz";
-      sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9";
-      name = "frameworkintegration-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz";
-      sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n";
-      name = "kjobwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz";
-      sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4";
-      name = "networkmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz";
-      sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli";
-      name = "kpty-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz";
-      sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k";
-      name = "kcompletion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz";
-      sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4";
-      name = "kio-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz";
-      sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l";
-      name = "kparts-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz";
-      sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm";
-      name = "kiconthemes-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz";
-      sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx";
-      name = "kglobalaccel-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz";
-      sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm";
-      name = "kapidox-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz";
-      sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz";
-      name = "kauth-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz";
-      sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf";
-      name = "kpackage-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz";
-      sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa";
-      name = "knotifications-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz";
-      sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r";
-      name = "kdesu-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz";
-      sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7";
-      name = "kcrash-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz";
-      sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2";
-      name = "kdnssd-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz";
-      sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif";
-      name = "kunitconversion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz";
-      sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5";
-      name = "kidletime-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz";
-      sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix";
-      name = "kjsembed-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz";
-      sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d";
-      name = "kdelibs4support-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz";
-      sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl";
-      name = "krunner-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz";
-      sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj";
-      name = "kross-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz";
-      sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv";
-      name = "khtml-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz";
-      sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl";
-      name = "kjs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz";
-      sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z";
-      name = "kmediaplayer-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz";
-      sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365";
-      name = "kitemmodels-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz";
-      sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3";
-      name = "modemmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz";
-      sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk";
-      name = "kdoctools-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz";
-      sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi";
-      name = "kcoreaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz";
-      sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy";
-      name = "kdewebkit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz";
-      sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg";
-      name = "kimageformats-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz";
-      sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z";
-      name = "karchive-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz";
-      sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4";
-      name = "kdeclarative-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz";
-      sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s";
-      name = "kitemviews-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz";
-      sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28";
-      name = "sonnet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz";
-      sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik";
-      name = "kdesignerplugin-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz";
-      sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1";
-      name = "kconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz";
-      sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam";
-      name = "kactivities-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz";
-      sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn";
-      name = "solid-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz";
-      sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg";
-      name = "kxmlrpcclient-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz";
-      sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b";
-      name = "ktexteditor-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz";
-      sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj";
-      name = "attica-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz";
-      sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1";
-      name = "kwidgetsaddons-5.9.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh
deleted file mode 100755
index 0075819664a..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/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.9/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/renames.nix b/pkgs/development/libraries/kde-frameworks-5.9/renames.nix
deleted file mode 100644
index 7dcf3bf81d7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.9/renames.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5ActivitiesExperimentalStats" = "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";
-"KF5ModemManagerQt" = "modemmanager-qt";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5People" = "kpeople";
-"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";
-"KF5XmlRpcClient" = "kxmlrpcclient";
-}
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 8b7d73462c2..8398f2d7db4 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
+{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon,
   gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
 
 stdenv.mkDerivation rec {
@@ -9,14 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac";
   };
 
+  patches = [(fetchpatch {
+    name = "svn-1.9.patch";
+    url = "https://git.reviewboard.kde.org/r/124783/diff/raw/";
+    sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0";
+  })];
+
   propagatedBuildInputs = [ kdelibs qt4 phonon ];
   buildInputs = [ apr aprutil subversion boost qjson grantlee ];
 
   nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ];
 
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.ambrop72 ];
+    platforms = platforms.linux;
     description = "KDE libraries for IDE-like programs";
     longDescription = ''
       A free, opensource set of libraries that can be used as a foundation for
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index aeea290bdb2..0569c0bf5b3 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,51 +1,87 @@
-{ stdenv, fetchurl, pkgconfig, flex, yacc, readline, openldap, libcap_ng
-, sqlite, db, ncurses, openssl, cyrus_sasl
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
+, texinfo, perlPackages
+, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
+
+# Extra Args
+, type ? ""
 }:
 
+let
+  libOnly = type == "lib";
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "heimdal-1.5.3";
-
-  src = fetchurl {
-    urls = [
-      "http://www.h5l.org/dist/src/${name}.tar.gz"
-      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
-    ];
-    sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
+  name = "${type}heimdal-2015-09-13";
+
+  src = fetchFromGitHub {
+    owner = "heimdal";
+    repo = "heimdal";
+    rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b";
+    sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
+    ++ (with perlPackages; [ JSON ])
+    ++ optional (!libOnly) texinfo;
+  buildInputs = [ libcap_ng sqlite openssl db libedit ]
+    ++ optionals (!libOnly) [ openldap pam ];
+
   ## ugly, X should be made an option
   configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--enable-hdb-openldap-module"
     "--with-capng"
-    "--with-openldap=${openldap}"
     "--with-sqlite3=${sqlite}"
-    "--with-openssl-lib=${openssl}/lib"
+    "--with-berkeley-db=${db}"
+    "--with-libedit=${libedit}"
+    "--with-openssl=${openssl}"
     "--without-x"
+  ] ++ optionals (!libOnly) [
+    "--with-openldap=${openldap}"
   ];
 
+  buildPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd tools; make -j $NIX_BUILD_CORES)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
+  '';
+
+  installPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd tools; make -j $NIX_BUILD_CORES install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
+    rm -rf $out/{libexec,sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+  '';
+
   # We need to build hcrypt for applications like samba
   postBuild = ''
-    (cd lib/hcrypto; make)
-    (cd include/hcrypto; make)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
   postInstall = ''
     # Install hcrypto
-    (cd lib/hcrypto; make install)
-    (cd include/hcrypto; make install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
 
-    # dont succeed with --libexec=$out/sbin, so
+    # Doesn't succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
-  buildInputs = [
-    pkgconfig flex yacc readline openldap libcap_ng sqlite db ncurses
-    cyrus_sasl openssl
-  ];
+  # Issues with hydra
+  #  In file included from hxtool.c:34:0:
+  #  hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory
+  #enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
-    description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
+  meta = {
+    description = "An implementation of Kerberos 5 (and some more stuff)";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 41c570ee554..2e5e48891b8 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,41 +1,61 @@
-{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
+{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
+, openssl, openldap, libedit
+
+# Extra Arguments
+, type ? ""
+}:
 
 let
-  pname = "krb5";
-  version = "1.13.1";
-  name = "${pname}-${version}";
-  webpage = http://web.mit.edu/kerberos/;
+  libOnly = type == "lib";
 in
-
-stdenv.mkDerivation (rec {
-  inherit name;
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "${type}krb5-${version}";
+  version = "1.13.2";
 
   src = fetchurl {
-    url = "${webpage}dist/krb5/1.13/${name}-signed.tar";
-    sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
+    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
+    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
   };
 
-  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
+  nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
+    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+  buildInputs = [ openssl ]
+    ++ optionals (!libOnly) [ openldap libedit ];
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf ${name}.tar.gz
-    cd ${name}/src
+    tar -xzf krb5-${version}.tar.gz
+    cd krb5-${version}/src
   '';
 
-  configureFlags = [ "--with-tcl=no" ];
+  buildPhase = optionalString libOnly ''
+    (cd util; make -j $NIX_BUILD_CORES)
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd build-tools; make -j $NIX_BUILD_CORES)
+  '';
+
+  installPhase = optionalString libOnly ''
+    mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
+    (cd util; make -j $NIX_BUILD_CORES install)
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd build-tools; make -j $NIX_BUILD_CORES install)
+    rm -rf $out/{sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+  '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "MIT Kerberos 5";
-    homepage = webpage;
-    license = "MPL";
+    homepage = http://web.mit.edu/kerberos/;
+    license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 
   passthru.implementation = "krb5";
-})
+}
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 6c4575b4e9d..6617816b642 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -8,6 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
   };
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace kccommon.h \
+      --replace tr1/unordered_map unordered_map \
+      --replace tr1/unordered_set unordered_set \
+      --replace tr1::hash std::hash \
+      --replace tr1::unordered_map std::unordered_map \
+      --replace tr1::unordered_set std::unordered_set
+
+    substituteInPlace lab/kcdict/Makefile --replace stdc++ c++
+    substituteInPlace configure --replace stdc++ c++
+  '';
+
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index abf05f4c138..f4ea47e633f 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
   };
 
+  patches = [ ./gcc-4.9.patch ];
+
   nativeBuildInputs = [ ]
     ++ optional nasmSupport nasm;
 
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "LAME is a high quality MPEG Audio Layer III (MP3) encoder";
+    description = "A high quality MPEG Audio Layer III (MP3) encoder";
     homepage    = http://lame.sourceforge.net;
     license     = licenses.lgpl2;
     maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch
new file mode 100644
index 00000000000..59f8e00e4a8
--- /dev/null
+++ b/pkgs/development/libraries/lame/gcc-4.9.patch
@@ -0,0 +1,33 @@
+fix sse optimizations build on 32-bit with gcc 4.9
+http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933
+
+xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
+xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
+psabi]
+     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+                  ^
+In file included from xmm_quantize_sub.c:37:0:
+/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
+ _mm_loadu_ps (float const *__P)
+ ^
+xmm_quantize_sub.c:65:18: error: called from here
+     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+                  ^
+--- lame/libmp3lame/vector/xmm_quantize_sub.c.orig	2014-06-08 12:16:19.455468042 -0700
++++ lame/libmp3lame/vector/xmm_quantize_sub.c	2014-06-08 12:16:09.592356980 -0700
+@@ -35,6 +35,7 @@
+ #ifdef HAVE_XMMINTRIN_H
+ 
+ #include <xmmintrin.h>
++#pragma GCC target("sse")
+ 
+ typedef union {
+     int32_t _i_32[4]; /* unions are initialized by its first member */
+@@ -124,6 +125,7 @@
+ }
+ 
+ 
++#pragma GCC target("sse2")
+ void
+ fht_SSE2(FLOAT * fz, int n)
+ {
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index b400ff813d2..07d4b034474 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.20";
+  name = "ldb-1.1.21";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "1ckplfvr8rp5y632w5j0abdgkj3irbzjh1wn0yxadnhz4ymknjds";
+    sha256 = "1wfvqys8g3l2gki5xhf5jc50f6k95vdgzb97vvqfls404xzvnyr6";
   };
 
   buildInputs = [
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    echo $PYTHONPATH
     sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
   '';
 
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 01aeeecc6f6..b1f81549ef0 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -8,17 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b";
   };
 
-  patchPhase = ''
-    sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in
+  patches = [ ./perl-5.22-compat.patch ];
+
+  postPatch = ''
+    patchShebangs doc/doxyparse.pl
   '';
 
-  buildInputs = [ openssl perl ];
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ openssl ];
 
   configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library with the aim of simplifying DNS programming in C";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = "http://www.nlnetlabs.nl/projects/ldns/";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/development/libraries/ldns/perl-5.22-compat.patch b/pkgs/development/libraries/ldns/perl-5.22-compat.patch
new file mode 100644
index 00000000000..ddf711cef5d
--- /dev/null
+++ b/pkgs/development/libraries/ldns/perl-5.22-compat.patch
@@ -0,0 +1,12 @@
+diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl
+--- old/doc/doxyparse.pl	2014-01-11 06:04:41.000000000 +0900
++++ new/doc/doxyparse.pl	2015-08-08 22:29:34.216889652 +0900
+@@ -273,7 +273,7 @@
+ 
+ 	print MAN $MAN_MIDDLE;
+ 
+-	if (defined(@$also)) {
++	if (@$also) {
+ 		print MAN "\n.SH SEE ALSO\n\\fI";
+ 		print MAN join "\\fR, \\fI", @$also;
+ 		print MAN "\\fR.\nAnd ";
diff --git a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch
deleted file mode 100644
index 620d702f0f0..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h
-+++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h
-@@ -217,8 +217,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
diff --git a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch
deleted file mode 100644
index 1699dbe1908..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c
-+++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c
-@@ -465,7 +465,7 @@
- 	DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag));
- #if 1
- 	/* Experimental start */
--	if (r->dpy == 0)
-+	if (r->dpy == 0  &&  w)
- 		r->dpy = XtDisplay(w);
- 	/* Experimental end */
- #endif
diff --git a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch
deleted file mode 100644
index 10bdf8d0b97..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c
---- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c	2004-10-20 21:32:11.000000000 +0200
-+++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c	2007-03-28 14:39:27.000000000 +0200
-@@ -133,7 +133,10 @@
- 		p->next = q->next;
- 	}
- 
--	XtFree((char *)stuff);
-+	/* if count!=0 then someone uses the stuff as orig_xim
-+	   so unlink it but not free it */
-+	if (!stuff->count)
-+		XtFree((char *)stuff);
- }
- 
- /*
-@@ -1060,6 +1063,8 @@
- 		   XCloseIM(stuff->xim);
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim));
- 		stuff->orig_xim->xim = NULL;
-+		/* stuff->orig_xim is now useless */
-+		XtFree(stuff->orig_xim);
- 	} else {
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n",
- 			stuff->xim, stuff->orig_xim->count));
diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix
deleted file mode 100644
index e8ec3d5e659..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, x11, libXp, libXau }:
-
-stdenv.mkDerivation {
-  name = "lesstif-0.93.94";
-  
-  src = fetchurl {
-    url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2;
-    sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y";
-  };
-  
-  buildInputs = [x11];
-  
-  propagatedBuildInputs = [libXp libXau];
-
-  # This is an older release of lesstif which works with arb.
-  patches =
-    [ ./c-bad_integer_cast.patch    
-      ./c-xim_chained_list_crash.patch
-      ./c-render_table_crash.patch 
-      ./stdint.patch
-    ];
-    
-  meta = {
-    priority = "5";
-  };
-}
diff --git a/pkgs/development/libraries/lesstif-0.93/stdint.patch b/pkgs/development/libraries/lesstif-0.93/stdint.patch
deleted file mode 100644
index 8b202704abd..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/stdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 97ac365bfcd6 lesstif-0.93.94/lib/Xm-2.1/Xpm.c
---- lesstif-0.93.94/lib/Xm-2.1/Xpm.c	Mon Oct 06 15:52:50 2008 +0200
-+++ lesstif-0.93.94/lib/Xm-2.1/Xpm.c	Mon Oct 06 15:53:16 2008 +0200
-@@ -54,6 +54,7 @@
- #include <io.h>
- #endif
- 
-+#include <stdint.h>
- #include <X11/Intrinsic.h> /* Avoid re-definition of Pixel-type */
- 
- #include <Xm/XpmP.h>
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index f5c959bba7a..67263d5ff5e 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
-stdenv.mkDerivation {
-  name = "lesstif-0.95.0-p2";
+stdenv.mkDerivation rec {
+  name = "lesstif-0.95.2";
   src = fetchurl {
-    url = mirror://sourceforge/lesstif/lesstif-0.95.2.tar.bz2;
+    url = "mirror://sourceforge/lesstif/${name}.tar.bz2";
     sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
   };
   buildInputs = [xlibsWrapper];
   propagatedBuildInputs = [libXp libXau];
 
-  # The last stable release of lesstif was in June 2006. These
-  # patches fix a number of later issues - in particular the 
+  # These patches fix a number of later issues - in particular the
   # render_table_crash shows up in 'arb'. The same patches appear
   # in Debian, so we assume they have been sent upstream.
   #
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index fd668fbcad9..c32372e841c 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ sqlite kyotocabinet ];
 
   buildPhase = ''
-    make all db_bench{,_sqlite3,_tree_db} leveldbutil
+    make all db_bench{,_sqlite3,_tree_db} leveldbutil libmemenv.a
   '';
 
   installPhase = "
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     cp -r include $out
     cp lib* $out/lib
     cp db_bench{,_sqlite3,_tree_db} leveldbutil $out/bin
+    mkdir -p $out/include/leveldb/helpers
+    cp helpers/memenv/memenv.h $out/include/leveldb/helpers
   ";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 717dae8fb25..119a46bfc31 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, yacc, flex }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
 
 # library that allows libbluray to play AACS protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -7,9 +7,8 @@
 # http://vlc-bluray.whoknowsmy.name/
 # https://wiki.archlinux.org/index.php/BluRay
 
-
 let baseName = "libaacs";
-    version  = "0.8.0";
+    version  = "0.8.1";
 in
 
 stdenv.mkDerivation {
@@ -17,16 +16,16 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
-    sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
+    sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
   };
 
-  buildInputs = [ libgcrypt ];
+  buildInputs = [ libgcrypt libgpgerror ];
 
   nativeBuildInputs = [ yacc flex ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.videolan.org/developers/libbluray.html;
-    description = "Library to access Blu-Ray disks for video playback";
+    homepage = https://www.videolan.org/developers/libaacs.html;
+    description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
new file mode 100644
index 00000000000..42abb3d297c
--- /dev/null
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libabw-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+    sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing";
+  };
+
+  # Boost 1.59 compatability fix
+  # Attempt removing when updating
+  postPatch = ''
+    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+  '';
+
+  buildInputs = [ boost doxygen gperf pkgconfig librevenge libxml2 perl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw;
+    description = "Library parsing abiword documents";
+    platforms = platforms.linux;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
new file mode 100644
index 00000000000..2e2bdb11d50
--- /dev/null
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitLab, autoconf, automake, glib
+, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:
+
+let version = "1.18"; in
+stdenv.mkDerivation rec {
+  name = "libaccounts-glib-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km";
+    rev = version;
+    repo = "libaccounts-glib";
+    owner = "accounts-sso";
+  };
+
+  buildInputs = [ glib libxml2 libxslt sqlite ];
+  nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ];
+
+  postPatch = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  configurePhase = ''
+    HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out
+  '';
+
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
+}
diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix
index d372c5cf8fc..bcb699da828 100644
--- a/pkgs/development/libraries/libalkimia/default.nix
+++ b/pkgs/development/libraries/libalkimia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, kdelibs, gmpxx }:
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, gmpxx }:
 
 stdenv.mkDerivation rec {
   name = "libalkimia-4.3.2";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt";
-  buildInputs = [ pkgconfig kdelibs gmpxx ];
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  buildInputs = [ kdelibs gmpxx ];
 
   meta = {
     maintainers = [ stdenv.lib.maintainers.urkud ];
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 72b364bb364..a8948e8ae8c 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, libcap
+{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig libcap ] ++
-    lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
+    [ pkgconfig ] ++
+    lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
+    lib.optional stdenv.isLinux libcap;
 
   meta = {
     longDescription = ''
diff --git a/pkgs/development/libraries/libarchive/CVE-2015-1197.patch b/pkgs/development/libraries/libarchive/CVE-2015-1197.patch
new file mode 100644
index 00000000000..cb7be5f18cd
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/CVE-2015-1197.patch
@@ -0,0 +1,143 @@
+From 59357157706d47c365b2227739e17daba3607526 Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Sun, 1 Mar 2015 12:07:45 +0100
+Subject: [PATCH] Add ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS option
+
+This fixes a directory traversal in the cpio tool.
+---
+ cpio/bsdcpio.1                           |  3 ++-
+ cpio/cpio.c                              |  2 ++
+ libarchive/archive.h                     |  2 ++
+ libarchive/archive_write_disk.3          |  3 +++
+ libarchive/archive_write_disk_posix.c    | 14 +++++++++++---
+ libarchive/test/test_write_disk_secure.c | 23 +++++++++++++++++++++++
+ 6 files changed, 43 insertions(+), 4 deletions(-)
+
+diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1
+index f966aa0..e52546e 100644
+--- a/cpio/bsdcpio.1
++++ b/cpio/bsdcpio.1
+@@ -156,7 +156,8 @@ See above for description.
+ .It Fl Fl insecure
+ (i and p mode only)
+ Disable security checks during extraction or copying.
+-This allows extraction via symbolic links and path names containing
++This allows extraction via symbolic links, absolute paths,
++and path names containing
+ .Sq ..
+ in the name.
+ .It Fl J , Fl Fl xz
+diff --git a/cpio/cpio.c b/cpio/cpio.c
+index 0acde11..b267e9b 100644
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -171,6 +171,7 @@ main(int argc, char *argv[])
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
++	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_PERM;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_ACL;
+@@ -256,6 +257,7 @@ main(int argc, char *argv[])
+ 		case OPTION_INSECURE:
+ 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_SYMLINKS;
+ 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
++			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
+ 			break;
+ 		case 'L': /* GNU cpio */
+ 			cpio->option_follow_links = 1;
+diff --git a/libarchive/archive.h b/libarchive/archive.h
+index 1f0fc38..ef635ac 100644
+--- a/libarchive/archive.h
++++ b/libarchive/archive.h
+@@ -649,6 +649,8 @@ __LA_DECL int archive_read_set_passphrase_callback(struct archive *,
+ /* Default: Do not use HFS+ compression if it was not compressed. */
+ /* This has no effect except on Mac OS v10.6 or later. */
+ #define	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED	(0x8000)
++/* Default: Do not reject entries with absolute paths */
++#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
+ 
+ __LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
+ 		     int flags);
+diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
+index fa925cc..a2e7afa 100644
+--- a/libarchive/archive_write_disk.3
++++ b/libarchive/archive_write_disk.3
+@@ -177,6 +177,9 @@ The default is to not refuse such paths.
+ Note that paths ending in
+ .Pa ..
+ always cause an error, regardless of this flag.
++.It Cm ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
++Refuse to extract an absolute path.
++The default is to not refuse such paths.
+ .It Cm ARCHIVE_EXTRACT_SPARSE
+ Scan data for blocks of NUL bytes and try to recreate them with holes.
+ This results in sparse files, independent of whether the archive format
+diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
+index ab3bdac..c1290eb 100644
+--- a/libarchive/archive_write_disk_posix.c
++++ b/libarchive/archive_write_disk_posix.c
+@@ -2509,8 +2509,9 @@ cleanup_pathname_win(struct archive_write_disk *a)
+ /*
+  * Canonicalize the pathname.  In particular, this strips duplicate
+  * '/' characters, '.' elements, and trailing '/'.  It also raises an
+- * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
+- * set) any '..' in the path.
++ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
++ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
++ * is set) if the path is absolute.
+  */
+ static int
+ cleanup_pathname(struct archive_write_disk *a)
+@@ -2529,8 +2530,15 @@ cleanup_pathname(struct archive_write_disk *a)
+ 	cleanup_pathname_win(a);
+ #endif
+ 	/* Skip leading '/'. */
+-	if (*src == '/')
++	if (*src == '/') {
++		if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			                  "Path is absolute");
++			return (ARCHIVE_FAILED);
++		}
++
+ 		separator = *src++;
++	}
+ 
+ 	/* Scan the pathname one element at a time. */
+ 	for (;;) {
+diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
+index 31c5bfd..2c94206 100644
+--- a/libarchive/test/test_write_disk_secure.c
++++ b/libarchive/test/test_write_disk_secure.c
+@@ -178,6 +178,29 @@ DEFINE_TEST(test_write_disk_secure)
+ 	assert(S_ISDIR(st.st_mode));
+ 	archive_entry_free(ae);
+ 
++	/*
++	 * Without security checks, we should be able to
++	 * extract an absolute path.
++	 */
++	assert((ae = archive_entry_new()) != NULL);
++	archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	archive_entry_set_mode(ae, S_IFREG | 0777);
++	assert(0 == archive_write_header(a, ae));
++	assert(0 == archive_write_finish_entry(a));
++	assertFileExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	assert(0 == unlink("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp"));
++
++	/* But with security checks enabled, this should fail. */
++	assert(archive_entry_clear(ae) != NULL);
++	archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	archive_entry_set_mode(ae, S_IFREG | 0777);
++	archive_write_disk_set_options(a, ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS);
++	failure("Extracting an absolute path should fail here.");
++	assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
++	archive_entry_free(ae);
++	assert(0 == archive_write_finish_entry(a));
++	assertFileNotExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++
+ 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+ 
+ 	/* Test the entries on disk. */
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index f0c3c0632a9..ff33043dbae 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz
+{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz, lzo
 , sharutils }:
 
 stdenv.mkDerivation rec {
@@ -14,11 +14,23 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./CVE-2013-0211.patch # https://github.com/libarchive/libarchive/commit/22531545
+    ./CVE-2015-1197.patch # https://github.com/NixOS/nixpkgs/issues/6799
+      # ^ it's CVE-2015-2304 specific to libarchive
   ];
 
-  buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
+  buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++
     stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
+  preBuild = if stdenv.isCygwin then ''
+    echo "#include <windows.h>" >> config.h
+  '' else null;
+
+  preFixup = ''
+    sed -i $out/lib/libarchive.la \
+      -e 's|-lcrypto|-L${openssl}/lib -lcrypto|' \
+      -e 's|-llzo2|-L${lzo}/lib -llzo2|'
+  '';
+
   meta = {
     description = "Multi-format archive and compression library";
     longDescription = ''
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index b919aef5658..2f4a122d61e 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libasr-${version}";
-  version=  "1.0.1";
+  version=  "1.0.2";
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916";
+    sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
   };
 
   buildInputs = [ libevent openssl ];
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 2a9af50fcde..ab300729acc 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, yasm
-, freetype ? null
-, fribidi ? null
+, freetype, fribidi
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
 , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
@@ -8,10 +7,9 @@
 , largeTilesSupport ? false # Use larger tiles in the rasterizer
 }:
 
-assert ((freetype != null) && (fribidi != null));
-assert encaSupport -> (enca != null);
-assert fontconfigSupport -> (fontconfig != null);
-assert harfbuzzSupport -> (harfbuzz != null);
+assert encaSupport -> enca != null;
+assert fontconfigSupport -> fontconfig != null;
+assert harfbuzzSupport -> harfbuzz != null;
 
 let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@@ -20,11 +18,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7";
+    sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index e625334cefa..884924f643d 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,17 +1,22 @@
 { fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-2.2.0";
+  name = "libassuan-2.3.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx";
+    sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7";
   };
 
-  propagatedBuildInputs = [ libgpgerror pth ];
+  buildInputs = [ libgpgerror pth ];
 
   doCheck = true;
 
+  # Make sure includes are fixed for callers who don't use libassuan-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/assuan.h
+  '';
+
   meta = {
     description = "IPC library used by GnuPG and related software";
 
diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix
deleted file mode 100644
index 7f77183c843..00000000000
--- a/pkgs/development/libraries/libassuan/git.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ fetchgit, stdenv, pth, libgpgerror, autoconf, automake, libtool }:
-
-stdenv.mkDerivation rec {
-  name = "libassuan-2.1pre-git20120407";
-
-  src = fetchgit {
-    url = "git://git.gnupg.org/libassuan.git";
-    rev = "5c00c7cc2901a879927a5756e1bb7ecf49439ebc";
-    sha256 = "14ebcc65930360a067eea8cfbdaa5418c909bd9dfb27fe366edf78ad6c1aa69f";
-  };
-
-  propagatedBuildInputs = [ pth libgpgerror ];
-  buildInputs = [ autoconf automake libtool ];
-
-  doCheck = true;
-
-  preConfigure = "autoreconf -v";
-
-  meta = {
-    description = "Libassuan, the IPC library used by GnuPG and related software";
-
-    longDescription = ''
-      Libassuan is a small library implementing the so-called Assuan
-      protocol.  This protocol is used for IPC between most newer
-      GnuPG components.  Both, server and client side functions are
-      provided.
-    '';
-
-    homepage = http://gnupg.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix
deleted file mode 100644
index 2532cec0390..00000000000
--- a/pkgs/development/libraries/libassuan1/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, pth }:
-
-stdenv.mkDerivation rec {
-  name = "libassuan-1.0.5";
-
-  src = fetchurl {
-    url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
-  };
-
-  propagatedBuildInputs = [ pth ];
-
-  doCheck = true;
-
-  meta = {
-    description = "Libassuan, the IPC library used by GnuPG and related software";
-
-    longDescription = ''
-      Libassuan is a small library implementing the so-called Assuan
-      protocol.  This protocol is used for IPC between most newer
-      GnuPG components.  Both, server and client side functions are
-      provided.
-    '';
-
-    homepage = http://gnupg.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-}
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 35ffe6d5fa5..cf74ed3b5f6 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, autoconf, automake, libtool }:
 let
   s = # Generated upstream information
   rec {
@@ -9,15 +9,22 @@ let
     url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";
     sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
   };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
+  
+  buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+
+in stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
+  preConfigure = if stdenv.isCygwin then ''
+      sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
+      ./autogen.sh
+  '' else null;
+
   meta = {
     inherit (s) version;
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
new file mode 100644
index 00000000000..c44639d1f39
--- /dev/null
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "libaudclient-3.5-rc2";
+  version = "3.5-rc2";
+
+  src = fetchurl {
+    url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2";
+    sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
+  };
+
+  buildInputs = [ pkgconfig glib dbus_glib ];
+
+  meta = with stdenv.lib; {
+    description = "Legacy D-Bus client library for Audacious";
+    homepage = http://audacious-media-player.org/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index d0a40d7e8d0..8ca8695def8 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -28,7 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714";
     libav_9   = libavFun   "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714";
-    libav_11  = libavFun  "11.3"  "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a";
+    libav_11  = libavFun  "11.4"  "c2ab12102de187f2675a56b828b4a5e9136ab747";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
new file mode 100644
index 00000000000..f4d01def94a
--- /dev/null
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "libb2-${meta.version}";
+
+  meta = {
+    version = "0.97";
+    description = "The BLAKE2 family of cryptographic hash functions";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ dfoxfranke ];
+    license = licenses.cc0;
+  };
+
+  src = fetchurl {
+    url = "https://blake2.net/${name}.tar.gz";
+    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+  };
+}
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
new file mode 100644
index 00000000000..8cc2e806932
--- /dev/null
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+
+# library that allows libbluray to play BDplus protected bluray disks
+# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "libbdplus";
+    version  = "0.1.2";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
+  };
+
+  buildInputs = [ libgcrypt libgpgerror ];
+
+  nativeBuildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.videolan.org/developers/libbdplus.html;
+    description = "Library to access BD+ protected Blu-Ray disks";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 18bb9f002e5..b8a4466c8c3 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, pkgconfig, cmake, git, doxygen, help2man, tecla, libusb1, udev }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
+, libusb1, udev }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.4.0";
   name = "libbladeRF-v${version}";
 
-  src = fetchgit {
-    url = "https://github.com/Nuand/bladeRF/";
-    rev = "refs/tags/libbladeRF_v${version}";
-    sha256 = "19qd26yflig51scknyjf3r3nmnc2bni75294jpsv0idzqfj87lbr";
-    name = "libbladeRF_v${version}-checkout";
+  src = fetchFromGitHub {
+    owner = "Nuand";
+    repo = "bladeRF";
+    rev = "libbladeRF_v${version}";
+    sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c";
   };
 
   buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
   # Let us avoid nettools as a dependency.
   patchPhase = ''
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
-    sed -i 's/ --no-info/ --no-info --no-discard-stderr/' host/utilities/bladeRF-cli/CMakeLists.txt
   '';
 
   cmakeFlags = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_DOCUMENTATION=ON"
   ];
 
-  meta = {
-    homepage = "https://www.nuand.com/";
+  meta = with stdenv.lib; {
+    homepage = https://www.nuand.com/;
     description = "Supporting library of the BladeRF SDR opensource hardware";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.funfunctor ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ funfunctor ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index 8443ddaa606..44b8d47b5e3 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -3,11 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libbluedevil";
-  version = "1.9.3";
+  # bluedevil must have the same major version (x.y) as libbluedevil!
+  # do not update this package without checking bluedevil
+  version = "2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0fdq083145mb3ynw14pc471ahp7is48wqpmswrvfz3hkyayriss3";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
   buildInputs = [ cmake qt4 ];
diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
index 64f0e74084f..2680b1c6de5 100644
--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@@ -1,8 +1,7 @@
-diff --git a/configure.ac b/configure.ac
-index 3609d88..48c6bc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then
+diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
+--- libbluray-0.8.0/configure.ac	2015-04-10 09:48:23.000000000 +0300
++++ libbluray-0.8.0-new/configure.ac	2015-05-18 14:22:01.002075482 +0300
+@@ -231,6 +231,7 @@
    AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
    AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
@@ -10,16 +9,14 @@ index 3609d88..48c6bc6 100644
  fi
  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
  
-diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
-index c622801..f4aab9b 100644
---- a/src/libbluray/bdj/bdj.c
-+++ b/src/libbluray/bdj/bdj.c
-@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void)
+diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
+--- libbluray-0.8.0/src/libbluray/bdj/bdj.c	2015-04-06 19:25:09.000000000 +0300
++++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c	2015-05-18 14:22:59.241312808 +0300
+@@ -228,6 +228,7 @@
  #ifdef _WIN32
          "" BDJ_JARFILE,
  #else
--        "/usr/share/java/" BDJ_JARFILE,
 +        JARDIR "/" BDJ_JARFILE,
+         "/usr/share/java/" BDJ_JARFILE,
+         "/usr/share/libbluray/lib/" BDJ_JARFILE,
  #endif
-     };
- 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 170c4e46188..d8571254967 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, fontconfig
-, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
+{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook
+, withJava ? false, jdk ? null, ant ? null
+, withAACS ? false, libaacs ? null
+, withBDplus ? false, libbdplus ? null
 , withMetadata ? true, libxml2 ? null
 , withFonts ? true, freetype ? null
-# Need to run autoreconf hook after BDJ jarfile patch
-, autoreconfHook ? null
 }:
 
-assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null;
+with stdenv.lib;
+
+assert withJava -> jdk != null && ant != null;
+assert withAACS -> libaacs != null;
+assert withBDplus -> libbdplus != null;
 assert withMetadata -> libxml2 != null;
 assert withFonts -> freetype != null;
 
@@ -15,41 +19,40 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   baseName = "libbluray";
-  version  = "0.7.0";
+  version  = "0.8.1";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
-    sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp";
+    sha256 = "13zvkrwy2fr877gkifgwnqfsb3krbz7hklfcwqfjbhmvqn0cdgnd";
   };
 
-  nativeBuildInputs = with stdenv.lib;
-                      [pkgconfig]
-                      ++ optional withAACS ant
+  nativeBuildInputs = [ pkgconfig autoreconfHook ]
+                      ++ optionals withJava [ ant ]
                       ;
 
-  buildInputs =  with stdenv.lib;
-                 [fontconfig]
-              ++ optionals withAACS [ jdk autoreconfHook ]
-              ++ optional withMetadata libxml2
-              ++ optional withFonts freetype
-              ;
+  buildInputs = [ fontconfig ]
+                ++ optional withJava jdk
+                ++ optional withMetadata libxml2
+                ++ optional withFonts freetype
+                ;
 
   propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
 
-  preConfigure = stdenv.lib.optionalString withAACS ''
-    export JDK_HOME=${jdk.home}
-    export LIBS="$LIBS -L${libaacs} -laacs"
+  preConfigure = ''
+    ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
+    ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''}
+    ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''}
   '';
 
   configureFlags =  with stdenv.lib;
-                    optional withAACS "--enable-bdjava"
+                    optional (! withJava) "--disable-bdjava"
                  ++ optional (! withMetadata) "--without-libxml2"
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
   # Fix search path for BDJ jarfile
-  patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch;
+  patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch;
 
   meta = with stdenv.lib; {
     homepage = http://www.videolan.org/developers/libbluray.html;
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
new file mode 100644
index 00000000000..6d64df88d3f
--- /dev/null
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -0,0 +1,23 @@
+{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }:
+
+let
+  version = "1.1.10";
+in
+
+stdenv.mkDerivation rec {
+  name = "libbson-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz";
+    sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s";
+  };
+
+  buildInputs = [ autoconf automake114x libtool perl which ];
+
+  meta = with stdenv.lib; {
+    description = "A C Library for parsing, editing, and creating BSON documents";
+    homepage = "https://github.com/mongodb/libbson";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 496af1be88e..c3059642382 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libcaca-0.99.beta19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
 
-  propagatedBuildInputs = [ncurses];
+  propagatedBuildInputs = [ ncurses zlib ];
 
   meta = {
     homepage = http://libcaca.zoy.org/;
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 0d9474e585e..b441719d31c 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
+, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -10,12 +10,18 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap
+    pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
     /*gstreamer gst_plugins_base*/      # ToDo: gstreamer not found (why?), add (g)udev?
   ];
 
   configureFlags = "--disable-oss";
 
+  postInstall = ''
+    for f in $out/lib/*.la; do
+      sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f
+    done
+  '';
+
   passthru = {
     gtkModule = "/lib/gtk-2.0/";
   };
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index d22ce9ae2bf..4692cf6aac1 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,11 +1,13 @@
 { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "libcangjie-1.1";
+  name = "libcangjie-${version}";
+  version = "1.4_rev_${rev}";
+  rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
 
   src = fetchurl {
-    url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz";
-    sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z";
+    url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";
+    sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
   };
 
   buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 21666ed3034..670484f0ae6 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,18 +1,24 @@
 { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }:
 
 stdenv.mkDerivation rec {
-  name = "libcdr-0.1.0";
+  name = "libcdr-0.1.1";
 
   src = fetchurl {
     url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
-    sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g";
+    sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj";
   };
 
   buildInputs = [ libwpg libwpd lcms librevenge icu boost ];
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = if (stdenv.cc.cc.isClang or false)
+  # Boost 1.59 compatability fix
+  # Attempt removing when updating
+  postPatch = ''
+    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+  '';
+
+  configureFlags = if stdenv.cc.isClang
     then [ "--disable-werror" ] else null;
 
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 6eca14767c5..94b483e1f5d 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }:
+{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "2.2.0"; in
+let version = "3.0.1"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz";
-    sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x";
+    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
+    sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig udev ];
+  buildInputs = [ cmake pkgconfig udev libcec_platform ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
 
   # Fix dlopen path
   patchPhase = ''
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
new file mode 100644
index 00000000000..6db2656c9f4
--- /dev/null
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake }:
+
+let version = "1.0.10"; in
+
+stdenv.mkDerivation {
+  name = "libcec-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";
+    sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Platform library for libcec and Kodi addons";
+    homepage = "https://github.com/Pulse-Eight/platform";
+    repositories.git = "https://github.com/Pulse-Eight/libcec.git";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.titanous ];
+  };
+}
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 1a3c33eb80a..c964801f300 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,23 +1,23 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
 , clutter_gtk, libsoup /*, libmemphis */ }:
 
+let version = "0.12.11"; in
 stdenv.mkDerivation rec {
-  name = "libchamplain-0.12.10";
+  name = "libchamplain-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz";
-    sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz";
+    url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz";
+    sha256 = "19aadn4lh6mzpz2qzi5l1qcbi11a57qqv1zxp2n10z4nin4287l5";
   };
 
   buildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
-
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     homepage = http://projects.gnome.org/libchamplain/;
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
 
     description = "C library providing a ClutterActor to display maps";
 
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
       '';
 
      maintainers = [ ];
-     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+     platforms = platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index f7834c56b63..6fc17256a39 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libchardet-1.0.4";
   
   src = fetchurl {
-    url = "ftp://ftp.oops.org/pub/oops/libchardet/${name}.tar.bz2";
+    url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2";
     sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
   };
 
diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index c41e2e0a70b..16d9d8c75a4 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchsvn, python, llvm, clang }:
+{ stdenv, fetchFromGitHub, python, llvm, clang }:
 
 stdenv.mkDerivation {
   name = "libclc-2015-03-27";
 
-  src = fetchsvn {
-    url = "http://llvm.org/svn/llvm-project/libclc/trunk";
-    rev = "233456";
-    sha256 = "0g56kgffc1qr9rzhcjr4w8kljcicg0q828s9b4bmfzjvywd7hhr0";
+  src = fetchFromGitHub {
+    owner = "llvm-mirror";
+    repo = "libclc";
+    rev = "0a2d1619921545b52303be5608b64dc46f381e97";
+    sha256 = "0hgm013c0vlfqfbbf4cdajl01hhk1mhsfk4h4bfza1san97l0vcc";
   };
 
   buildInputs = [ python llvm clang ];
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://libclc.llvm.org/;
-    description = "implementation of the library requirements of the OpenCL C programming language";
+    description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index dd0de49a4bd..a6d564d9294 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let version = "1.9.7"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "libcli-${version}";
 
   src = fetchFromGitHub {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = http://sites.dparrish.com/libcli;
-    license = with licenses; lgpl21Plus;
+    license = licenses.lgpl21Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 5d5a9e49381..ea27046279c 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,26 +1,42 @@
-{ stdenv, fetchurl, }:
+{ 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
+  patchPhase = ''
+    # Fix hardcoded paths to executables
+    sed -e "s@/usr/bin/install@install@" -i ./Makefile
+    sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
+
+    # Remove useless symlink: /lib64 -> /lib
+    sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  preInstall = ''
+    # The Makefile does not create the include directory
+    mkdir -p $out/include
+  '';
+
+  postInstall = ''
+    ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
   '';
 
-  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;
+  meta = with stdenv.lib; {
+    description = "Zita thread library";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 7d0e4596dd0..4dca6b57c75 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,38 +1,41 @@
-{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }:
+{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }:
 
 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
-  ];
+  buildInputs = [ libclthreads libX11 libXft xorg.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
+  NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include";
+
+  patchPhase = ''
     sed -e "s@ldconfig@@" -i Makefile
-    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
   '';
 
-  fixupPhase = ''
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  preInstall = ''
+    # The Makefile does not create the include directory
+    mkdir -p $out/include
+  '';
+
+  postInstall = ''
     ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
   '';
 
-  meta = {
-    description = "zita X11 library";
-    version = "${version}";
+  meta = with stdenv.lib; {
+    description = "Zita X11 library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix
index 09ef21dff59..1d4e96d55b6 100644
--- a/pkgs/development/libraries/libcm/default.nix
+++ b/pkgs/development/libraries/libcm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}:
+{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}:
 
 stdenv.mkDerivation {
   name = "libcm-0.1.1";
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
     sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
   };
   buildInputs = [
-    pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite
-    xlibs.libXtst xlibs.inputproto
+    pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite
+    xorg.libXtst xorg.inputproto
     # !!! inputproto should really be propagated by libXtst
   ];
   propagatedBuildInputs = [mesa];
diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix
new file mode 100644
index 00000000000..5535623298a
--- /dev/null
+++ b/pkgs/development/libraries/libcmis/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl }:
+
+stdenv.mkDerivation rec {
+  name = "libcmis-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libcmis/${name}.tar.gz";
+    sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
+  };
+
+  buildInputs = [ boost libxml2 pkgconfig curl ];
+  configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests";
+
+  # Cppcheck cannot find all the include files (use --check-config for details)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "C++ client library for the CMIS interface";
+    homepage = https://sourceforge.net/projects/libcmis/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index bcc9e9f673f..2784cd90a5c 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,23 +1,16 @@
-{ stdenv, fetchgit, autoconf, automake, libtool,
-pkgconfig, perl, git, libevent, openssl}:
+{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}:
 
 stdenv.mkDerivation {
-  name = "libcouchbase-2.4.4";
-  src = fetchgit {
-    url = "https://github.com/couchbase/libcouchbase.git";
-    rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac";
-    sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9";
-    leaveDotGit = true;
+  name = "libcouchbase-2.5.2";
+  src = fetchurl {
+    url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz";
+    sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24";
   };
 
-  preConfigure = ''
-    patchShebangs ./config/
-    ./config/autorun.sh
-  '';
+  cmakeFlags = "-DLCB_NO_MOCK=ON";
 
-  configureFlags = "--disable-couchbasemock";
-
-  buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libevent openssl];
 
   meta = {
     description = "C client library for Couchbase";
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
new file mode 100644
index 00000000000..95339be7f3e
--- /dev/null
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "libcrafter-${version}";
+  version = "0.3";
+
+  src = fetchzip {
+    url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
+    sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4";
+  };
+
+  preConfigure = "cd libcrafter";
+
+  configureScript = "./autogen.sh";
+
+  configureFlags = [ "--with-libpcap=yes" ];
+
+  buildInputs = [ autoconf automake libtool ];
+
+  propagatedBuildInputs = [ libpcap ];
+
+  meta = {
+    homepage = https://github.com/pellegre/libcrafter;
+    description = "High level C++ network packet sniffing and crafting library";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix
index 5f76162453c..5f76162453c 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
new file mode 100644
index 00000000000..46846e992f6
--- /dev/null
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchbzr, cmake, qtbase }:
+
+stdenv.mkDerivation {
+  name = "libdbusmenu-qt-0.9.3+14";
+
+  src = fetchbzr {
+    url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
+    rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2";
+    sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
+  };
+
+  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = "-DWITH_DOC=OFF";
+
+  meta = with stdenv.lib; {
+    homepage = "http://launchpad.net/libdbusmenu-qt";
+    description = "Provides a Qt implementation of the DBusMenu spec";
+    maintainers = [ maintainers.ttuegel ];
+    inherit (qtbase.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 8d7049dc29a..26cf2c023eb 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, imagemagick }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libdmtx-0.7.4";
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ imagemagick ];
-
   meta = {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = http://libdmtx.org;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index c3608c1aea3..4db67e73b8b 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.60";
+  name = "libdrm-2.4.65";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr";
+    sha256 = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4";
   };
 
   outputs = [ "dev" "out" ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preConfigure = stdenv.lib.optionalString stdenv.isDarwin
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
-  configureFlags = [ "--enable-freedreno" ]
+  configureFlags = [ "--enable-freedreno" "--disable-valgrind" ]
     ++ stdenv.lib.optional stdenv.isLinux "--enable-udev"
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 6af8e7a415e..f8b9e9ecef9 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0";
     homepage = http://www.videolan.org/developers/libdvbpsi.html ;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.lgpl21;
   };
 
diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix
new file mode 100644
index 00000000000..9b4e912772b
--- /dev/null
+++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, pkgconfig, libdvdread}:
+
+stdenv.mkDerivation {
+  name = "libdvdnav-4.2.1";
+  
+  src = fetchurl {
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
+    sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [libdvdread];
+
+  configureScript = "./configure2"; # wtf?
+
+  preConfigure = ''
+    mkdir -p $out
+  '';
+
+  # From Handbrake
+  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
+
+  meta = {
+    homepage = http://dvdnav.mplayerhq.hu/;
+    description = "A library that implements DVD navigation features such as DVD menus";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+  };
+
+  passthru = { inherit libdvdread; };
+}
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 9b4e912772b..fe625aa69e1 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,25 +1,17 @@
 {stdenv, fetchurl, pkgconfig, libdvdread}:
 
-stdenv.mkDerivation {
-  name = "libdvdnav-4.2.1";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdnav-${version}";
+  version = "5.0.3";
+
   src = fetchurl {
-    url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
-    sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
+    url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
+    sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [libdvdread];
 
-  configureScript = "./configure2"; # wtf?
-
-  preConfigure = ''
-    mkdir -p $out
-  '';
-
-  # From Handbrake
-  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
-
   meta = {
     homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library that implements DVD navigation features such as DVD menus";
diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix
new file mode 100644
index 00000000000..eb5a48a99f1
--- /dev/null
+++ b/pkgs/development/libraries/libdvdread/4.9.9.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, libdvdcss}:
+
+stdenv.mkDerivation {
+  name = "libdvdread-4.9.9";
+  
+  src = fetchurl {
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
+    sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
+  };
+
+  buildInputs = [libdvdcss];
+
+  NIX_LDFLAGS = "-ldvdcss";
+
+  postInstall = ''
+    ln -s dvdread $out/include/libdvdread
+  '';
+
+  meta = {
+    homepage = http://dvdnav.mplayerhq.hu/;
+    description = "A library for reading DVDs";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+  };
+}
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index eb5a48a99f1..311bc6dc405 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, libdvdcss}:
 
-stdenv.mkDerivation {
-  name = "libdvdread-4.9.9";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdread-${version}";
+  version = "5.0.2";
+
   src = fetchurl {
-    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
-    sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
+    url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2";
+    sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
   };
 
   buildInputs = [libdvdcss];
diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 81264b562b4..02195dede93 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}:
+{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu
+, cppunit, zlib
+}:
+
 let
   s = # Generated upstream information
   rec {
@@ -10,12 +13,18 @@ let
     sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
   };
   buildInputs = [
-    gperf pkgconfig librevenge libxml2 boost icu cppunit
+    gperf pkgconfig librevenge libxml2 boost icu cppunit zlib
   ];
+
+  # Boost 1.59 compatability fix
+  # Attempt removing when updating
+  postPatch = ''
+    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+  '';
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
+  inherit buildInputs postPatch;
   src = fetchurl {
     inherit (s) url sha256;
   };
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 8d2d820a230..2fdd1658f19 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "libeatmydata-82";
@@ -8,6 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb";
   };
 
+  buildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/eatmydata \
+      --prefix PATH : $out/bin
+  '';
+
   meta = {
     homepage = http://www.flamingspork.com/projects/libeatmydata/;
     license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix
new file mode 100644
index 00000000000..9315a8f12b5
--- /dev/null
+++ b/pkgs/development/libraries/libeb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, perl, zlib }:
+stdenv.mkDerivation rec {
+  name = "libeb-${version}";
+  version = "4.4.3";
+
+  src = fetchurl {
+    url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${version}.tar.bz2";
+    sha256 = "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb";
+  };
+
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ zlib ];
+
+  meta = with stdenv.lib; {
+    description = "C library for accessing Japanese CD-ROM books";
+    longDescription = ''
+      The EB library is a library for accessing CD-ROM books, which are a
+      common way to distribute electronic dictionaries in Japan.  It supports
+      the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.
+    '';
+    licence = licenses.bsd3;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
new file mode 100644
index 00000000000..db8363d8522
--- /dev/null
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "libebur128-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jiixyj";
+    repo = "libebur128";
+    rev = "v${version}";
+    sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm";
+  };
+
+  buildInputs = [ cmake speexdsp pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Implementation of the EBU R128 loudness standard";
+    homepage = https://github.com/jiixyj/libebur128;
+    license = licenses.mit;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/development/libraries/libedit/01-cygwin.patch
new file mode 100644
index 00000000000..33bd39ed61e
--- /dev/null
+++ b/pkgs/development/libraries/libedit/01-cygwin.patch
@@ -0,0 +1,25 @@
+--- libedit-20120311-3.0/src/chartype.h	2012-03-11 10:54:58.000000000 +0100
++++ libedit-20120311-3.0/src/chartype.h	2012-05-03 19:00:20.651847423 +0200
+@@ -56,9 +56,11 @@
+ /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
+  * ref: ISO/IEC DTR 19769
+  */
++#ifndef __CYGWIN__
+ #if WCHAR_MAX < INT32_MAX
+ #warning Build environment does not support non-BMP characters
+ #endif
++#endif
+ 
+ #ifndef HAVE_WCSDUP
+ wchar_t *wcsdup(const wchar_t *s);
+--- libedit-20120311-3.0/src/editline/readline.h	2011-02-26 23:42:59.000000000 +0100
++++ libedit-20120311-3.0/src/editline/readline.h	2012-05-03 19:00:49.211244803 +0200
+@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
+ 
+ #ifndef CTRL
+ #include <sys/ioctl.h>
+-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
+ #include <sys/ttydefaults.h>
+ #endif
+ #ifndef CTRL
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 61bb15dde7d..dc8ecf7e95d 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -11,8 +11,13 @@ stdenv.mkDerivation rec {
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
 
+  patches = if stdenv.isCygwin then [
+    ./01-cygwin.patch
+  ] else null;
+
   postInstall = ''
-    sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
+    find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
+      -e 's,-lncurses[a-z]*,-L${ncurses}/lib -lncursesw,g'
   '';
 
   configureFlags = [ "--enable-widec" ];
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 90cab2cc687..d27df16eb94 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -4,9 +4,16 @@ stdenv.mkDerivation rec {
   name = "libev-${version}";
   version="4.19";
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/${name}.tar.gz";
+    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
     sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
   };
+
+  patches = [ ./noreturn.patch ];
+
+  # Version 4.19 is not valid C11 (which Clang default to)
+  # Check if this is still necessary on upgrade
+  NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null;
+
   meta = {
     description = "A high-performance event loop/event model with lots of features";
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/development/libraries/libev/noreturn.patch b/pkgs/development/libraries/libev/noreturn.patch
new file mode 100644
index 00000000000..85e2eaee6b4
--- /dev/null
+++ b/pkgs/development/libraries/libev/noreturn.patch
@@ -0,0 +1,13 @@
+diff --git a/ev.c b/ev.c
+index 6f36c6d..b8a1c5f 100644
+--- a/ev.c
++++ b/ev.c
+@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (
+   #define ecb_unreachable() __builtin_unreachable ()
+ #else
+   /* this seems to work fine, but gcc always emits a warning for it :/ */
+-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
++  ecb_inline ecb_noreturn void ecb_unreachable (void);
+   ecb_inline void ecb_unreachable (void) { }
+ #endif
+ 
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 9a003de80f1..cfc2c2f931b 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.4.1";
+  name = "libevdev-1.4.4";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "11dfiz7pkb2jbavr1ba8phn86qavvgf1xwlxmfs69mqxlz4x6yai";
+    sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libevent/1.4.nix b/pkgs/development/libraries/libevent/1.4.nix
deleted file mode 100644
index ed190bf6061..00000000000
--- a/pkgs/development/libraries/libevent/1.4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "1.4.14b"; in
-stdenv.mkDerivation {
-  name = "libevent-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg";
-  };
-
-  meta = {
-    description = "libevent, an event notification library";
-
-    longDescription =
-      '' The libevent API provides a mechanism to execute a callback function
-         when a specific event occurs on a file descriptor or after a timeout
-         has been reached.  Furthermore, libevent also support callbacks due
-         to signals or regular timeouts.
-
-         libevent is meant to replace the event loop found in event driven
-         network servers.  An application just needs to call event_dispatch()
-         and then add or remove events dynamically without having to change
-         the event loop.
-      '';
-
-    license = "mBSD";
-  };
-}
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 74524164dd0..284a09bc927 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+{ stdenv, fetchurl, autoreconfHook, python, findutils }:
 
 let version = "2.0.22"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
-  src = fetchFromGitHub {
-    owner = "libevent";
-    repo = "libevent";
-    rev = "release-${version}-stable";
-    sha256 = "1x2437af9j870i7l37dav1i2g9z93lbz406kyimx4nq5qcx5463p";
+  src = fetchurl {
+    url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
+    sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ python ];
+  buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
 
   patchPhase = ''
     patchShebangs event_rpcgen.py
diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
new file mode 100644
index 00000000000..f3b38dbd1c1
--- /dev/null
+++ b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
@@ -0,0 +1,10 @@
+--- libffi-3.2.1/src/closures.c	2014-11-08 13:47:24.000000000 +0100
++++ libffi-3.2.1/src/closures.c	2015-05-19 10:15:50.059325900 +0200
+@@ -212,6 +212,7 @@
+ #include <sys/mman.h>
+ 
+ /* Cygwin is Linux-like, but not quite that Linux-like.  */
++#define is_emutramp_enabled() 0
+ #define is_selinux_enabled() 0
+ 
+ #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index f0226eaaac7..cc7d1f75bb1 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dejagnu }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "libffi-3.2.1";
@@ -8,17 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null;
 
-  buildInputs = stdenv.lib.optional doCheck dejagnu;
+  outputs = [ "dev" "out" "doc" ];
 
   configureFlags = [
     "--with-gcc-arch=generic" # no detection of -march= or -mtune=
     "--enable-pax_emutramp"
   ];
 
-  doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
-
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
   # Install headers and libs in the right places.
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 2540d22b8d4..9616461177e 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
 
   # This dead code causes a duplicate symbol error in Clang so just remove it
-  postPatch = if (stdenv.cc.cc.isClang or false) then ''
+  postPatch = if stdenv.cc.isClang then ''
     substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
   '' else null;
 
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
new file mode 100644
index 00000000000..990e73d0a63
--- /dev/null
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
+
+assert enableCapabilities -> stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "libgcrypt-1.5.4";
+
+  src = fetchurl {
+    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
+    sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m";
+  };
+
+  buildInputs =
+    [ libgpgerror ]
+    ++ lib.optional enableCapabilities libcap;
+
+  # Make sure libraries are correct for .pc and .la files
+  # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
+  '' + stdenv.lib.optionalString enableCapabilities ''
+    sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.gnu.org/software/libgcrypt/;
+    description = "General-pupose cryptographic library";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+    repositories.git = git://git.gnupg.org/libgcrypt.git;
+  };
+}
diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
deleted file mode 100644
index 82bed6eba4d..00000000000
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
-
-stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.3";
-
-  src = fetchurl {
-    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
-  };
-
-  # transfig broke with multiple outputs, and it doesn't seem important here
-  nativeBuildInputs = [ /*transfig*/ ghostscript texinfo ];
-
-  propagatedBuildInputs = [ libgpgerror ];
-
-  preBuild = ''
-    (cd doc; make stamp-vti)
-  '';
-
-  doCheck = true;
-
-  crossAttrs = let
-    isCross64 = stdenv.cross.config == "x86_64-w64-mingw32";
-  in stdenv.lib.optionalAttrs isCross64 {
-    configureFlags = [ "--disable-asm" "--disable-padlock-support" ];
-  };
-
-  meta = {
-    description = "General-pupose cryptographic library";
-
-    longDescription = ''
-      GNU Libgcrypt is a general purpose cryptographic library based on
-      the code from GnuPG.  It provides functions for all
-      cryptographic building blocks: symmetric ciphers, hash
-      algorithms, MACs, public key algorithms, large integer
-      functions, random numbers and a lot of supporting functions.
-    '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    homepage = https://www.gnu.org/software/libgcrypt/;
-    repositories.git = git://git.gnupg.org/libgcrypt.git;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index af231632022..cc23d47e2bf 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,44 +1,42 @@
-{ fetchurl, stdenv, libgpgerror }:
+{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
 
-stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.5.4";
+assert enableCapabilities -> stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "libgcrypt-1.6.4";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33";
+    sha256 = "09k06gs27gxfha07sa9rpf4xh6mvphj9sky7n09ymx75w9zjrg69";
   };
 
-  propagatedBuildInputs = [ libgpgerror ];
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm";
+  buildInputs =
+    [ libgpgerror ]
+    ++ lib.optional enableCapabilities libcap;
 
-  doCheck = stdenv.system != "i686-linux"; # "basic" test fails after stdenv+glibc-2.18
+  # Make sure libraries are correct for .pc and .la files
+  # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
+  '' + stdenv.lib.optionalString enableCapabilities ''
+    sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
+  '';
 
-  # For some reason the tests don't find `libgpg-error.so'.
-  checkPhase = ''
-    LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \
-    make check
+  # TODO: figure out why this is even necessary and why the missing dylib only crashes
+  # random instead of every test
+  preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/lib
+    cp src/.libs/libgcrypt.20.dylib $out/lib
   '';
 
-  patches = [ ./no-build-timestamp.patch ];
+  doCheck = true;
 
   meta = {
+    homepage = https://www.gnu.org/software/libgcrypt/;
     description = "General-pupose cryptographic library";
-
-    longDescription = ''
-      GNU Libgcrypt is a general purpose cryptographic library based on
-      the code from GnuPG.  It provides functions for all
-      cryptographic building blocks: symmetric ciphers, hash
-      algorithms, MACs, public key algorithms, large integer
-      functions, random numbers and a lot of supporting functions.
-    '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    homepage = http://gnupg.org/;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.wkennington ];
+    repositories.git = git://git.gnupg.org/libgcrypt.git;
   };
-} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html
-  // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686)
-    { configureFlags = [ "--disable-aesni-support" ]; }
-)
+}
diff --git a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch b/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
deleted file mode 100644
index 89777338723..00000000000
--- a/pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libgcrypt-1.5.3.orig/configure libgcrypt-1.5.3/configure
---- libgcrypt-1.5.3.orig/configure	2013-07-25 11:22:47.000000000 +0200
-+++ libgcrypt-1.5.3/configure	2014-04-09 00:17:58.659147199 +0200
-@@ -16520,6 +16520,7 @@
- 
- 
- BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
-+BUILD_TIMESTAMP=1970-01-01T00:01+0000
- 
- 
- cat >>confdefs.h <<_ACEOF
-Only in libgcrypt-1.5.3: out
diff --git a/pkgs/development/libraries/libgdata/0.6.nix b/pkgs/development/libraries/libgdata/0.6.nix
deleted file mode 100644
index 4ce95505f8f..00000000000
--- a/pkgs/development/libraries/libgdata/0.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-x@{builderDefsPackage
-  , glib, libsoup, libxml2, pkgconfig, intltool, perl
-  , libtasn1, nettle, gmp
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libgdata";
-    majorVersion="0.6";
-    minorVersion="6";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
-    hash="cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "GData API library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}/${sourceInfo.majorVersion}";
-    };
-  };
-}) x
-
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 23ccfc69df4..19a6a8531be 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.19";
+  name = "libgpg-error-1.20";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk";
+    sha256 = "08i5wxs6zlngjkv6s3dwm60w8mihxvi9agp6jfq7z6j1wdf8jrij";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 9583696df43..2fdf3d5e69b 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j";
+    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.7";
+    version = "2.5.8";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
new file mode 100644
index 00000000000..93ad88f0021
--- /dev/null
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
+
+stdenv.mkDerivation rec {
+  name = "libgringotts-${version}";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "http://libgringotts.sourceforge.net/current/${name}.tar.bz2";
+    sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk";
+  };
+
+  buildInputs = [ pkgconfig zlib bzip2 libmcrypt libmhash ];
+
+  meta = with stdenv.lib; {
+    description = "A small library to encapsulate data in an encrypted structure";
+    homepage = http://libgringotts.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
new file mode 100644
index 00000000000..ac6c9d297cc
--- /dev/null
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
+
+stdenv.mkDerivation rec {
+  version = "4.3.0";
+  name = "libgroove-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "libgroove";
+    rev = "${version}";
+    sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
+  };
+
+  buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
+
+  meta = with stdenv.lib; {
+    description = "Streaming audio processing library";
+    homepage = https://github.com/andrewrk/libgroove;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 0479343a8f5..b7e774b5223 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,24 +1,26 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
-, python, gdk_pixbuf, libiconv, libintlOrEmpty }:
+, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
 
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.30";
+  name = "libgsf-1.14.34";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b";
+    sha256 = "f0fea447e0374a73df45b498fd1701393f8e6acb39746119f8a292fb4a0cb528";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ gettext bzip2 zlib python ];
+  buildInputs = [ gettext bzip2 zlib python ]
+    ++ stdenv.lib.optional doCheck perl;
 
   propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]
     ++ libintlOrEmpty;
 
   doCheck = true;
+  preCheck = "patchShebangs ./tests/";
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
new file mode 100644
index 00000000000..e751c6ee6c0
--- /dev/null
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -0,0 +1,21 @@
+{ lib, stdenv, fetchurl, pkgconfig, udev, glib }:
+
+let version = "230"; in
+
+stdenv.mkDerivation rec {
+  name = "libgudev-${version}";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
+    sha256 = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18";
+  };
+
+  buildInputs = [ pkgconfig udev glib ];
+
+  meta = {
+    homepage = https://wiki.gnome.org/Projects/libgudev;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix
new file mode 100644
index 00000000000..79fc973731a
--- /dev/null
+++ b/pkgs/development/libraries/libhangul/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "libhangul-0.1.0";
+
+  src = fetchurl {
+    url = "https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz";
+    sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Core algorithm library for Korean input routines";
+    homepage = https://code.google.com/p/libhangul;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.ianwookim ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index 70d6b24cbfc..6a68b5610da 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.4";
+  version = "4.9.3";
   name = "libiberty-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
+    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://gcc.gnu.org/;
     license = licenses.lgpl2;
     description = "Collection of subroutines used by various GNU programs";
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index 8a4f27ad9c0..fad5c5d73f4 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
-  name = "libibmad-1.3.11";
+  name = "libibmad-1.3.12";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
-    sha256 = "1d5lh2lhz7zzs7bbjjv9i0pj3v1xgp8sdmcr425h563v2c3bp53h";
+    sha256 = "0ywkz0rskci414r6h6jd4iz4qjbj37ga2k91z1mlj9xrnl9bbgzi";
   };
 
   buildInputs = [ libibumad ];
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
index 911c5c84612..2f6a574c989 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libibumad-1.3.9";
+  name = "libibumad-1.3.10.2";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
-    sha256 = "0j52aiwfgasf7bzx65svd5h2ya7848c5racf191i8irsxa155q74";
+    sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch
index 980a0d5c71a..fad78c2fb8a 100644
--- a/pkgs/development/libraries/libical/respect-env-tzdir.patch
+++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch
@@ -1,28 +1,25 @@
-diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
-index fe984c9..22ba0a1 100644
---- a/src/libical/icaltz-util.c
-+++ b/src/libical/icaltz-util.c
-@@ -107,7 +107,7 @@ typedef struct
+--- a/src/libical/icaltz-util.c	2015-06-11 15:40:58.843138630 +0200
++++ b/src/libical/icaltz-util.c	2015-06-11 15:43:12.722046252 +0200
+@@ -107,7 +107,7 @@
  	char	charcnt[4];			
  } tzinfo; 
  
 -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
-+static char *search_paths [] = {"/etc/zoneinfo"};
++static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};
  static char *zdir = NULL;
  
  #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
-@@ -194,6 +194,16 @@ set_zonedir (void)
+@@ -194,6 +194,15 @@
  	const char *fname = ZONES_TAB_SYSTEM_FILENAME;
  	unsigned int i;
  
-+	const char *env_tzdir = strdup (getenv ("TZDIR"));
++	const char *env_tzdir = getenv ("TZDIR");
 +	if (env_tzdir) {
 +		sprintf (file_path, "%s/%s", env_tzdir, fname);
 +		if (!access (file_path, F_OK|R_OK)) {
 +			zdir = env_tzdir;
 +			return;
 +		}
-+		free (env_tzdir);
 +	}
 +
  	for (i = 0; i < NUM_SEARCH_PATHS; i++) {
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 9e65e63ffdb..70b0574a7b4 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -10,11 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
   };
 
+  patches = if stdenv.isCygwin then [
+    ./libiconv-1.14-reloc.patch
+    ./libiconv-1.14-wchar.patch
+  ] else null;
+
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
+  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null;
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
new file mode 100644
index 00000000000..005e3379d16
--- /dev/null
+++ b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
@@ -0,0 +1,269 @@
+--- libiconv-1.14/lib/relocatable.c	2011-08-07 13:48:03.000000000 -0400
++++ libiconv-1.14/lib/relocatable.c	2011-10-15 03:14:13.195133600 -0400
+@@ -2,20 +2,18 @@
+    Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+-   This program is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU Library General Public License as published
+-   by the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
++   (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Library General Public License for more details.
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU Library General Public
+-   License along with this program; if not, write to the Free Software
+-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+-   USA.  */
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/libcharset/lib/relocatable.c	2011-08-07 13:48:03.000000000 -0400
++++ libiconv-1.14/libcharset/lib/relocatable.c	2011-10-15 03:14:27.878133600 -0400
+@@ -2,20 +2,18 @@
+    Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+-   This program is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU Library General Public License as published
+-   by the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
++   (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Library General Public License for more details.
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU Library General Public
+-   License along with this program; if not, write to the Free Software
+-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+-   USA.  */
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/srclib/relocatable.c	2011-08-07 09:42:06.000000000 -0400
++++ libiconv-1.14/srclib/relocatable.c	2011-10-15 03:14:37.739133600 -0400
+@@ -3,16 +3,16 @@
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+    This program is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3 of the License, or
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+@@ -85,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -154,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -284,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -330,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -403,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/srcm4/gnulib-comp.m4	2011-08-07 09:42:12.000000000 -0400
++++ libiconv-1.14/srcm4/gnulib-comp.m4	2011-08-30 02:40:45.597317000 -0400
+@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink])
+ gl_RELOCATABLE([$gl_source_base])
+ if test $RELOCATABLE = yes; then
+   AC_LIBOBJ([progreloc])
++  AC_LIBOBJ([relocatable])
+ fi
+ gl_FUNC_READLINK_SEPARATE
+ gl_CANONICALIZE_LGPL_SEPARATE
diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch
new file mode 100644
index 00000000000..0e4ddd931bb
--- /dev/null
+++ b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch
@@ -0,0 +1,102 @@
+--- libiconv-1.14/libcharset/lib/localcharset.c	2011-02-28 17:43:35.000000000 -0500
++++ libiconv-1.14/libcharset/lib/localcharset.c	2011-08-28 00:16:57.238000000 -0400
+@@ -54,10 +54,6 @@
+ #   include <locale.h>
+ #  endif
+ # endif
+-# ifdef __CYGWIN__
+-#  define WIN32_LEAN_AND_MEAN
+-#  include <windows.h>
+-# endif
+ #elif defined WIN32_NATIVE
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+@@ -124,7 +120,7 @@
+   cp = charset_aliases;
+   if (cp == NULL)
+     {
+-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE)
+       const char *dir;
+       const char *base = "charset.alias";
+       char *file_name;
+@@ -309,7 +305,7 @@
+            "DECKOREAN" "\0" "EUC-KR" "\0";
+ # endif
+ 
+-# if defined WIN32_NATIVE || defined __CYGWIN__
++# if defined WIN32_NATIVE
+       /* To avoid the troubles of installing a separate file in the same
+          directory as the DLL and of retrieving the DLL's directory at
+          runtime, simply inline the aliases here.  */
+@@ -365,64 +361,12 @@
+ 
+ # if HAVE_LANGINFO_CODESET
+ 
+-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+-  codeset = nl_langinfo (CODESET);
+-
+-#  ifdef __CYGWIN__
+-  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
+-     returns "US-ASCII".  Return the suffix of the locale name from the
+-     environment variables (if present) or the codepage as a number.  */
+-  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+-    {
+-      const char *locale;
+-      static char buf[2 + 10 + 1];
+-
+-      locale = getenv ("LC_ALL");
+-      if (locale == NULL || locale[0] == '\0')
+-        {
+-          locale = getenv ("LC_CTYPE");
+-          if (locale == NULL || locale[0] == '\0')
+-            locale = getenv ("LANG");
+-        }
+-      if (locale != NULL && locale[0] != '\0')
+-        {
+-          /* If the locale name contains an encoding after the dot, return
+-             it.  */
+-          const char *dot = strchr (locale, '.');
+-
+-          if (dot != NULL)
+-            {
+-              const char *modifier;
+-
+-              dot++;
+-              /* Look for the possible @... trailer and remove it, if any.  */
+-              modifier = strchr (dot, '@');
+-              if (modifier == NULL)
+-                return dot;
+-              if (modifier - dot < sizeof (buf))
+-                {
+-                  memcpy (buf, dot, modifier - dot);
+-                  buf [modifier - dot] = '\0';
+-                  return buf;
+-                }
+-            }
+-        }
+-
+-      /* Woe32 has a function returning the locale's codepage as a number:
+-         GetACP().  This encoding is used by Cygwin, unless the user has set
+-         the environment variable CYGWIN=codepage:oem (which very few people
+-         do).
+-         Output directed to console windows needs to be converted (to
+-         GetOEMCP() if the console is using a raster font, or to
+-         GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
+-         this conversion transparently (see winsup/cygwin/fhandler_console.cc),
+-         converting to GetConsoleOutputCP().  This leads to correct results,
+-         except when SetConsoleOutputCP has been called and a raster font is
+-         in use.  */
+-      sprintf (buf, "CP%u", GetACP ());
+-      codeset = buf;
+-    }
+-#  endif
++  /* Most systems support nl_langinfo (CODESET) nowadays.
++     POSIX allows that the returned pointer may point to a static area that
++     may be overwritten by subsequent calls to setlocale or nl_langinfo. */
++  static char codeset_buf[64];
++  codeset_buf[0] = '\0';
++  codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf));
+ 
+ # else
+ 
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 44aa546fe00..21013d2e072 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.30";
+  name = "libidn-1.32";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "0lxh5r1z8gsk4jxx3rv8aasjv8p53j4y04kvfn2w30a0syagrf9r";
+    sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
   };
 
   doCheck = ! stdenv.isDarwin;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0c55353c30c..399640f6c4a 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libevdev, mtdev, udev
-, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation
+, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
 , testsSupport ? false, check ? null, valgrind ? null
 }:
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.14.1";
+  name = "libinput-1.0.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b";
+    sha256 = "17prgxxq95i2l8a00clwwmvvskbb9xza9fmym1jvlmxl358v6bs8";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
new file mode 100644
index 00000000000..456e1de25df
--- /dev/null
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchhg, txt2tags }:
+
+stdenv.mkDerivation rec {
+  rev = "148";
+  version = "hg-2012-12-02";
+  name = "libixp-${version}";
+
+  src = fetchhg {
+    url = https://code.google.com/p/libixp/;
+    sha256 = "1nbnh2ff18fsrs28mx4bfgncq1d1nw5dd6iwhwvv5x2g9w7q5vvj";
+    inherit rev;
+  };
+
+  configurePhase = ''
+   sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
+  '';
+
+  buildInputs = [ txt2tags ];
+
+  meta = {
+    homepage = https://code.google.com/p/libixp/;
+    description = "Portable, simple C-language 9P client and server libary";
+    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    license = stdenv.lib.licenses.mit;
+    inherit version;
+  };
+}
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
deleted file mode 100644
index cbe9e20f0b1..00000000000
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libixp_for_wmii-0.4";
-  phases = "unpackPhase installPhase";
-  installPhase = "
-     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
-     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-            -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-            config.mk
-     make
-     mkdir -p \$out/include
-     cp -r include/*.h \$out/include
-     cp -r lib \$out
-  ";
-  src = fetchurl {
-    url = http://dl.suckless.org/libs/libixp-0.4.tar.gz;
-    sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p";
-  };
-
-  meta = {
-    homepage = http://libs.suckless.org/libixp;
-    description = "stand-alone client/server 9P library";
-    license = with stdenv.lib.licenses; [ mit lpl-102 ];
-  };
-}
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 4ce79a0f894..79cf45a8005 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "libjpeg-turbo-1.4.0";
+  name = "libjpeg-turbo-1.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
-    sha256 = "1vmv5ciqq98gi2ishqbvlx9hsk7sl06lr6xkcgw480jiddadhfnr";
+    sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj";
   };
 
   outputs = [ "dev" "out" "doc" "bin" ];
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
     homepage = http://libjpeg-turbo.virtualgl.org/;
     description = "A faster (using SIMD) libjpeg implementation";
     license = licenses.ijg; # and some parts under other BSD-style licenses
-    platforms = platforms.all;
     maintainers = [ maintainers.vcunat ];
+    # upstream supports darwin (and others), but it doesn't build currently
+    platforms = platforms.all;
+    hydraPlatforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 40efafdea3d..ca3e7949c1c 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,29 +1,31 @@
-{ stdenv, fetchFromGitHub, boost, fftw, qt5 }:
+{ stdenv, fetchFromGitHub, fftw, qtbase }:
 
-stdenv.mkDerivation rec {
-  version = "0.11.0-20141105";
+let version = "2.1"; in
+stdenv.mkDerivation {
   name = "libkeyfinder-${version}";
 
   src = fetchFromGitHub {
+    sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
+    rev = "v${version}";
     repo = "libKeyFinder";
     owner = "ibsh";
-    rev = "592ef1f3d3ada489f80814d5ccfbc8de6029dc9d";
-    sha256 = "0xcqpizwbn6wik3w7h9k1lvgrp3r3w6yyy55flvnwwwgvkry48as";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Musical key detection for digital audio (C++ library)";
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ fftw qt5.base ];
-  propagatedBuildInputs = [ boost ];
+  buildInputs = [ fftw qtbase ];
 
-  patchPhase = ''
-    substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out"
+  postPatch = ''
+    substituteInPlace LibKeyFinder.pro \
+      --replace "/usr/local" "$out" \
+      --replace "-stdlib=libc++" ""
   '';
 
   configurePhase = ''
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p $out/include/keyfinder
-    cp *.h $out/include/keyfinder
+    install -m644 *.h $out/include/keyfinder
+    mkdir -p $out/lib
+    cp -a lib*.so* $out/lib
   '';
 }
diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix
deleted file mode 100644
index 3475b22d26d..00000000000
--- a/pkgs/development/libraries/libkolab/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl,
- cmake, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolab-0.4.2";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6";
-  };
-
-  # We disable the Java backend, since we do not need them and they make the closure size much bigger
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix
deleted file mode 100644
index c0217abd786..00000000000
--- a/pkgs/development/libraries/libkolabxml/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4
-#, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolabxml-0.8.4";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q";
-  };
-
-  buildInputs = [ boost curl xercesc ];
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
new file mode 100644
index 00000000000..1f6bd05b5b3
--- /dev/null
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
+
+stdenv.mkDerivation rec {
+  name = "libksi-2015-07-03";
+
+  src = fetchFromGitHub {
+    owner = "rgerhards";
+    repo = "libksi";
+    rev = "b1ac0346395b4f52ec42a050bf33ac223f194443";
+    sha256 = "0gg0fl56flwqmsph7j92lgybaa39i715w0nwgkcr58njm0c02wlw";
+  };
+  
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ openssl curl ];
+
+  configureFlags = [
+    "--with-openssl=${openssl}"
+    "--with-cafile=/etc/ssl/certs/ca-certificates.crt"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/rgerhards/libksi";
+    description = "Keyless Signature Infrastructure API library";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix
index a56f5784b4d..152fe0894af 100644
--- a/pkgs/development/libraries/libkvkontakte/default.nix
+++ b/pkgs/development/libraries/libkvkontakte/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, qjson, kdelibs }:
+{ stdenv, fetchgit, automoc4, cmake, pkgconfig, qjson, kdelibs }:
 
 stdenv.mkDerivation {
-  name = "libkvkonatkte-1.0-pre20120103";
+  name = "libkvkontakte-1.0-pre20120103";
 
   src = fetchgit {
     url = git://anongit.kde.org/libkvkontakte;
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61";
   };
 
+  nativeBuildInputs = [ automoc4 cmake pkgconfig ];
   buildInputs = [ qjson kdelibs ];
 
   meta = {
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
new file mode 100644
index 00000000000..cafd6a66aa0
--- /dev/null
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.5";
+  name = "liblaxjson-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "liblaxjson";
+    rev = "${version}";
+    sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Library for parsing JSON config files";
+    homepage = https://github.com/andrewrk/liblaxjson;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix
index f9095be8425..c5d91e26699 100644
--- a/pkgs/development/libraries/liblognorm/default.nix
+++ b/pkgs/development/libraries/liblognorm/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "liblognorm-1.1.1";
+  name = "liblognorm-1.1.2";
   
   src = fetchurl {
     url = "http://www.liblognorm.com/files/download/${name}.tar.gz";
-    sha256 = "1wi28n5ahajvl64wfn7jpvnskccd6837i0cyq8w8cvrm362b6pd7";
+    sha256 = "0v2k5awr6vsbp36gybrys3zfkl675sywhsh4lnm7f21inlpi2nlk";
   };
 
-  buildInputs = [ pkgconfig libestr json_c pcre ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libestr json_c pcre ];
   
   configureFlags = [ "--enable-regexp" ];
 
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 7739c3627ec..37823af12e9 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
   # It is included here in order to fix a build failure in Clang
   # But it may be useful to fix other, currently unknown problems as well
-  ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ];
+  ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ];
 
   nativeBuildInputs = [ autoconf ];
 
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index d58f031f376..f910741c446 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, python, udev }:
+{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:
 
 stdenv.mkDerivation rec {
   name = "libmbim-1.12.2";
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ pkgconfig glib udev python ];
+  buildInputs = [ pkgconfig glib udev libgudev python ];
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/software/libmbim/;
-    description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
+    description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 54862e0482b..dd17f7a4c00 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.73";
+  version = "0.7.77";
   name = "libmediainfo-${version}";
   src = fetchurl {
-    url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
-    sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k";
+    url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
+    sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "./MediaInfoLib/Project/GNU/Library/";
 
   configureFlags = [ "--enable-shared" ];
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   postInstall = ''
     install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc"
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 16196c9abc9..619aa014497 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, cyrus_sasl, libevent }:
+{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
 
 stdenv.mkDerivation rec {
   name = "libmemcached-1.0.18";
-  
+
   src = fetchurl {
     url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz;
     sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72";
   };
-  
+
   # Fix linking against libpthread (patch from Fedora)
   # https://bugzilla.redhat.com/show_bug.cgi?id=1037707
   # https://bugs.launchpad.net/libmemcached/+bug/1281907
-  patches = [ ./libmemcached-fix-linking-with-libpthread.patch ];
+  # Fix building on OS X (patch from Homebrew)
+  # https://bugs.launchpad.net/libmemcached/+bug/1245562
+  patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
+    ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+      url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
+      sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
+    });
 
   buildInputs = [ cyrus_sasl libevent ];
 
@@ -19,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://libmemcached.org;
     description = "Open source C/C++ client library and tools for the memcached server";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 8b9f6f1dca5..fb6ba1761b5 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, curl, libgcrypt}:
+{ lib, stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.38";
+  name = "libmicrohttpd-0.9.43";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
+    sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1";
   };
 
-  buildInputs = [ curl libgcrypt ];
+  buildInputs = [ libgcrypt ];
 
   preCheck =
     # Since `localhost' can't be resolved in a chroot, work around it.
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
       it easy to run an HTTP server as part of another application.
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     homepage = http://www.gnu.org/software/libmicrohttpd/;
 
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 2146562c5cb..0f3ea26eb04 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }:
+{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "libmikmod-3.3.7";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ texinfo ]
-    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ];
+    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ];
   propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux pulseaudio;
+    stdenv.lib.optional stdenv.isLinux libpulseaudio;
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
 
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index b78e583fa64..1b981edcdcd 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -1,13 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libmspack-0.4alpha";
+  name = "libmspack-0.5alpha";
   src = fetchurl {
-    # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable"
-    #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz;
-    url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/"
-      + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz";
-    sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp";
+    url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz";
+    sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9";
   };
 
   meta = {
@@ -15,5 +12,4 @@ stdenv.mkDerivation {
     homepage = http://www.cabextract.org.uk/libmspack;
     license = stdenv.lib.licenses.lgpl2;
   };
-
 }
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 938c995e755..13b40501933 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.8";
+  name = "libmtp-1.1.9";
 
   propagatedBuildInputs = [ libusb1 ];
   buildInputs = [ pkgconfig ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz";
+    sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index b8582a76ed8..2ef10f41d9a 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.4";
+    version="0.3.5";
     name="${baseName}-${version}";
-    hash="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.4/libmwaw-0.3.4.tar.xz";
-    sha256="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
+    hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz";
+    sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 985745c3898..7dafe3434f9 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation (rec {
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  NIX_CFLAGS_COMPILE = "-I${libiconv}/include";
-
-  NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv";
+  NIX_LDFLAGS = "-liconv";
+  propagatedBuildInputs = [ libiconv ];
 })
diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix
index ae0db409a1a..c32e6999ecf 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/pkgs/development/libraries/libndp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libndp-1.4";
+  name = "libndp-1.5";
 
   src = fetchurl {
     url = "http://libndp.org/files/${name}.tar.gz";
-    sha256 = "0pym5xxq3avg348q61xggwy05i0r2m4sj3mlwlpxfjq2xi3y42rs";
+    sha256 = "15f743hjc7yy2sv3hzvfc27s1gny4mh5aww59vn195fff2midwgs";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index f6908cd514c..874d9000712 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
+let version = "1.0.5"; in
 stdenv.mkDerivation rec {
-  name = "libnetfilter_conntrack-1.0.4";
+  name = "libnetfilter_conntrack-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
     sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  buildInputs = [ libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
@@ -20,9 +23,8 @@ stdenv.mkDerivation rec {
       by conntrack-tools among many other applications
     '';
     homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = stdenv.lib.maintainers.nckx;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 4a4159bfdc7..df692f76a2a 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnftnl-1.0.3";
+  name = "libnftnl-1.0.5";
 
   src = fetchurl {
     url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "1xr7gis51z9r96s5m5z3dw3f5jx2m1qb7mpvl69631m6nvmff2ng";
+    sha256 = "15z4kcsklbvy94d24p2r0avyhc2rsvygjqr3gyccg2z30akzbm7n";
   };
 
   buildInputs = [ pkgconfig libmnl ];
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 4ccb7d4df8b..003b2acc920 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }:
 
 stdenv.mkDerivation rec {
-  name = "libnice-0.1.4";
+  name = "libnice-0.1.13";
 
   src = fetchurl {
     url = "http://nice.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0mxzr3y91hkjxdz1mzhxwi59la86hw2rzmd3y9c32801kkg1gra4";
+    sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1";
   };
 
-  buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {
     homepage = http://nice.freedesktop.org/wiki/;
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 3cb9629e3e1..8f46d1c0bfd 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, nss, openssl, pkgconfig }:
+{ fetchurl, stdenv, nss, nspr, pkgconfig }:
 
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd";
   };
 
-  buildInputs = [ nss openssl ];
+  buildInputs = [ pkgconfig nss nspr ];
+
+  configureFlags = [ "--enable-nss" ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index c5491f96bb5..e8778ff413a 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libodfgen";
-    version="0.1.3";
+    version="0.1.4";
     name="${baseName}-${version}";
-    hash="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
-    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.3/libodfgen-0.1.3.tar.xz";
-    sha256="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
+    hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
+    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz";
+    sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index ea2c4226289..2e19c1a588f 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
   };
 
+  outputs = [ "out" "doc" ];
+
   meta = with stdenv.lib; {
 
   outputs = [ "dev" "doc" "out" ];
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 7f6335f6496..119f4111666 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
     description = "OSSP uuid ISO-C and C++ shared library";
     longDescription =
@@ -35,6 +35,7 @@ stdenv.mkDerivation {
         short lifetime and to reliably identifying very persistent
         objects across a network.
       '';
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
+    platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 9ed1aab4034..b8985bbed82 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.5.3";
+  name = "libpcap-1.7.4";
   
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs";
+    sha256 = "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs";
   };
   
   nativeBuildInputs = [ flex bison ];
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
     else [];
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace " -arch i386" ""
+  '';
+
   preInstall = ''mkdir -p $out/bin'';
   
   crossAttrs = {
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index cbb314a7bb7..c08ff265194 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''
       This package provides a library, called libpfm4 which is used to
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
       events such as those provided by the Performance Monitoring Unit
       (PMU) of modern processors.
     '';
-    licence = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.pierron ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.pierron ];
+    platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index 2213ea2e8b9..3f91540dc80 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
  
 stdenv.mkDerivation rec {
-  name = "libpipeline-1.4.0";
+  name = "libpipeline-1.4.1";
   
   src = fetchurl {
     url = "mirror://savannah/libpipeline/${name}.tar.gz";
-    sha256 = "1dlvp2mxlhg5zbj509kc60h7g39hpgwkzkpdf855cyzizgkmkivr";
+    sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index fae6f9ba556..3071aa3fdfc 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, zlib, xz }:
+{ stdenv, fetchurl, zlib }:
 
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.51";
+  name = "libpng-1.2.53";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
+    sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml";
   };
 
   propagatedBuildInputs = [ zlib ];
 
-  nativeBuildInputs = [ xz ];
-
   passthru = { inherit zlib; };
 
   crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix
deleted file mode 100644
index 177c534ffaf..00000000000
--- a/pkgs/development/libraries/libpng/15.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, zlib }:
-
-assert zlib != null;
-
-stdenv.mkDerivation rec {
-  name = "libpng-1.5.19";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
-  };
-
-  propagatedBuildInputs = [ zlib ];
-
-  doCheck = true;
-
-  passthru = { inherit zlib; };
-
-  meta = {
-    description = "The official reference implementation for the PNG file format";
-    homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = stdenv.lib.licenses.libpng;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "1.5";
-  };
-}
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 7a233b6715c..67be2ec8611 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, zlib, apngSupport ? false }:
+{ stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
 let
-  version = "1.6.16";
-  sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
+  version = "1.6.18";
+  sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
+    sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
new file mode 100644
index 00000000000..5b02cfec7e3
--- /dev/null
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, postgresql, python }:
+
+stdenv.mkDerivation rec {
+  name = "libpqxx-4.0.1";
+
+  src = fetchurl {
+    url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz";
+    sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09";
+  };
+
+  buildInputs = [ postgresql python ];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
+
+  configureFlags = "--enable-shared";
+
+  meta = {
+    description = "A C++ library to access PostgreSQL databases";
+    homepage = http://pqxx.org/development/libpqxx/;
+    license = lib.licenses.postgresql;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.eelco ];
+  };
+}
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index 29a8c459c34..8d1288f98ce 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libpseudo.sourceforge.net/;
     description = "Simple, thread-safe messaging between threads";
-    license="GPLv2+";
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
new file mode 100644
index 00000000000..913341c49b9
--- /dev/null
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
+, libxslt, pkgconfig }:
+
+let
+
+  version = "${libVersion}-list-${listVersion}";
+
+  listVersion = "2015-09-25";
+  listSources = fetchFromGitHub {
+    sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82";
+    rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9";
+    repo = "list";
+    owner = "publicsuffix";
+  };
+
+  libVersion = "0.11.0";
+
+in stdenv.mkDerivation {
+  name = "libpsl-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm";
+    rev = "libpsl-${libVersion}";
+    repo = "libpsl";
+    owner = "rockdaboot";
+  };
+
+  buildInputs = [ icu libxslt ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ];
+
+  postPatch = ''
+    substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
+  '';
+
+  preAutoreconf = ''
+    mkdir m4
+    gtkdocize
+  '';
+
+  preConfigure = ''
+    # The libpsl check phase requires the list's test scripts (tests/) as well
+    cp -Rv "${listSources}"/* list
+  '';
+  configureFlags = "--disable-static --enable-gtk-doc --enable-man";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "C library for the Publix Suffix List";
+    longDescription = ''
+      libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
+      is a domain name under which Internet users can directly register own
+      names. Browsers and other web clients can use it to avoid privacy-leaking
+      "supercookies" and "super domain" certificates, for highlighting parts of
+      the domain in a user interface or sorting domain lists by site.
+    '';
+    homepage = http://rockdaboot.github.io/libpsl/;
+    license = licenses.mit;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index bf1a1e232bb..3d9a288b5bb 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ intltool pkgconfig ];
   propagatedBuildInputs = [ cln libxml2 glib ];
 
diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix
index a0050daec34..809a855835d 100644
--- a/pkgs/development/libraries/libqb/default.nix
+++ b/pkgs/development/libraries/libqb/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec{
-  name = "libqb-0.17.1";
+  name = "libqb-0.17.2";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz";
-    sha256 = "0a9fy4hb6ixs875fbqw77dfj7519ixg27vg4yajyl87y7gw1a8bs";
+    sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs";
   };
 
-  buildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/clusterlabs/libqb;
diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index b389176b3da..6b40eeb3b1f 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "libQGLViewer-2.3.4";
+  name = "libqglviewer-2.6.3";
+  version = "2.6.3";
 
   src = fetchurl {
-    url = "http://www.libqglviewer.com/src/${name}.tar.gz";
-    sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0";
+    url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
+    sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
   buildInputs = [ qt4 ];
@@ -17,9 +18,10 @@ stdenv.mkDerivation rec {
       make
     '';
 
-  meta = { 
-    description = "trackball-based 3D viewer qt widget including many useful features";
-    homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html;
-    license = stdenv.lib.licenses.gpl2;
+  meta = with stdenv.lib; {
+    description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
+    homepage = http://libqglviewer.com/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index a5818513690..928b251b3af 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, lcms2, jasper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libraw-0.16.0";
+  name = "libraw-${version}";
+  version = "0.17.0";
 
   src = fetchurl {
-    url = http://www.libraw.org/data/LibRaw-0.16.0.tar.gz;
-    sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
+    url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
+    sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
   };
 
   buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ;
@@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
   };
 }
 
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index bd6cbc3682c..c767ef9a9ea 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libraw1394-2.1.0";
+  name = "libraw1394-2.1.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
-    sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
+    sha256 = "0x6az154wr7wv3945485grjvpk604khv34dbaph6vmc1zdasqq59";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix
index 498463b2aea..2b8720357a1 100644
--- a/pkgs/development/libraries/librdmacm/default.nix
+++ b/pkgs/development/libraries/librdmacm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libibverbs }:
 
 stdenv.mkDerivation rec {
-  name = "librdmacm-1.0.19.1";
+  name = "librdmacm-1.0.21";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz";
-    sha256 = "0aq9x2aq62j9qn5yqifp4f2y7w2l35571ns260bwd2c60jf5fjlm";
+    sha256 = "0yx2wr5dvmf5apvc4f4r2f2mlvn05piwvxsqfb60p3rk4jfx56dx";
   };
 
   buildInputs = [ libibverbs ];
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 56e7084292c..f73ddfe340e 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.4.12";
+  version = "0.4.13";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "1wjdcf5wr50d86rysj5haz53v7d58j7sszpc6k5b4mn1x6604i0d";
+    sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp";
   };
   buildInputs = [zlib openssl];
   makeFlags = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/re.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index fe05275871f..1a7c8c92b53 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.7";
+  name = "librelp-1.2.8";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "1lfpd06cchi1mhlxwq0xhmbx42b8isx9677v9h80c9vpf4f4lhrs";
+    sha256 = "1qxj7isa2d10aw6c4a9pd3fx08vv06rrhac312avgcjmdqaa88r6";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 165e16a8823..817e1c79bc7 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/rem.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix
index e8d4f98028f..831292bf1d9 100644
--- a/pkgs/development/libraries/libresample/default.nix
+++ b/pkgs/development/libraries/libresample/default.nix
@@ -2,14 +2,14 @@
 
 let
   patch = fetchurl {
-    url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz;
+    url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz;
     sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx";
   };
 in
 stdenv.mkDerivation {
   name = "libresample-0.1.3";
   src = fetchurl {
-    url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz;
+    url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz;
     sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0";
   };
   patches = [ patch ];
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index ef4638eea27..8d9743a880f 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.1.6";
+  version = "2.2.3";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg";
+    sha256 = "10nq2rpyzgl7xhdip9mmn7hzb6hcjffbjcb04jchxmlivwdc5k51";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index ff7886d0513..fa90c76b24a 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -23,9 +23,15 @@ stdenv.mkDerivation {
   # Clang generates warnings in Boost's header files
   # -Werror causes these warnings to be interpreted as errors
   # Simplest solution: disable -Werror
-  configureFlags = if (stdenv.cc.cc.isClang or false)
+  configureFlags = if stdenv.cc.isClang
     then [ "--disable-werror" ] else null;
 
+  # Fix an issue with boost 1.59
+  # This is fixed upstream so please remove this when updating
+  postPatch = ''
+    sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in
+  '';
+
   meta = {
     inherit (s) version;
     description = ''A base library for writing document import filters'';
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 9589298ecd5..ea1910733e7 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintlOrEmpty
-, gtk3 ? null
+, withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
 # no introspection by default, it's too big
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
     ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
 
-  propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ];
+  propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # The loaders.cache can be used by setting GDK_PIXBUF_MODULE_FILE to
   # point to this file in a wrapper.
   postConfigure = ''
-    GDK_PIXBUF=$out/lib/gdk-pixbuf
+    GDK_PIXBUF=$out/lib/gdk-pixbuf-2.0/2.10.0
     mkdir -p $GDK_PIXBUF/loaders
     sed -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \
         -i gdk-pixbuf-loader/Makefile
@@ -43,4 +43,11 @@ stdenv.mkDerivation rec {
     sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \
          -i gdk-pixbuf-loader/Makefile
   '';
+
+  # Merge gdkpixbuf and librsvg loaders
+  postInstall = ''
+    mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
+    rm $GDK_PIXBUF/loaders.cache.tmp
+  '';
 }
diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 3d8699918e1..2d8b2a3b5f1 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libs3-2015-01-09";
+  name = "libs3-2015-04-23";
 
   src = fetchFromGitHub {
     owner = "bji";
     repo = "libs3";
-    rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
-    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
+    rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519";
+    sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i";
   };
 
   buildInputs = [ curl libxml2 ];
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/bji/libs3;
-    description = "a library for interfacing with amazon s3";
-    licenses = licenses.gpl3;
-    platforms = platforms.unix;
+    description = "A library for interfacing with amazon s3";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index f885024bca0..f0ff549c716 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck";
   };
 
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libsndfile ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsndfile ];
 
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     # GPL or a commercial-use license (available at
     # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
     licenses    = with licenses; [ gpl3.shortName unfree ];
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 wkennington ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index dbfa1656a1a..356891e7351 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.1.0";
+  version = "3.2.4";
 
-  src = fetchFromGitHub {
-    owner = "sass";
-    repo = "libsass";
-    rev = version;
-    sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
+  src = fetchurl {
+    url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
+    sha256 = "1v804r7k0iv97ihlr46hwfw88v874kfklsm616b85yzdz0105i8h";
   };
 
-  preConfigure = ''
-    autoreconf --force --install
+  patchPhase = ''
+    export LIBSASS_VERSION=${version}
   '';
 
-  buildInputs = [ autoconf automake libtool ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A C/C++ implementation of a Sass compiler";
-    license = licenses.mit;
     homepage = https://github.com/sass/libsass;
-    maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ codyopel offline ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 00655b51afc..444b68a23ee 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, getopt }:
+{ stdenv, fetchurl, getopt }:
+
+let version = "2.2.3"; in
 
 stdenv.mkDerivation rec {
-  name    = "libseccomp-${version}";
-  version = "2.2.0";
+  name = "libseccomp-${version}";
 
-  src = fetchFromGitHub {
-    owner = "seccomp";
-    repo = "libseccomp";
-    rev = "v${version}";
-    sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84";
+  src = fetchurl {
+    url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
+    sha256 = "d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e";
   };
 
-  buildInputs = [ autoreconfHook getopt ];
+  buildInputs = [ getopt ];
 
   patchPhase = ''
     patchShebangs .
diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix
index 81a38d39973..179c899d754 100644
--- a/pkgs/development/libraries/libsexy/default.nix
+++ b/pkgs/development/libraries/libsexy/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk, pango
+{ stdenv, fetchurl, pkgconfig
+, glib, gtk, libxml2, pango
 }:
  
 stdenv.mkDerivation {
   name = "libsexy-0.1.11";
-  #builder = ./builder.sh;
 
   src = fetchurl {
     url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz;
     sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e";
   };
 
-  buildInputs = [ pkgconfig libxml2 glib gtk pango
-  ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  #configureFlags="";  
+  buildInputs = [ glib gtk libxml2 pango ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of GTK+ widgets";
+    homepahe = http://blog.chipx86.com/tag/libsexy/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index fc554122c08..0b0656df4f6 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.2";
+  name = "libsodium-1.0.3";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
+    sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";
 
   doCheck = true;
 
-  meta = {
-    description = "Version of NaCl with hardware tests at runtime, not build time";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A modern and easy-to-use crypto library";
+    homepage = http://doc.libsodium.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ raskin viric wkennington ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
new file mode 100644
index 00000000000..48400ae6e1b
--- /dev/null
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "libsoundio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "libsoundio";
+    rev = "${version}";
+    sha256 = "0zq8sy8m9zp2ji7qiwn932ivl5mw30kn97nip84ki8vc0lm7f8hx";
+  };
+
+  buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ];
+
+  meta = with stdenv.lib; {
+    description = "Cross platform audio input and output";
+    homepage = http://libsound.io/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch
deleted file mode 100644
index df1b0af0c69..00000000000
--- a/pkgs/development/libraries/libsoup/bad-symbol.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
-+++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
-@@ -348,7 +348,6 @@
- soup_server_get_async_context
- soup_server_get_listener
- soup_server_get_listeners
--soup_server_get_gsocket
- soup_server_get_port
- soup_server_get_type
- soup_server_get_uris
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 82629ca3c6f..f71cc77321a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
 , libintlOrEmpty
 , intltool, python }:
 let
-  majorVersion = "2.48";
+  majorVersion = "2.50";
   version = "${majorVersion}.0";
 in
 stdenv.mkDerivation {
@@ -11,12 +11,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
-    sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784";
+    sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b";
   };
 
   patchPhase = ''
     patchShebangs libsoup/
-    patch -p1 < ${./bad-symbol.patch}
   '';
 
   buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
@@ -30,6 +29,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  postInstall = "rm -rf $out/share/gtk-doc";
+
   meta = {
     inherit (glib.meta) maintainers platforms;
   };
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index 43c2a9089b7..eb3917b1192 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libspatialite-4.2.0";
 
   src = fetchurl {
-    url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
+    url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
     sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";
   };
 
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 56d15cd1e80..02bd1f966e6 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
 
-let version = "12.1.51"; in
+let 
+  version = "12.1.51"; 
+  isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
+in
 
-if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin")
+if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin" && stdenv.system != "i686-linux")
 then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
 else stdenv.mkDerivation {
   name = "libspotify-${version}";
@@ -18,6 +21,11 @@ else stdenv.mkDerivation {
         url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip";
         sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0";
       }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-i686-release.tar.gz";
+        sha256 = "1bjmn64gbr4p9irq426yap4ipq9rb84zsyhjjr7frmmw22xb86ll";
+      }
     else
       null;
 
@@ -26,9 +34,9 @@ else stdenv.mkDerivation {
   # no patch or build phase for darwin
   phases = 
     [ "unpackPhase" ] ++ 
-    (stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++
+    (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++
     [ "installPhase" ];
-  installPhase = if (stdenv.system == "x86_64-linux")
+  installPhase = if (isLinux)
     then "installPhase"
     else ''
       mkdir -p "$out"/include/libspotify
@@ -46,11 +54,11 @@ else stdenv.mkDerivation {
   buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
 
   # linux-specific
-  installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  installFlags = stdenv.lib.optionalString (isLinux)
     "prefix=$(out)";
-  patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  patchPhase = stdenv.lib.optionalString (isLinux)
     "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
-  postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  postInstall = stdenv.lib.optionalString (isLinux)
     "mv -v share $out";
 
   passthru = {
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 88af054654b..1766a685aaa 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }:
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.6.4";
+  name = "libssh-0.7.1";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz";
-    sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky";
+    url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
+    sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
   };
 
-  # option we don't provide (yet): use libgcrypt instead of openssl
-  buildInputs = [ zlib /*libgcrypt*/ openssl ];
+  postPatch = ''
+    # Fix headers to use libsodium instead of NaCl
+    sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
+  '';
+
+  buildInputs = [ zlib openssl libsodium ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
     license = licenses.lgpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    maintainers = with maintainers; [ sander urkud ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index daeb39bc982..2bd7950751b 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.5.0";
+  name = "libssh2-1.6.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3";
+    sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
   };
 
   buildInputs = [ openssl zlib ];
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
new file mode 100644
index 00000000000..a81d5a686bc
--- /dev/null
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "libtap-${version}";
+  version = "1.12.0";
+
+  src = fetchurl {
+    url = "http://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+    sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ cmake perl ];
+
+  meta = {
+    description = "A library to implement a test protocol";
+    longDescription = ''
+      libtap is a library to implement the Test Anything Protocol for
+      C originally created by Nik Clayton. This is a maintenance
+      branch by Shlomi Fish.
+    '';
+    homepage = "http://www.shlomifish.org/open-source/projects/libtap/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index a0e53cf9058..1ae26c48fc2 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.4";
+  name = "libtasn1-4.7";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0p8c5s1gm3z3nn4s9qc6gs18grbk45mx44byqw2l2qzynjqrsd7q";
+    sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4";
   };
 
   buildInputs = [ perl texinfo ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = [ ];
+    maintainers = with stdenv.lib.maintainers; [ wkennington ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 4316b2dda6b..c59542fdfed 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -10,12 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ncurses ];
 
   meta = with lib; {
     description = "Terminal keypress reading library";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index ef7a8ab09a8..da590adae06 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
+
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz;
+    url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz";
     sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
   };
 
-  buildInputs = [pkgconfig];
-
-  propagatedBuildInputs = [libogg libvorbis];
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libogg libvorbis ];
 
   # GCC's -fforce-addr flag is not supported by clang
   # It's just an optimization, so it's safe to simply remove it
@@ -17,23 +17,11 @@ stdenv.mkDerivation ({
     substituteInPlace configure --replace "-fforce-addr" ""
   '';
 
-  crossAttrs = {
-    propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv];
-    configureFlags = "--disable-examples";
-  };
-
   meta = with stdenv.lib; {
     homepage = http://www.theora.org/;
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
-    maintainers = [ maintainers.spwhitt ];
+    maintainers = with maintainers; [ spwhitt wkennington ];
     platforms = platforms.unix;
   };
 }
-
-# It has an old config.guess that doesn't know the mips64el.
-// stdenv.lib.optionalAttrs (stdenv.system == "mips64el-linux")
-{
-  propagatedBuildInputs = [libogg libvorbis autoconf automake libtool];
-  preConfigure = "rm config.guess; sh autogen.sh";
-})
diff --git a/pkgs/development/libraries/libtidy/default.nix b/pkgs/development/libraries/libtidy/default.nix
deleted file mode 100644
index 412f34008f1..00000000000
--- a/pkgs/development/libraries/libtidy/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchcvs, cmake, libtool, automake, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "libtidy-${version}";
-
-  version = "1.46";
-
-  src = fetchcvs {
-    cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy";
-    module  = "tidy";
-    date    = "2009-03-25";
-    sha256  = "0bnxn1qgjx1pfyn2q4y24yj1gwqq5bxwf5ksjljqzqzrmjv3q46x";
-  };
-
-  preConfigure = ''
-    source build/gnuauto/setup.sh
-  '';
-
-  buildInputs = [ libtool automake autoconf ];
-
-  meta = with lib; {
-    description = "Validate, correct, and pretty-print HTML files";
-    homepage    = http://tidy.sourceforge.net;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-  };
-}
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 681d3d97af5..1de75f72e6e 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,12 +1,7 @@
-{ stdenv, fetchurl, fetchsvn, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
 
 let
-  version = "4.0.3";
-  patchDir = fetchsvn {
-    url = svn://svn.archlinux.org/packages/libtiff/trunk;
-    rev = "198247";
-    sha256 = "0a47l0zkc1zz7wxg64cyjv9z1djdvfyxgmwd03znlsac4zijkcy4";
-  };
+  version = "4.0.6";
 in
 stdenv.mkDerivation rec {
   name = "libtiff-${version}";
@@ -16,21 +11,10 @@ stdenv.mkDerivation rec {
       [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
         "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
       ];
-    sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
+    sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd";
   };
 
-  patchPhase = ''
-    for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do
-      patch -p1 < "$p"
-    done
-    (
-    cd tools
-    for p in ${patchDir}/*-CVE-{2013-4231,2013-4232}.patch; do
-      patch -p0 < "$p"
-    done
-    )
-    patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch
-  ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere
+  outputs = [ "out" "doc" "man" ];
 
   outputs = [ "dev" "out" "bin" "doc" ];
 
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index 4a3196e44b8..e960f5ef57f 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt";
-    description = "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit";
+    description = "A fairly comprehensive, modular and portable cryptographic toolkit";
   };
 }
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
index 6298f2f0c0f..985c570a34e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "0.16.17";
-  sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7";
+  version = "0.16.19";
+  sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index e1f1fc179d6..725b98cdae6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.2";
-  sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w";
+  version = "1.0.6";
+  sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index b866f66dbfa..a5bb258af1a 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -1,18 +1,26 @@
-{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip
+{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip
 # Version specific options
 , version, sha256
 , ... }:
 
+let formattedVersion = lib.replaceChars ["."] ["_"] version;
+
+in
+
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/libtorrent/${name}.tar.gz";
+    url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
     inherit sha256;
   };
 
+  nativeBuildInputs = [automake autoconf libtool ];
+
   buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ];
 
+  preConfigure = "./autotool.sh";
+
   configureFlags = [ 
     "--enable-python-binding"
     "--with-libgeoip=system"
@@ -21,6 +29,8 @@ stdenv.mkDerivation rec {
     "--with-boost-libdir=${boost.lib}/lib"
     "--with-libiconv=yes"
   ];
+
+  enableParallelBuilding = true;
   
   meta = with stdenv.lib; {
     homepage = http://www.rasterbar.com/products/libtorrent/;
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
new file mode 100644
index 00000000000..42f81cf6a9d
--- /dev/null
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus
+, libvpx, check, libconfig, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "tox-core-dev-20150629";
+
+  src = fetchFromGitHub {
+    owner  = "irungentoo";
+    repo   = "toxcore";
+    rev    = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea";
+    sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh";
+  };
+
+  NIX_LDFLAGS = "-lgcc_s";
+
+  postPatch = ''
+    # within Nix chroot builds, localhost is unresolvable
+    sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
+      auto_tests/network_test.c
+    # takes WAAAY too long (~10 minutes) and would timeout
+    sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
+      auto_tests/tox_test.c
+  '';
+
+  preConfigure = ''
+    autoreconf -i
+  '';
+
+  configureFlags = [
+    "--with-libsodium-headers=${libsodium}/include"
+    "--with-libsodium-libs=${libsodium}/lib"
+    "--enable-ntox"
+    "--enable-daemon"
+  ];
+
+  buildInputs = [
+    autoconf libtool automake libsodium ncurses
+    check libconfig pkgconfig
+  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+    libopus
+  ];
+
+  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+
+  # Some tests fail randomly due to timeout. This kind of problem is well known
+  # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
+  # They don't recommend running tests on 50core machines with other cpu-bound
+  # tests running in parallel.
+  #
+  # NOTE: run the tests locally on your machine before upgrading this package!
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric jgeerds ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix
index 3ff2e1ad285..3ff2e1ad285 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix
diff --git a/pkgs/development/libraries/libtsm/darwin.patch b/pkgs/development/libraries/libtsm/darwin.patch
new file mode 100644
index 00000000000..d447be456e0
--- /dev/null
+++ b/pkgs/development/libraries/libtsm/darwin.patch
@@ -0,0 +1,37 @@
+From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001
+From: Florian Gilcher <florian.gilcher@asquera.de>
+Date: Sun, 23 Mar 2014 23:05:44 +0100
+Subject: [PATCH] Remove GCC specific flags
+
+---
+ Makefile.am | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f1e872b..c011f02 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,11 +69,7 @@ AM_CFLAGS = \
+ AM_CPPFLAGS = \
+ 	-include $(top_builddir)/config.h \
+ 	-I $(srcdir)/src
+-AM_LDFLAGS = \
+-	-Wl,--as-needed \
+-	-Wl,--gc-sections \
+-	-Wl,-z,relro \
+-	-Wl,-z,now
++AM_LDFLAGS =
+ 
+ if BUILD_ENABLE_DEBUG
+ AM_CFLAGS += -g
+@@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
+ libtsm_la_LIBADD = libshl.la
+ EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym
+ libtsm_la_LDFLAGS = \
+-	$(AM_LDFLAGS) \
+-	-version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \
+-	-Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"
++	$(AM_LDFLAGS)
+ 
+ if BUILD_HAVE_XKBCOMMON
+ libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index 66e1698b11d..b1d149a0445 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxkbcommon, pkgconfig }:
+{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   name = "libtsm-3";
@@ -8,14 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
   };
 
-  buildInputs = [ libxkbcommon pkgconfig ];
+  buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [
+    autoconf automake
+   ];
+
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    aclocal
+  '';
 
   configureFlags = [ "--disable-debug" ];
 
-  meta = {
+  patches = lib.optional stdenv.isDarwin ./darwin.patch;
+
+  meta = with lib; {
     description = "Terminal-emulator State Machine";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index f996216826a..de51da51bca 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-0.0.4";
+  name = "libu2f-host-1.0.0";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "1mpa4m3vchqa0rm1zw0fgby3yhp35k4y6jlqdd02difm3dhk28l5";
+    sha256 = "0x232rp325k1l3rdh1b9d7w3w2z2lhjmp95v4mlmd8pybjdnpi8q";
   };
 
-  buildInputs = [ pkgconfig json_c hidapi ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ json_c hidapi ];
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-host;
-    description = "a C library and command-line tool thati mplements the host-side of the U2F protocol";
+    description = "A C library and command-line tool thati mplements the host-side of the U2F protocol";
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
new file mode 100644
index 00000000000..2649cb3660d
--- /dev/null
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }:
+
+stdenv.mkDerivation rec {
+  name = "libu2f-server-1.0.1";
+
+  src = fetchurl {
+    url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz";
+    sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ json_c openssl check ];
+
+  meta = with stdenv.lib; {
+    homepage = https://developers.yubico.com/libu2f-server/;
+    description = "A C library that implements the server-side of the U2F protocol";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ philandstuff ];
+  };
+}
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 667d620c501..7f32f37a704 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,24 +1,24 @@
 { fetchurl, stdenv, libiconv }:
 
-stdenv.mkDerivation (rec {
-  name = "libunistring-0.9.3";
+stdenv.mkDerivation rec {
+  name = "libunistring-0.9.6";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${name}.tar.gz";
-    sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1";
+    sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
 
-  propagatedBuildInputs =
-    stdenv.lib.optional ((! (stdenv ? glibc))
-                         || (stdenv ? cross &&
-                             stdenv.cross.config == "i686-pc-mingw32"))
-     libiconv;
+  propagatedBuildInputs = [ libiconv ];
+
+  configureFlags = [
+    "--with-libiconv-prefix=${libiconv}"
+  ];
 
   # XXX: There are test failures on non-GNU systems, see
   # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
-  doCheck = (stdenv ? glibc);
+  doCheck = stdenv ? glibc;
 
   meta = {
     homepage = http://www.gnu.org/software/libunistring/;
@@ -52,19 +52,3 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
-//
-
-# On Cygwin Libtool is unable to find `libiconv.dll' if there's no explicit
-# `-L/path/to/libiconv' argument on the linker's command line; and since it
-# can't find the dll, it will only create a static library.
-(if (stdenv ? glibc)
- then {}
- else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
-
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))
diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch
new file mode 100644
index 00000000000..247b2dab44f
--- /dev/null
+++ b/pkgs/development/libraries/libunwind/cve-2015-3239.patch
@@ -0,0 +1,15 @@
+http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1
+
+diff --git a/include/dwarf_i.h b/include/dwarf_i.h
+index 0e72845..86dcdb8 100644
+--- a/include/dwarf_i.h
++++ b/include/dwarf_i.h
+@@ -20,7 +20,7 @@
+ extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
+ /* REG is evaluated multiple times; it better be side-effects free!  */
+ # define dwarf_to_unw_regnum(reg)					  \
+-  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
++  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
+ #endif
+ 
+ #ifdef UNW_LOCAL_ONLY
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index b08c169993e..3fc8b508559 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, fetchurl, fetchpatch, xz }:
 
 stdenv.mkDerivation rec {
   name = "libunwind-1.1";
-  
+
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
 
-  patches = [ ./libunwind-1.1-lzma.patch ];
+  patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch
+              # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html
+              (fetchpatch {
+                url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch";
+                sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha";
+              })
+            ];
 
   postPatch = ''
     sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
@@ -21,7 +27,13 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib"
     touch "$out/lib/libunwind-generic.so"
   '';
-  
+
+  postInstall = ''
+    find $out -name \*.la | while read file; do
+      sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/libunwind;
     description = "A portable and efficient API to determine the call-chain of a program";
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 804da80bbcb..e488b7b8eec 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev ? null }:
+{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libusb-1.0.19";
@@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" ]; # get rid of propagating systemd closure
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev;
+  propagatedBuildInputs =
+    stdenv.lib.optional stdenv.isLinux udev ++
+    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+    sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  '';
+
   meta = {
     homepage = http://www.libusb.info;
     description = "User-space USB library";
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 3ce377dfb08..158152abade 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
+
+, ApplicationServices, CoreServices }:
 
 let
   stable = "stable";
@@ -59,7 +61,8 @@ let
   mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
     name = mkName stability version;
     src = mkSrc version sha256;
-    buildInputs = [ automake autoconf libtool pkgconfig ];
+    buildInputs = [ automake autoconf libtool pkgconfig ]
+      ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
     preConfigure = ''
       LIBTOOLIZE=libtoolize ./autogen.sh
     '';
@@ -104,6 +107,5 @@ in
   }
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
-    v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
-    v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
+    v1_7_5 = "18x6cy2xn31am97vn6jli7kmb2fbp4c8kmv7jm97vggh0x55flsc";
   }
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 44001496988..12de07ced32 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.5.1";
+  name = "libva-1.6.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495";
+    sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
   };
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index a6da96dc863..6c5d5a91ad8 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-1.1";
+  name = "libvdpau-1.1.1";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f";
+    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2";
+    sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736";
   };
 
   buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index f82581b1097..c0880ee896f 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig glib ncurses gpm];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libviper.sourceforge.net/;
     description = "Simple window creation and management facilities for the console";
-    license="GPLv2+";
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 6e4f7f4ce5d..f2d6a089119 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -5,7 +5,7 @@
 , pythonPackages, perlPackages
 }:
 
-let version = "1.2.12"; in
+let version = "1.2.19"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg";
+    sha256 = "0vnxmqf04frrj18lrvq7wc70wh179d382py14006879k0cgi8b18";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index d03fabcc653..bda14d72947 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -3,17 +3,26 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvisio-0.1.0";
+  name = "libvisio-0.1.3";
 
   src = fetchurl {
     url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
-    sha256 = "1vpb7nbk5qh6w3jz9rl9w8p25invcvj46parb9ld13h9777kyf0j";
+    sha256 = "1blgdwxprqkasm2175imcvy647sqv6xyf3k09p0b1i7hlq889wvy";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
 
-  configureFlags = "--disable-werror";
+  # Boost 1.59 compatability fix
+  # Attempt removing when updating
+  postPatch = ''
+    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+  '';
+
+  configureFlags = [
+    "--disable-werror"
+    "--disable-tests"
+  ];
 
   meta = {
     description = "A library providing ability to interpret and import visio diagrams into various applications";
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 0e5cd8b85e8..f1715805141 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [ pkgconfig ];
 
+  nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index 20433ab1458..e58d964a625 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, glib, ncurses}:
+{ stdenv, fetchurl, pkgconfig, glib, ncurses }:
+
 stdenv.mkDerivation rec {
   name = "libvterm-0.99.7";
 
@@ -16,11 +17,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license="GPLv2+";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index f6244cba5cb..7a843013835 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, glib, pkgconfig, udev }:
+{ fetchurl, stdenv, glib, pkgconfig, udev, libgudev }:
 
 stdenv.mkDerivation rec {
   name = "libwacom-0.7.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm";
   };
 
-  buildInputs = [ glib pkgconfig udev ];
+  buildInputs = [ glib pkgconfig udev libgudev ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
new file mode 100644
index 00000000000..7153748348a
--- /dev/null
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -0,0 +1,27 @@
+{ fetchgit, stdenv, cmake, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "libwebsockets-1.4";
+
+  src = fetchgit {
+    url = "git://git.libwebsockets.org/libwebsockets";
+    rev = "16fb0132cec0fcced29bce6d86eaf94a9beb9785";
+    sha256 = "fa4c81f86dfc39211b78c53c804efc19e15b81ccb05e72699220bbed27204c7d";
+  };
+
+  buildInputs = [ cmake openssl zlib ];
+
+  meta = {
+    description = "Light, portable C library for websockets";
+    longDescription = ''
+      Libwebsockets is a lightweight pure C library built to
+      use minimal CPU and memory resources, and provide fast
+      throughput in both directions.
+    '';
+    homepage = https://libwebsockets.org/trac/libwebsockets;
+    # See http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/LICENSE
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/libwmf/CVE-2006-3376.patch b/pkgs/development/libraries/libwmf/CVE-2006-3376.patch
new file mode 100644
index 00000000000..4c7519d9c10
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2006-3376.patch
@@ -0,0 +1,28 @@
+--- libwmf-0.2.8.4.orig/src/player.c
++++ libwmf-0.2.8.4/src/player.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <math.h>
+ 
+@@ -132,8 +133,14 @@
+ 		}
+ 	}
+ 
+-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
+- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
++	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
++	{
++		API->err = wmf_E_InsMem;
++		WMF_DEBUG (API,"bailing...");
++		return (API->err);
++	}
++
++ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+ 
+ 	if (ERR (API))
+ 	{	WMF_DEBUG (API,"bailing...");
+
diff --git a/pkgs/development/libraries/libwmf/CVE-2009-1364.patch b/pkgs/development/libraries/libwmf/CVE-2009-1364.patch
new file mode 100644
index 00000000000..e2a4501662c
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2009-1364.patch
@@ -0,0 +1,11 @@
+--- libwmf-0.2.8.4.orig/src/extra/gd/gd_clip.c
++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c
+@@ -70,6 +70,7 @@
+ 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+ 		if (more == 0) return;
+ 		im->clip->max += 8;
++		im->clip->list = more;
+ 	}
+ 	im->clip->list[im->clip->count] = (*rect);
+ 	im->clip->count++;
+
diff --git a/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch b/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch
new file mode 100644
index 00000000000..54d47800298
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch
@@ -0,0 +1,186 @@
+--- libwmf-0.2.8.4.orig/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2593,9 +2593,10 @@ static int meta_dc_restore (wmfAPI* API,
+ 		polyrect.BR = 0;
+ 
+ 		polyrect.count = 0;
++	
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 	}
+ 
+-	if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 
+ 	return (changed);
+ }
+@@ -3067,7 +3068,7 @@ static int meta_pen_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3181,7 +3182,7 @@ static int meta_brush_create (wmfAPI* AP
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3288,7 +3289,7 @@ static int meta_font_create (wmfAPI* API
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3396,7 +3397,7 @@ static int meta_palette_create (wmfAPI*
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.h
++++ libwmf-0.2.8.4/src/ipa/ipa.h
+@@ -48,7 +48,7 @@ static int            ReadBlobByte (BMPS
+ static unsigned short ReadBlobLSBShort (BMPSource*);
+ static unsigned long  ReadBlobLSBLong (BMPSource*);
+ static long           TellBlob (BMPSource*);
+-static void           DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
++static int            DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+ static void           ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*);
+ static int            ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int);
+ static void           SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int);
+--- libwmf-0.2.8.4.orig/src/ipa/ipa/bmp.h
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+@@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src)
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+ {	int byte;
+ 	int count;
+ 	int i;
+@@ -870,12 +870,14 @@ static void DecodeImage (wmfAPI* API,wmf
+ 	U32 u;
+ 
+ 	unsigned char* q;
++	unsigned char* end;
+ 
+ 	for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0;
+ 
+ 	byte = 0;
+ 	x = 0;
+ 	q = pixels;
++	end = pixels + bmp->width * bmp->height;
+ 
+ 	for (y = 0; y < bmp->height; )
+ 	{	count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@ static void DecodeImage (wmfAPI* API,wmf
+ 		{	/* Encoded mode. */
+ 			byte = ReadBlobByte (src);
+ 			for (i = 0; i < count; i++)
+-			{	if (compression == 1)
++			{	
++				if (q == end)
++					return 0;
++			 	if (compression == 1)
+ 				{	(*(q++)) = (unsigned char) byte;
+ 				}
+ 				else
+@@ -896,13 +901,15 @@ static void DecodeImage (wmfAPI* API,wmf
+ 		else
+ 		{	/* Escape mode. */
+ 			count = ReadBlobByte (src);
+-			if (count == 0x01) return;
++			if (count == 0x01) return 1;
+ 			switch (count)
+ 			{
+ 			case 0x00:
+ 			 {	/* End of line. */
+ 				x = 0;
+ 				y++;
++				if (y >= bmp->height)
++					return 0;
+ 				q = pixels + y * bmp->width;
+ 				break;
+ 			 }
+@@ -910,13 +917,20 @@ static void DecodeImage (wmfAPI* API,wmf
+ 			 {	/* Delta mode. */
+ 				x += ReadBlobByte (src);
+ 				y += ReadBlobByte (src);
++				if (y >= bmp->height)
++					return 0;
++				if (x >= bmp->width)
++					return 0;
+ 				q = pixels + y * bmp->width + x;
+ 				break;
+ 			 }
+ 			default:
+ 			 {	/* Absolute mode. */
+ 				for (i = 0; i < count; i++)
+-				{	if (compression == 1)
++				{
++					if (q == end)
++						return 0;
++					if (compression == 1)
+ 					{	(*(q++)) = ReadBlobByte (src);
+ 					}
+ 					else
+@@ -943,7 +957,7 @@ static void DecodeImage (wmfAPI* API,wmf
+ 	byte = ReadBlobByte (src);  /* end of line */
+ 	byte = ReadBlobByte (src);
+ 
+-	return;
++	return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@ static void ReadBMPImage (wmfAPI* API,wm
+ 		}
+ 	}
+ 	else
+-	{	/* Convert run-length encoded raster pixels. */
+-		DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
++	{
++		if (bmp_info.bits_per_pixel == 8)	/* Convert run-length encoded raster pixels. */
++		{
++			if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image))
++			{	WMF_ERROR (API,"corrupt bmp");
++				API->err = wmf_E_BadFormat;
++			}
++		}
++		else
++		{	WMF_ERROR (API,"Unexpected pixel depth");
++			API->err = wmf_E_BadFormat;
++		}
+ 	}
+ 
+ 	if (ERR (API))
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index 95740882a93..bdede8f18cf 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ];
 
+  patches = [
+    ./CVE-2006-3376.patch ./CVE-2009-1364.patch
+    ./CVE-2015-0848+4588+4695+4696.patch
+  ];
+
   meta = {
     description = "WMF library from wvWare";
   };
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index df5917fb05c..01ae59efdf4 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -11,4 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
   nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A library for importing and exporting WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net/;
+    license = licenses.lgpl21;
+  };
 }
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
new file mode 100644
index 00000000000..e17540e96a4
--- /dev/null
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "libwps-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libwps/${name}.tar.gz";
+    sha256 = "0nc44ia5sn9mmhkq5hjacz0vm520wldq03whc5psgcb9dahvsjsc";
+  };
+
+  buildInputs = [ boost pkgconfig librevenge zlib ];
+
+  meta = with stdenv.lib; {
+    homepage = http://libwps.sourceforge.net/;
+    description = "Microsoft Works file word processor format import filter library";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 09cc623cbb1..011e936548a 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -12,13 +12,13 @@ rec {
   inherit buildInputs;
 
   phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
-  patches = [./constants.patch];
+  patches = [./constants.patch ./non-x86.patch];
 
   # using BACKEND=x86emu on 64bit systems fixes:
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$out"
-  ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ]; 
+  ] ++ a.stdenv.lib.optionals ( a.stdenv.isx86_64 || a.stdenv.isArm ) [ "BACKEND=x86emu" ];
 
   fixX86Def = a.fullDepEntry (''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch
new file mode 100644
index 00000000000..0d41cd737f0
--- /dev/null
+++ b/pkgs/development/libraries/libx86/non-x86.patch
@@ -0,0 +1,38 @@
+diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
+--- libx86-1.1+ds1.orig/Makefile	2008-05-19 12:28:59.000000000 +0300
++++ libx86-1.1+ds1/Makefile	2012-02-20 01:32:03.750068423 +0200
+@@ -5,6 +5,7 @@
+ ifeq ($(BACKEND),x86emu)
+ 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
+ 	x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
++	CFLAGS += -DX86EMU
+ else
+ 	OBJECTS += lrmi.o
+ endif
+diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
+--- libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
++++ libx86-1.1+ds1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+@@ -32,6 +32,7 @@
+ #define TRUE 1
+ #define FALSE 0
+ 
++#ifndef X86EMU
+ #define __BUILDIO(bwl,bw,type) \
+ static inline void out##bwl##_local(unsigned long port, unsigned type value) {        __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \
+ }\
+@@ -44,6 +45,15 @@
+ __BUILDIO(b,b,char)
+ __BUILDIO(w,w,short)
+ __BUILDIO(l,,int)
++#else
++/* use libc functions */
++#define inb_local inb
++#define inw_local inw
++#define inl_local inl
++#define outb_local outb
++#define outw_local outw
++#define outl_local outl
++#endif /* X86EMU */
+ 
+ 
+ char *mmap_addr = SHMERRORPTR;
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
new file mode 100644
index 00000000000..a1471766516
--- /dev/null
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libx86emu-${version}";
+  version = "1.5";
+
+  src = fetchurl {
+    url = "https://github.com/wfeldt/libx86emu/archive/${version}.tar.gz";
+    sha256 = "1im6w6m0bl6ajynx4hc028lad8v10whv4y7w9zxndzh3j4mi3aa8";
+  };
+
+  buildInputs = [ perl ];
+
+  patchPhase = ''
+    # VERSION is usually generated using Git
+    echo "${version}" > VERSION
+    sed -i 's|/usr/|/|g' Makefile
+  '';
+
+  makeFlags = "shared";
+
+  installPhase = ''
+    make install DESTDIR=$out/ LIBDIR=lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "x86 emulation library";
+    license = licenses.bsd2;
+    homepage = https://github.com/wfeldt/libx86emu;
+    maintainers = with maintainers; [ bobvanderlinden ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index c900cfbc684..b922778de0e 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,34 +1,29 @@
 { stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
 
-let version = "3.5.0.31"; in
+let version = "3.5.0.32"; in
 stdenv.mkDerivation {
   name = "libxcomp-${version}";
 
   src = fetchurl {
-    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz";
-    sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11";
+    sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
+    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
+  buildInputs = [ libjpeg libpng12 libX11 zlib ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   preAutoreconf = ''
     cd nxcomp/
   '';
 
   enableParallelBuilding = true;
-
-  postInstall = ''
-    mkdir $out/lib
-    cp libXcomp.so* $out/lib
-    mkdir $out/include
-    cp NX.h $out/include
-  '';
 }
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 8abacf6f1c8..5543b05ce9d 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.3";
+  name = "libxkbcommon-0.5.0";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6";
+    sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi";
   };
 
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
@@ -14,8 +14,13 @@ stdenv.mkDerivation rec {
     --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb
   '';
 
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/,--version-script=.*$//' Makefile
+  '';
+
   meta = {
     description = "A library to handle keyboard descriptions";
     homepage = http://xkbcommon.org;
   };
 }
+
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 87b4d82efc6..0d711514444 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://sourceforge.net/projects/libxls/;
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 0d70a6502fe..2fdc198aa11 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,63 +1,51 @@
-{ stdenv, fetchurl, findXMLCatalogs
+{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
 
-# Optional Dependencies
-, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null
-}:
+assert pythonSupport -> python != null;
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
 let
-  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";
+  version = "2.9.2";
 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 = [ optIcu optPython optReadline optZlib optXz ];
-  propagatedBuildInputs = [ findXMLCatalogs ];
+  outputs = [ "out" "doc" ];
+
+  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 ];
 
-  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)
-  ];
+  passthru = { inherit pythonSupport version; };
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ eelco wkennington ];
+    license = "bsd";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 
-  passthru = {
-    inherit version;
-    pythonSupport = python != null;
-  };
-}
+} // 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
+})
+
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 81e836aa46d..72afc1d55eb 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libxml++-2.38.0";
+  name = "libxml++-2.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxml++/2.38/${name}.tar.xz";
-    sha256 = "0ihk7fprpshs0gp38x2m5jhvrph3iwr0wy1h1qqvh3rjblzv162n";
+    sha256 = "0px0ljcf9rsfa092dzmm097yn7wln6d5fgsvj9lnrnq3kcc2j9c8";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index fda24776480..3579e99ec7a 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ libxml2 ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index 1ba31a7a6d5..f56bf77abfe 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost }:
+{ stdenv, fetchurl, cmake, boost, makePIC ? false }:
 
 stdenv.mkDerivation {
   name = "libyaml-cpp-0.5.1";
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake boost ];
 
+  cmakeFlags = stdenv.lib.optionals makePIC [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ];
+
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/yaml-cpp/;
     description = "A YAML parser and emitter for C++";
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix
index 0356d7c1f4c..035a291be29 100644
--- a/pkgs/development/libraries/libykneomgr/default.nix
+++ b/pkgs/development/libraries/libykneomgr/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "libykneomgr-0.1.6";
+  name = "libykneomgr-0.1.7";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libykneomgr/Releases/${name}.tar.gz";
-    sha256 = "15fa4sslbzhzmkf0xik36as9lsmys1apqwjxv8sx7qlpacmxy3bw";
+    sha256 = "0nlzl9g0gjb54h43gjhg8d25bq3m3s794cq671irpqkn94kj1knw";
   };
 
-  buildInputs = [ pkgconfig pcsclite libzip help2man ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pcsclite libzip help2man ];
 
   configureFlags = [
     "--with-backend=pcsc"
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 036d9c61d07..3805e8c1ce8 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, binutils }:
+{ stdenv, fetchurl, binutils }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lightning-2.0.5";
+
+  name = "lightning-${version}";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "mirror://gnu/lightning/${name}.tar.gz";
-    sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5";
+    sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz";
   };
 
-  # Needs libopcodes.so  from binutils for 'make check'
+  # Needs libopcodes.so from binutils for 'make check'
   buildInputs = [ binutils ];
 
   doCheck = true;
@@ -16,7 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/lightning/;
     description = "Run-time code generation library";
-
     longDescription = ''
       GNU lightning is a library that generates assembly language code
       at run-time; it is very fast, making it ideal for Just-In-Time
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
       to the clients a standardized RISC instruction set inspired by
       the MIPS and SPARC chips.
     '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 9654dea3725..a2e5d153060 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }:
+{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.9.2a";
+  name = "lirc-0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/lirc/${name}.tar.bz2";
-    sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim";
+    sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6";
   };
 
-  patchPhase = ''
-    sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py
-  '';
-
   preBuild = "patchShebangs .";
 
-  buildInputs = [ alsaLib help2man pkgconfig x11 python3 ];
+  buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ];
 
   configureFlags = [
     "--with-driver=devinput"
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
new file mode 100644
index 00000000000..02c07a78acb
--- /dev/null
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "lmdb-${version}";
+  version = "0.9.16";
+
+  src = fetchzip {
+    url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
+    sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l";
+  };
+
+  postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
+
+  makeFlags = "prefix=$(out)";
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  preInstall = ''
+    mkdir -p $out/{man/man1,bin,lib,include}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightning memory-mapped database";
+    longDescription = ''
+      LMDB is an ultra-fast, ultra-compact key-value embedded data store
+      developed by Symas for the OpenLDAP Project. It uses memory-mapped files,
+      so it has the read performance of a pure in-memory database while still
+      offering the persistence of standard disk-based databases, and is only
+      limited to the size of the virtual address space.
+    '';
+    homepage = http://symas.com/mdb/;
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.openldap;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index f4bff72fa80..23168de43ed 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,32 +1,35 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.08";
+  name = "lzo-2.09";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0536ad3ksk1r8h2a27d0y4p27lwjarzyndw7sagvxzj6xr6kw6xc";
+    sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j";
   };
 
   configureFlags = [ "--enable-shared" ];
 
-  doCheck = true;
+  enableParallelBuilding = true;
 
-  meta = {
-    description = "A data compresion library suitable for real-time data de-/compression";
-    longDescription =
-      '' LZO is a data compression library which is suitable for data
-	 de-/compression in real-time.  This means it favours speed over
-	 compression ratio.
+  doCheck = true;
 
-	 LZO is written in ANSI C.  Both the source code and the compressed
-	 data format are designed to be portable across platforms.
-      '';
+  meta = with stdenv.lib; {
+    description = "Real-time data (de)compression library";
+    longDescription = ''
+      LZO is a portable lossless data compression library written in ANSI C.
+      Both the source code and the compressed data format are designed to be
+      portable across platforms.
+      LZO offers pretty fast compression and *extremely* fast decompression.
+      While it favours speed over compression ratio, it includes slower
+      compression levels achieving a quite competitive compression ratio
+      while still decompressing at this very high speed.
+    '';
 
     homepage = http://www.oberhumer.com/opensource/lzo;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 1b0c1186f28..c37aea46eed 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.10";
+  name = "mbedtls-1.3.11";
 
   src = fetchurl {
     url = "https://polarssl.org/download/${name}-gpl.tgz";
-    sha256 = "0zj0vdmam52hk7c6s3y81bdb4mqawi9fskkcqlgnj8v61j7dhvvl";
+    sha256 = "1js1lk6hvw9l3nhjhnhzfazfbnlcmk229hmnlm7jli3agc1979b7";
   };
 
   nativeBuildInputs = [ perl ];
@@ -22,13 +22,6 @@ stdenv.mkDerivation rec {
     "DESTDIR=\${out}"
   ];
 
-  postInstall = ''
-    rm $out/lib/lib{mbedtls.so.8,polarssl.{a,so}}
-    ln -s libmbedtls.so $out/lib/libmbedtls.so.8
-    ln -s libmbedtls.so $out/lib/libpolarssl.so
-    ln -s libmbedtls.a $out/lib/libpolarssl.a
-  '';
-
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index bc8f91dcb93..f379d8c4e32 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.0";
+  version = "0.12.1";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
-    sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia";
+    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
   postInstall = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream
index 5c07878fdf2..94b6c78b06b 100644
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/pkgs/development/libraries/mdds/default.upstream
@@ -1,4 +1,4 @@
-url https://code.google.com/p/multidimalgorithm/wiki/Downloads
+url https://gitlab.com/mdds/mdds
 version_link '[.]tar[.][a-z0-9]+$'
 version '.*_([0-9.]+)[.]tar[.].*' '\1'
 
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 586a10bd1a8..4a672b226ea 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm
+{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, vim
 }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.11.1";
+  name = "mediastreamer-2.11.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd";
+    sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
   };
 
+  patches = [ ./plugins_dir.patch ];
+
   postPatch = ''
     sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure
   '';
 
-  # TODO: make it load plugins from *_PLUGIN_PATH
   nativeBuildInputs = [ pkgconfig intltool ];
 
   propagatedBuildInputs = [
-    alsaLib pulseaudio speex gsm libopus
+    alsaLib libpulseaudio speex gsm libopus
     ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp
     ortp libv4l libpcap srtp
     vim
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-external-ortp"
     "--with-srtp=${srtp}"
+    "--enable-xv"
+    "--enable-glx"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
new file mode 100644
index 00000000000..e312c730ab2
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }:
+
+stdenv.mkDerivation rec {
+  name = "mediastreamer-openh264-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz";
+    sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ];
+
+  meta = with stdenv.lib; {
+    description = "H.264 encoder/decoder plugin for mediastreamer2";
+    homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
new file mode 100644
index 00000000000..e64bfc5a43a
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
@@ -0,0 +1,24 @@
+diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c
+--- a/src/base/msfactory.c	2015-05-13 16:53:49.801113249 +0200
++++ b/src/base/msfactory.c	2015-08-26 21:35:44.994724647 +0200
+@@ -630,12 +630,18 @@
+ }
+ 
+ void ms_factory_init_plugins(MSFactory *obj) {
++	char *package_plugins_dir;
+ 	if (obj->plugins_dir == NULL) {
++		package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");
++		if (package_plugins_dir!=NULL){
++			obj->plugins_dir = ms_strdup(package_plugins_dir);
++		} else {
+ #ifdef PACKAGE_PLUGINS_DIR
+-		obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
++			obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
+ #else
+-		obj->plugins_dir = ms_strdup("");
++			obj->plugins_dir = ms_strdup("");
+ #endif
++		}
+ 	}
+ 	if (strlen(obj->plugins_dir) > 0) {
+ 		ms_message("Loading ms plugins from [%s]",obj->plugins_dir);
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
index f259a397c84..1ada9298f3c 100644
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ b/pkgs/development/libraries/mesa-darwin/default.nix
@@ -2,6 +2,7 @@
 , python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
+, darwin
 }:
 
 let
@@ -22,12 +23,20 @@ let
       presentproto
       libX11 libXext libxcb libXt libxshmfence
       libffi libvdpau
+    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.OpenGL
+      darwin.apple_sdk.sdk
+      darwin.apple_sdk.libs.Xplugin
     ];
 
     postUnpack = ''
       ln -s darwin $sourceRoot/configs/current
     '';
 
+    preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace bin/mklib --replace g++ clang++
+    '';
+
     patches = [
       ./patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
       ./patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0b602c687bf..eadcb6c61f9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll
 , file, expat, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
-, libvdpau, libelf, libva, libclc
+, libvdpau, libelf, libva
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableExtraFeatures ? false # not maintained
 }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
@@ -24,10 +23,9 @@ else
 with { inherit (stdenv.lib) optional optionalString; };
 
 let
-  version = "10.5.4";
+  version = "10.6.8";
   # 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;
 in
 
 stdenv.mkDerivation {
@@ -38,7 +36,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 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
+    sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd";
   };
 
   prePatch = "patchShebangs .";
@@ -63,7 +61,6 @@ stdenv.mkDerivation {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-    #"--with-clang-libdir=${clang}/lib"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
 
@@ -81,13 +78,11 @@ stdenv.mkDerivation {
     ++ [
     "--enable-xvmc"
     "--enable-vdpau"
-    "--enable-omx"
-    "--enable-va"
+    #"--enable-omx"
+    #"--enable-va"
 
     # TODO: Figure out how to enable opencl without having a runtime dependency on clang
     "--disable-opencl"
-    #"--enable-opencl"
-    #"--enable-opencl-icd"
 
     "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
     "--enable-shared-glapi"
@@ -111,8 +106,7 @@ stdenv.mkDerivation {
     autoreconfHook intltool expat llvmPackages.llvm
     glproto dri2proto dri3proto presentproto
     libX11 libXext libxcb libXt libXfixes libxshmfence
-    libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva
-    #libclc clang
+    libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */
   ] ++ optional stdenv.isLinux udev;
 
   enableParallelBuilding = true;
@@ -129,8 +123,7 @@ stdenv.mkDerivation {
   postInstall = with stdenv.lib; ''
     mv -t "$drivers/lib/" \
       $out/lib/libXvMC* \
-      $out/lib/libdricore* \
-      $out/lib/libgallium* \
+      $out/lib/d3d \
       $out/lib/vdpau \
       $out/lib/{bellagio,d3d} \
       $out/lib/libxatracker*
@@ -150,14 +143,6 @@ stdenv.mkDerivation {
       $out/lib/pkgconfig/osmesa.pc
 
   '' + /* now fix references in .la files */ ''
-    sed "/^libdir=/s,$out,$drivers," -i \
-      $drivers/lib/libXvMC*.la \
-      $drivers/lib/vdpau/*.la \
-      $drivers/lib/libdricore*.la
-
-    sed "s,$out\(/lib/libdricore[0-9\.]*.la\),$drivers\1,g" \
-      -i $drivers/lib/*.la $drivers/lib/*/*.la
-
     sed "/^libdir=/s,$out,$osmesa," -i \
       $osmesa/lib/libOSMesa*.la
 
diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
index 7eff8b32c59..9a522657223 100644
--- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
@@ -1,13 +1,22 @@
-diff --git a/src/loader/loader.c b/src/loader/loader.c
-index 666d015..4d7a9be 100644
+diff --git a/loader.c b/loader.c
+index 4fdf3c2..69ea22d 100644
 --- a/src/loader/loader.c
 +++ b/src/loader/loader.c
-@@ -101,7 +101,7 @@ static void *
+@@ -112,7 +112,7 @@ static void *udev_handle = NULL;
+ static void *
  udev_dlopen_handle(void)
  {
-    if (!udev_handle) {
--      udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
-+      udev_handle = dlopen("@libudev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
+-   char name[80];
++   char name[256];
+    unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
+    int version;
  
-       if (!udev_handle) {
-          /* libudev.so.1 changed the return types of the two unref functions
+@@ -126,7 +126,7 @@ udev_dlopen_handle(void)
+    /* First try opening an already linked libudev, then try loading one */
+    do {
+       for (version = 1; version >= 0; version--) {
+-         snprintf(name, sizeof(name), "libudev.so.%d", version);
++         snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version);
+          udev_handle = dlopen(name, flags);
+          if (udev_handle)
+             return udev_handle;
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 389e2385f98..2bb709612b4 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
 }:
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "0.9.2";
+  version = "0.9.6";
 
   src = fetchurl {
     url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
-    sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766";
+    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
   };
 
   buildInputs = [
-    SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
+    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
     makeWrapper movit pkgconfig qt sox
   ];
 
diff --git a/pkgs/development/libraries/mlt/qt-5.4.nix b/pkgs/development/libraries/mlt/qt-5.4.nix
new file mode 100644
index 00000000000..d3d8f6c6b86
--- /dev/null
+++ b/pkgs/development/libraries/mlt/qt-5.4.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
+, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox
+}:
+
+stdenv.mkDerivation rec {
+  name = "mlt-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
+    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
+  };
+
+  buildInputs = [
+    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
+    makeWrapper movit pkgconfig qt5.base qt5.svg sox
+  ];
+
+  # Mostly taken from:
+  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
+  configureFlags = [
+    "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
+    "--enable-opengl"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source multimedia framework, designed for television broadcasting";
+    homepage = http://www.mltframework.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/mlt/qt-5.5.nix b/pkgs/development/libraries/mlt/qt-5.5.nix
new file mode 100644
index 00000000000..d66d3fe9372
--- /dev/null
+++ b/pkgs/development/libraries/mlt/qt-5.5.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
+, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
+}:
+
+stdenv.mkDerivation rec {
+  name = "mlt-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
+    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
+  };
+
+  buildInputs = [
+    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
+    makeWrapper movit pkgconfig qtbase qtsvg sox
+  ];
+
+  # Mostly taken from:
+  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
+  configureFlags = [
+    "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
+    "--enable-opengl"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source multimedia framework, designed for television broadcasting";
+    homepage = http://www.mltframework.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
new file mode 100644
index 00000000000..510dbe0e190
--- /dev/null
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool
+, openssl, which
+}:
+
+let
+  version = "1.1.10";
+in
+
+stdenv.mkDerivation rec {
+  name = "mongoc-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
+    sha256 = "13yg8dpqgbpc44lsblr3szk2a5bnl2prlayv4xlkivx90m86lcx3";
+  };
+
+  propagatedBuildInputs = [ libbson ];
+  buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ];
+
+  meta = with stdenv.lib; {
+    description = "The official C client library for MongoDB";
+    homepage = "https://github.com/mongodb/mongo-c-driver";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 88f18003977..df084f0cc20 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchurl {
     url = "http://movit.sesse.net/${name}.tar.gz";
-    sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1";
+    sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9";
   };
 
   GTEST_DIR = "${gtest}";
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 06cebf04189..c17b762cab2 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,28 +1,21 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "mpfr-3.1.2";
+  name = "mpfr-3.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
+    sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn";
   };
 
+  patches = [ ./upstream.patch ];
+
   outputs = [ "dev" "out" "doc" ];
 
   # mpfr.h requires gmp.h
   propagatedBuildInputs = [ gmp ];
 
-  CFLAGS = "-I${gmp}/include";
-  LDFLAGS = if stdenv.isDarwin then "-L${gmp}/lib" else null;
-
   configureFlags =
-    /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
-          http://hydra.bordeaux.inria.fr/build/34862
-          http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
-          http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
-      */
-    stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
     stdenv.lib.optional stdenv.is64bit "--with-pic";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/mpfr/upstream.patch b/pkgs/development/libraries/mpfr/upstream.patch
new file mode 100644
index 00000000000..77933160524
--- /dev/null
+++ b/pkgs/development/libraries/mpfr/upstream.patch
@@ -0,0 +1,1699 @@
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:49:23.950112879 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:49:24.042113845 +0000
+@@ -0,0 +1 @@
++lngamma-and-doc
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:49:24.042113845 +0000
+@@ -1 +1 @@
+-3.1.3
++3.1.3-p1
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
+--- mpfr-3.1.3-a/doc/mpfr.texi	2015-06-19 19:55:11.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.texi	2015-07-02 10:49:24.018113593 +0000
+@@ -810,13 +810,17 @@
+ When the input point is in the closure of the domain of the mathematical
+ function and an input argument is +0 (resp.@: @minus{}0), one considers
+ the limit when the corresponding argument approaches 0 from above
+-(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
+-@minus{}0), the behavior is specified in the description of the MPFR function.
++(resp.@: below), if possible. If the limit is not defined (e.g.,
++@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
++specified in the description of the MPFR function, but must be consistent
++with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
++gives @minus{}Inf).
+ 
+ When the result is equal to 0, its sign is determined by considering the
+ limit as if the input point were not in the domain: If one approaches 0
+ from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
+-for example, @code{mpfr_sin} on +0 gives +0.
++for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
++@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
+ In the other cases, the sign is specified in the description of the MPFR
+ function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
+ 
+@@ -832,8 +836,8 @@
+ @c that advantages in practice), like for any bug fix.
+ Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
+ on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
+-since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
+-gives +Inf.
++since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
++(@var{x},+Inf) gives +Inf.
+ 
+ @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
+ @comment  node-name,  next,  previous,  up
+@@ -1581,7 +1585,8 @@
+ @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
+ The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
+ is a power of 2, with a precision at most that declared by the C implementation
+@@ -1599,7 +1604,8 @@
+ @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
+ 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
+@@ -1615,7 +1621,7 @@
+ Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
+ direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
+ @end deftypefun
+ 
+@@ -1635,7 +1641,7 @@
+ @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
+ and @code{mpfr_div_d}.
+ @end deftypefun
+@@ -1643,15 +1649,18 @@
+ @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
+-rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
+-@minus{}0, to be consistent with the IEEE 754 standard).
++rounded in the direction @var{rnd}.  Set @var{rop} to @minus{}0 if
++@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
+ Set @var{rop} to NaN if @var{op} is negative.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
+-rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
+-@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
++rounded in the direction @var{rnd}.  Set @var{rop} to +Inf if @var{op} is
++@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.  Warning!
++Therefore the result on @minus{}0 is different from the one of the rSqrt
++function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
++is @minus{}Inf instead of +Inf.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -1832,7 +1841,9 @@
+ @m{\log_2 @var{op}, log2(@var{op})} or
+ @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
+ rounded in the direction @var{rnd}.
+-Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
++Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
++for consistency with the ISO C99 and IEEE 754-2008 standards.
++Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
+ (i.e., the sign of the zero has no influence on the result).
+ @end deftypefun
+ 
+@@ -2003,8 +2014,11 @@
+ @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
+ rounded in the direction @var{rnd}.
+-When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
+-@var{k} being a non-negative integer, @var{rop} is set to NaN.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
++following the general rules on special values.
++When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
++@var{k} being a nonnegative integer, set @var{rop} to NaN@.
+ See also @code{mpfr_lgamma}.
+ @end deftypefun
+ 
+@@ -2012,10 +2026,11 @@
+ Set @var{rop} to the value of the logarithm of the absolute value of the
+ Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
+ (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
+-by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
+-@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
+-*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
+-the sign of the zero.
++by @var{signp}.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
++When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
++undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -2064,7 +2079,10 @@
+ @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
+ (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
+-rounded in the direction @var{rnd}.
++rounded in the direction @var{rnd}.  Concerning special values (signed zeros,
++infinities, NaN), these functions behave like a multiplication followed by a
++separate addition or subtraction.  That is, the fused operation matters only
++for rounding.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
+@@ -2089,8 +2107,8 @@
+ i.e., $\sqrt{x^2+y^2}$,
+ @end tex
+ rounded in the direction @var{rnd}.
+-Special values are handled as described in Section F.9.4.3 of
+-the ISO C99 and IEEE 754-2008 standards:
++Special values are handled as described in the ISO C99 (Section F.9.4.3)
++and IEEE 754-2008 (Section 9.2.1) standards:
+ If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
+ even if the other number is NaN.
+ @end deftypefun
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
+--- mpfr-3.1.3-a/doc/mpfr.info	2015-06-19 19:55:53.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.info	2015-07-02 10:49:38.718267817 +0000
+@@ -1,4 +1,4 @@
+-This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
++This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
+ 
+ This manual documents how to install and use the Multiple Precision
+ Floating-Point Reliable Library, version 3.1.3.
+@@ -55,7 +55,7 @@
+ MPFR Copying Conditions
+ ***********************
+ 
+-The GNU MPFR library (or MPFR for short) is "free"; this means that
++The GNU MPFR library (or MPFR for short) is “free”; this means that
+ everyone is free to use it and free to redistribute it on a free basis.
+ The library is not in the public domain; it is copyrighted and there are
+ restrictions on its distribution, but these restrictions are designed to
+@@ -418,7 +418,7 @@
+ 4.2 Nomenclature and Types
+ ==========================
+ 
+-A "floating-point number", or "float" for short, is an arbitrary
++A “floating-point number”, or “float” for short, is an arbitrary
+ precision significand (also called mantissa) with a limited precision
+ exponent.  The C data type for such objects is ‘mpfr_t’ (internally
+ defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
+@@ -432,7 +432,7 @@
+ to the other functions supported by MPFR. Unless documented otherwise,
+ the sign bit of a NaN is unspecified.
+ 
+-The "precision" is the number of bits used to represent the significand
++The “precision” is the number of bits used to represent the significand
+ of a floating-point number; the corresponding C data type is
+ ‘mpfr_prec_t’.  The precision can be any integer between ‘MPFR_PREC_MIN’
+ and ‘MPFR_PREC_MAX’.  In the current implementation, ‘MPFR_PREC_MIN’ is
+@@ -446,7 +446,7 @@
+ may abort, crash or have undefined behavior (depending on your C
+ implementation).
+ 
+-The "rounding mode" specifies the way to round the result of a
++The “rounding mode” specifies the way to round the result of a
+ floating-point operation, in case the exact result can not be
+ represented exactly in the destination significand; the corresponding C
+ data type is ‘mpfr_rnd_t’.
+@@ -499,14 +499,14 @@
+ representable numbers, it is rounded to the one with the least
+ significant bit set to zero.  For example, the number 2.5, which is
+ represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
+-of two bits, and not to (11.0)=3.  This rule avoids the "drift"
++of two bits, and not to (11.0)=3.  This rule avoids the “drift”
+ phenomenon mentioned by Knuth in volume 2 of The Art of Computer
+ Programming (Section 4.2.2).
+ 
+    Most MPFR functions take as first argument the destination variable,
+ as second and following arguments the input variables, as last argument
+ a rounding mode, and have a return value of type ‘int’, called the
+-"ternary value".  The value stored in the destination variable is
++“ternary value”.  The value stored in the destination variable is
+ correctly rounded, i.e., MPFR behaves as if it computed the result with
+ an infinite precision, then rounded it to the precision of this
+ variable.  The input variables are regarded as exact (in particular,
+@@ -572,15 +572,18 @@
+    When the input point is in the closure of the domain of the
+ mathematical function and an input argument is +0 (resp. −0), one
+ considers the limit when the corresponding argument approaches 0 from
+-above (resp. below).  If the limit is not defined (e.g., ‘mpfr_log’ on
+-−0), the behavior is specified in the description of the MPFR function.
++above (resp. below), if possible.  If the limit is not defined (e.g.,
++‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
++description of the MPFR function, but must be consistent with the rule
++from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
+ 
+    When the result is equal to 0, its sign is determined by considering
+ the limit as if the input point were not in the domain: If one
+ approaches 0 from above (resp. below), the result is +0 (resp. −0); for
+-example, ‘mpfr_sin’ on +0 gives +0.  In the other cases, the sign is
+-specified in the description of the MPFR function; for example
+-‘mpfr_max’ on −0 and +0 gives +0.
++example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
++rounding modes).  In the other cases, the sign is specified in the
++description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
++gives +0.
+ 
+    When the input point is not in the closure of the domain of the
+ function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
+@@ -590,8 +593,8 @@
+ numbers; such a case is always explicitly specified in *note MPFR
+ Interface::.  Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
+ ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
+-Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
+-gives +Inf.
++Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
++(X,+Inf) gives +Inf.
+ 
+ 
+ File: mpfr.info,  Node: Exceptions,  Next: Memory Handling,  Prev: Floating-Point Values on Special Numbers,  Up: MPFR Basics
+@@ -1253,8 +1256,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 + OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
++     Set ROP to OP1 + OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
+      (+0) and (−0) + 0 = (−0)).  The ‘mpfr_add_d’ function assumes that
+      the radix of the ‘double’ type is a power of 2, with a precision at
+      most that declared by the C implementation (macro
+@@ -1280,8 +1284,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 - OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
++     Set ROP to OP1 - OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
+      (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)).  The
+      same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
+      ‘mpfr_sub_d’.
+@@ -1300,7 +1305,7 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1 times OP2 rounded in the direction RND.  When a
+      result is zero, its sign is the product of the signs of the
+-     operands (for types having no signed zero, it is considered
++     operands (for types having no signed zeros, 0 is considered
+      positive).  The same restrictions than for ‘mpfr_add_d’ apply to
+      ‘mpfr_mul_d’.
+ 
+@@ -1327,21 +1332,24 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1/OP2 rounded in the direction RND.  When a result is
+      zero, its sign is the product of the signs of the operands (for
+-     types having no signed zero, it is considered positive).  The same
++     types having no signed zeros, 0 is considered positive).  The same
+      restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
+      ‘mpfr_div_d’.
+ 
+  -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
+           mpfr_rnd_t RND)
+-     Set ROP to the square root of OP rounded in the direction RND (set
+-     ROP to −0 if OP is −0, to be consistent with the IEEE 754
+-     standard).  Set ROP to NaN if OP is negative.
++     Set ROP to the square root of OP rounded in the direction RND.  Set
++     ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
++     Set ROP to NaN if OP is negative.
+ 
+  -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the reciprocal square root of OP rounded in the
+      direction RND.  Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
+-     NaN if OP is negative.
++     NaN if OP is negative.  Warning!  Therefore the result on −0 is
++     different from the one of the rSqrt function recommended by the
++     IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
++     +Inf.
+ 
+  -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
+@@ -1515,8 +1523,10 @@
+  -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
+-     respectively, rounded in the direction RND.  Set ROP to −Inf if OP
+-     is −0 (i.e., the sign of the zero has no influence on the result).
++     respectively, rounded in the direction RND.  Set ROP to +0 if OP is
++     1 (in all rounding modes), for consistency with the ISO C99 and
++     IEEE 754-2008 standards.  Set ROP to −Inf if OP is ±0 (i.e., the
++     sign of the zero has no influence on the result).
+ 
+  -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+@@ -1649,17 +1659,21 @@
+ 
+  -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the Gamma function on OP,
+-     rounded in the direction RND.  When −2K−1 <= OP <= −2K, K being a
+-     non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
++     rounded in the direction RND.  When OP is 1 or 2, set ROP to +0 (in
++     all rounding modes).  When OP is an infinity or a nonpositive
++     integer, set ROP to +Inf, following the general rules on special
++     values.  When −2K−1 < OP < −2K, K being a nonnegative integer, set
++     ROP to NaN.  See also ‘mpfr_lgamma’.
+ 
+  -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
+           mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the absolute value of the
+      Gamma function on OP, rounded in the direction RND.  The sign (1 or
+      −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
+-     When OP is an infinity or a non-positive integer, set ROP to +Inf.
+-     When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
+-     and when OP is ±0, *SIGNP is the sign of the zero.
++     When OP is 1 or 2, set ROP to +0 (in all rounding modes).  When OP
++     is an infinity or a nonpositive integer, set ROP to +Inf.  When OP
++     is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
++     OP is ±0, *SIGNP is the sign of the zero.
+ 
+  -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the Digamma (sometimes also called Psi)
+@@ -1703,7 +1717,10 @@
+  -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
+           OP3, mpfr_rnd_t RND)
+      Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
+-     rounded in the direction RND.
++     rounded in the direction RND.  Concerning special values (signed
++     zeros, infinities, NaN), these functions behave like a
++     multiplication followed by a separate addition or subtraction.
++     That is, the fused operation matters only for rounding.
+ 
+  -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
+           mpfr_rnd_t RND)
+@@ -1717,9 +1734,10 @@
+           RND)
+      Set ROP to the Euclidean norm of X and Y, i.e., the square root of
+      the sum of the squares of X and Y, rounded in the direction RND.
+-     Special values are handled as described in Section F.9.4.3 of the
+-     ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
+-     +Inf is returned in ROP, even if the other number is NaN.
++     Special values are handled as described in the ISO C99 (Section
++     F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
++     an infinity, then +Inf is returned in ROP, even if the other number
++     is NaN.
+ 
+  -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
+      Set ROP to the value of the Airy function Ai on X, rounded in the
+@@ -2670,7 +2688,7 @@
+ 5.16 Internals
+ ==============
+ 
+-A "limb" means the part of a multi-precision number that fits in a
++A “limb” means the part of a multi-precision number that fits in a
+ single word.  Usually a limb contains 32 or 64 bits.  The C data type
+ for a limb is ‘mp_limb_t’.
+ 
+@@ -3140,7 +3158,7 @@
+   0. PREAMBLE
+ 
+      The purpose of this License is to make a manual, textbook, or other
+-     functional and useful document "free" in the sense of freedom: to
++     functional and useful document “free” in the sense of freedom: to
+      assure everyone the effective freedom to copy and redistribute it,
+      with or without modifying it, either commercially or
+      noncommercially.  Secondarily, this License preserves for the
+@@ -3655,9 +3673,9 @@
+ * Menu:
+ 
+ * mpfr_abs:                              Basic Arithmetic Functions.
+-                                                              (line 160)
+-* mpfr_acos:                             Special Functions.   (line  51)
+-* mpfr_acosh:                            Special Functions.   (line 115)
++                                                              (line 165)
++* mpfr_acos:                             Special Functions.   (line  53)
++* mpfr_acosh:                            Special Functions.   (line 117)
+ * mpfr_add:                              Basic Arithmetic Functions.
+                                                               (line   6)
+ * mpfr_add_d:                            Basic Arithmetic Functions.
+@@ -3670,15 +3688,15 @@
+                                                               (line   8)
+ * mpfr_add_z:                            Basic Arithmetic Functions.
+                                                               (line  14)
+-* mpfr_agm:                              Special Functions.   (line 210)
+-* mpfr_ai:                               Special Functions.   (line 226)
+-* mpfr_asin:                             Special Functions.   (line  52)
+-* mpfr_asinh:                            Special Functions.   (line 116)
++* mpfr_agm:                              Special Functions.   (line 219)
++* mpfr_ai:                               Special Functions.   (line 236)
++* mpfr_asin:                             Special Functions.   (line  54)
++* mpfr_asinh:                            Special Functions.   (line 118)
+ * mpfr_asprintf:                         Formatted Output Functions.
+                                                               (line 193)
+-* mpfr_atan:                             Special Functions.   (line  53)
+-* mpfr_atan2:                            Special Functions.   (line  63)
+-* mpfr_atanh:                            Special Functions.   (line 117)
++* mpfr_atan:                             Special Functions.   (line  55)
++* mpfr_atan2:                            Special Functions.   (line  65)
++* mpfr_atanh:                            Special Functions.   (line 119)
+ * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
+                                                               (line 162)
+ * mpfr_buildopt_gmpinternals_p:          Miscellaneous Functions.
+@@ -3690,7 +3708,7 @@
+ * mpfr_can_round:                        Rounding Related Functions.
+                                                               (line  39)
+ * mpfr_cbrt:                             Basic Arithmetic Functions.
+-                                                              (line 108)
++                                                              (line 113)
+ * mpfr_ceil:                             Integer Related Functions.
+                                                               (line   7)
+ * mpfr_check_range:                      Exception Related Functions.
+@@ -3735,18 +3753,18 @@
+                                                               (line  27)
+ * mpfr_cmp_z:                            Comparison Functions.
+                                                               (line  11)
+-* mpfr_const_catalan:                    Special Functions.   (line 237)
+-* mpfr_const_euler:                      Special Functions.   (line 236)
+-* mpfr_const_log2:                       Special Functions.   (line 234)
+-* mpfr_const_pi:                         Special Functions.   (line 235)
++* mpfr_const_catalan:                    Special Functions.   (line 247)
++* mpfr_const_euler:                      Special Functions.   (line 246)
++* mpfr_const_log2:                       Special Functions.   (line 244)
++* mpfr_const_pi:                         Special Functions.   (line 245)
+ * mpfr_copysign:                         Miscellaneous Functions.
+                                                               (line 109)
+-* mpfr_cos:                              Special Functions.   (line  29)
+-* mpfr_cosh:                             Special Functions.   (line  95)
+-* mpfr_cot:                              Special Functions.   (line  47)
+-* mpfr_coth:                             Special Functions.   (line 111)
+-* mpfr_csc:                              Special Functions.   (line  46)
+-* mpfr_csch:                             Special Functions.   (line 110)
++* mpfr_cos:                              Special Functions.   (line  31)
++* mpfr_cosh:                             Special Functions.   (line  97)
++* mpfr_cot:                              Special Functions.   (line  49)
++* mpfr_coth:                             Special Functions.   (line 113)
++* mpfr_csc:                              Special Functions.   (line  48)
++* mpfr_csch:                             Special Functions.   (line 112)
+ * mpfr_custom_get_exp:                   Custom Interface.    (line  75)
+ * mpfr_custom_get_kind:                  Custom Interface.    (line  65)
+ * mpfr_custom_get_significand:           Custom Interface.    (line  70)
+@@ -3756,47 +3774,47 @@
+ * mpfr_custom_move:                      Custom Interface.    (line  82)
+ * MPFR_DECL_INIT:                        Initialization Functions.
+                                                               (line  74)
+-* mpfr_digamma:                          Special Functions.   (line 166)
++* mpfr_digamma:                          Special Functions.   (line 172)
+ * mpfr_dim:                              Basic Arithmetic Functions.
+-                                                              (line 166)
++                                                              (line 171)
+ * mpfr_div:                              Basic Arithmetic Functions.
+-                                                              (line  72)
++                                                              (line  74)
+ * mpfr_divby0_p:                         Exception Related Functions.
+                                                               (line 134)
+ * mpfr_div_2exp:                         Compatibility with MPF.
+                                                               (line  49)
+ * mpfr_div_2si:                          Basic Arithmetic Functions.
+-                                                              (line 181)
++                                                              (line 186)
+ * mpfr_div_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 179)
++                                                              (line 184)
+ * mpfr_div_d:                            Basic Arithmetic Functions.
+-                                                              (line  84)
++                                                              (line  86)
+ * mpfr_div_q:                            Basic Arithmetic Functions.
+-                                                              (line  88)
++                                                              (line  90)
+ * mpfr_div_si:                           Basic Arithmetic Functions.
+-                                                              (line  80)
++                                                              (line  82)
+ * mpfr_div_ui:                           Basic Arithmetic Functions.
+-                                                              (line  76)
++                                                              (line  78)
+ * mpfr_div_z:                            Basic Arithmetic Functions.
+-                                                              (line  86)
++                                                              (line  88)
+ * mpfr_d_div:                            Basic Arithmetic Functions.
+-                                                              (line  82)
++                                                              (line  84)
+ * mpfr_d_sub:                            Basic Arithmetic Functions.
+-                                                              (line  35)
+-* mpfr_eint:                             Special Functions.   (line 133)
++                                                              (line  36)
++* mpfr_eint:                             Special Functions.   (line 135)
+ * mpfr_eq:                               Compatibility with MPF.
+                                                               (line  28)
+ * mpfr_equal_p:                          Comparison Functions.
+                                                               (line  59)
+ * mpfr_erangeflag_p:                     Exception Related Functions.
+                                                               (line 137)
+-* mpfr_erf:                              Special Functions.   (line 177)
+-* mpfr_erfc:                             Special Functions.   (line 178)
+-* mpfr_exp:                              Special Functions.   (line  23)
+-* mpfr_exp10:                            Special Functions.   (line  25)
+-* mpfr_exp2:                             Special Functions.   (line  24)
+-* mpfr_expm1:                            Special Functions.   (line 129)
+-* mpfr_fac_ui:                           Special Functions.   (line 121)
++* mpfr_erf:                              Special Functions.   (line 183)
++* mpfr_erfc:                             Special Functions.   (line 184)
++* mpfr_exp:                              Special Functions.   (line  25)
++* mpfr_exp10:                            Special Functions.   (line  27)
++* mpfr_exp2:                             Special Functions.   (line  26)
++* mpfr_expm1:                            Special Functions.   (line 131)
++* mpfr_fac_ui:                           Special Functions.   (line 123)
+ * mpfr_fits_intmax_p:                    Conversion Functions.
+                                                               (line 150)
+ * mpfr_fits_sint_p:                      Conversion Functions.
+@@ -3815,20 +3833,20 @@
+                                                               (line 147)
+ * mpfr_floor:                            Integer Related Functions.
+                                                               (line   8)
+-* mpfr_fma:                              Special Functions.   (line 203)
++* mpfr_fma:                              Special Functions.   (line 209)
+ * mpfr_fmod:                             Integer Related Functions.
+                                                               (line  92)
+-* mpfr_fms:                              Special Functions.   (line 205)
++* mpfr_fms:                              Special Functions.   (line 211)
+ * mpfr_fprintf:                          Formatted Output Functions.
+                                                               (line 157)
+ * mpfr_frac:                             Integer Related Functions.
+                                                               (line  76)
+-* mpfr_free_cache:                       Special Functions.   (line 244)
++* mpfr_free_cache:                       Special Functions.   (line 254)
+ * mpfr_free_str:                         Conversion Functions.
+                                                               (line 137)
+ * mpfr_frexp:                            Conversion Functions.
+                                                               (line  45)
+-* mpfr_gamma:                            Special Functions.   (line 148)
++* mpfr_gamma:                            Special Functions.   (line 150)
+ * mpfr_get_d:                            Conversion Functions.
+                                                               (line   7)
+ * mpfr_get_decimal64:                    Conversion Functions.
+@@ -3887,7 +3905,7 @@
+                                                               (line  56)
+ * mpfr_greater_p:                        Comparison Functions.
+                                                               (line  55)
+-* mpfr_hypot:                            Special Functions.   (line 218)
++* mpfr_hypot:                            Special Functions.   (line 227)
+ * mpfr_inexflag_p:                       Exception Related Functions.
+                                                               (line 136)
+ * mpfr_inf_p:                            Comparison Functions.
+@@ -3922,21 +3940,21 @@
+                                                               (line  31)
+ * mpfr_integer_p:                        Integer Related Functions.
+                                                               (line 119)
+-* mpfr_j0:                               Special Functions.   (line 182)
+-* mpfr_j1:                               Special Functions.   (line 183)
+-* mpfr_jn:                               Special Functions.   (line 184)
++* mpfr_j0:                               Special Functions.   (line 188)
++* mpfr_j1:                               Special Functions.   (line 189)
++* mpfr_jn:                               Special Functions.   (line 190)
+ * mpfr_lessequal_p:                      Comparison Functions.
+                                                               (line  58)
+ * mpfr_lessgreater_p:                    Comparison Functions.
+                                                               (line  64)
+ * mpfr_less_p:                           Comparison Functions.
+                                                               (line  57)
+-* mpfr_lgamma:                           Special Functions.   (line 157)
+-* mpfr_li2:                              Special Functions.   (line 143)
+-* mpfr_lngamma:                          Special Functions.   (line 152)
++* mpfr_lgamma:                           Special Functions.   (line 162)
++* mpfr_li2:                              Special Functions.   (line 145)
++* mpfr_lngamma:                          Special Functions.   (line 154)
+ * mpfr_log:                              Special Functions.   (line  16)
+ * mpfr_log10:                            Special Functions.   (line  18)
+-* mpfr_log1p:                            Special Functions.   (line 125)
++* mpfr_log1p:                            Special Functions.   (line 127)
+ * mpfr_log2:                             Special Functions.   (line  17)
+ * mpfr_max:                              Miscellaneous Functions.
+                                                               (line  22)
+@@ -3947,29 +3965,29 @@
+ * mpfr_modf:                             Integer Related Functions.
+                                                               (line  82)
+ * mpfr_mul:                              Basic Arithmetic Functions.
+-                                                              (line  51)
++                                                              (line  53)
+ * mpfr_mul_2exp:                         Compatibility with MPF.
+                                                               (line  47)
+ * mpfr_mul_2si:                          Basic Arithmetic Functions.
+-                                                              (line 174)
++                                                              (line 179)
+ * mpfr_mul_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 172)
++                                                              (line 177)
+ * mpfr_mul_d:                            Basic Arithmetic Functions.
+-                                                              (line  57)
++                                                              (line  59)
+ * mpfr_mul_q:                            Basic Arithmetic Functions.
+-                                                              (line  61)
++                                                              (line  63)
+ * mpfr_mul_si:                           Basic Arithmetic Functions.
+-                                                              (line  55)
++                                                              (line  57)
+ * mpfr_mul_ui:                           Basic Arithmetic Functions.
+-                                                              (line  53)
++                                                              (line  55)
+ * mpfr_mul_z:                            Basic Arithmetic Functions.
+-                                                              (line  59)
++                                                              (line  61)
+ * mpfr_nanflag_p:                        Exception Related Functions.
+                                                               (line 135)
+ * mpfr_nan_p:                            Comparison Functions.
+                                                               (line  39)
+ * mpfr_neg:                              Basic Arithmetic Functions.
+-                                                              (line 159)
++                                                              (line 164)
+ * mpfr_nextabove:                        Miscellaneous Functions.
+                                                               (line  15)
+ * mpfr_nextbelow:                        Miscellaneous Functions.
+@@ -3983,13 +4001,13 @@
+ * mpfr_overflow_p:                       Exception Related Functions.
+                                                               (line 133)
+ * mpfr_pow:                              Basic Arithmetic Functions.
+-                                                              (line 116)
++                                                              (line 121)
+ * mpfr_pow_si:                           Basic Arithmetic Functions.
+-                                                              (line 120)
++                                                              (line 125)
+ * mpfr_pow_ui:                           Basic Arithmetic Functions.
+-                                                              (line 118)
++                                                              (line 123)
+ * mpfr_pow_z:                            Basic Arithmetic Functions.
+-                                                              (line 122)
++                                                              (line 127)
+ * mpfr_prec_round:                       Rounding Related Functions.
+                                                               (line  13)
+ * ‘mpfr_prec_t’:                         Nomenclature and Types.
+@@ -3999,7 +4017,7 @@
+ * mpfr_print_rnd_mode:                   Rounding Related Functions.
+                                                               (line  71)
+ * mpfr_rec_sqrt:                         Basic Arithmetic Functions.
+-                                                              (line 103)
++                                                              (line 105)
+ * mpfr_regular_p:                        Comparison Functions.
+                                                               (line  43)
+ * mpfr_reldiff:                          Compatibility with MPF.
+@@ -4021,11 +4039,11 @@
+ * ‘mpfr_rnd_t’:                          Nomenclature and Types.
+                                                               (line  34)
+ * mpfr_root:                             Basic Arithmetic Functions.
+-                                                              (line 109)
++                                                              (line 114)
+ * mpfr_round:                            Integer Related Functions.
+                                                               (line   9)
+-* mpfr_sec:                              Special Functions.   (line  45)
+-* mpfr_sech:                             Special Functions.   (line 109)
++* mpfr_sec:                              Special Functions.   (line  47)
++* mpfr_sech:                             Special Functions.   (line 111)
+ * mpfr_set:                              Assignment Functions.
+                                                               (line   9)
+ * mpfr_setsign:                          Miscellaneous Functions.
+@@ -4100,57 +4118,57 @@
+                                                               (line  49)
+ * mpfr_signbit:                          Miscellaneous Functions.
+                                                               (line  99)
+-* mpfr_sin:                              Special Functions.   (line  30)
+-* mpfr_sinh:                             Special Functions.   (line  96)
+-* mpfr_sinh_cosh:                        Special Functions.   (line 101)
+-* mpfr_sin_cos:                          Special Functions.   (line  35)
++* mpfr_sin:                              Special Functions.   (line  32)
++* mpfr_sinh:                             Special Functions.   (line  98)
++* mpfr_sinh_cosh:                        Special Functions.   (line 103)
++* mpfr_sin_cos:                          Special Functions.   (line  37)
+ * mpfr_si_div:                           Basic Arithmetic Functions.
+-                                                              (line  78)
++                                                              (line  80)
+ * mpfr_si_sub:                           Basic Arithmetic Functions.
+-                                                              (line  31)
++                                                              (line  32)
+ * mpfr_snprintf:                         Formatted Output Functions.
+                                                               (line 180)
+ * mpfr_sprintf:                          Formatted Output Functions.
+                                                               (line 170)
+ * mpfr_sqr:                              Basic Arithmetic Functions.
+-                                                              (line  69)
++                                                              (line  71)
+ * mpfr_sqrt:                             Basic Arithmetic Functions.
+-                                                              (line  96)
++                                                              (line  98)
+ * mpfr_sqrt_ui:                          Basic Arithmetic Functions.
+-                                                              (line  97)
++                                                              (line  99)
+ * mpfr_strtofr:                          Assignment Functions.
+                                                               (line  80)
+ * mpfr_sub:                              Basic Arithmetic Functions.
+-                                                              (line  25)
++                                                              (line  26)
+ * mpfr_subnormalize:                     Exception Related Functions.
+                                                               (line  60)
+ * mpfr_sub_d:                            Basic Arithmetic Functions.
+-                                                              (line  37)
++                                                              (line  38)
+ * mpfr_sub_q:                            Basic Arithmetic Functions.
+-                                                              (line  43)
++                                                              (line  44)
+ * mpfr_sub_si:                           Basic Arithmetic Functions.
+-                                                              (line  33)
++                                                              (line  34)
+ * mpfr_sub_ui:                           Basic Arithmetic Functions.
+-                                                              (line  29)
++                                                              (line  30)
+ * mpfr_sub_z:                            Basic Arithmetic Functions.
+-                                                              (line  41)
+-* mpfr_sum:                              Special Functions.   (line 252)
++                                                              (line  42)
++* mpfr_sum:                              Special Functions.   (line 262)
+ * mpfr_swap:                             Assignment Functions.
+                                                               (line 150)
+ * ‘mpfr_t’:                              Nomenclature and Types.
+                                                               (line   6)
+-* mpfr_tan:                              Special Functions.   (line  31)
+-* mpfr_tanh:                             Special Functions.   (line  97)
++* mpfr_tan:                              Special Functions.   (line  33)
++* mpfr_tanh:                             Special Functions.   (line  99)
+ * mpfr_trunc:                            Integer Related Functions.
+                                                               (line  10)
+ * mpfr_ui_div:                           Basic Arithmetic Functions.
+-                                                              (line  74)
++                                                              (line  76)
+ * mpfr_ui_pow:                           Basic Arithmetic Functions.
+-                                                              (line 126)
++                                                              (line 131)
+ * mpfr_ui_pow_ui:                        Basic Arithmetic Functions.
+-                                                              (line 124)
++                                                              (line 129)
+ * mpfr_ui_sub:                           Basic Arithmetic Functions.
+-                                                              (line  27)
++                                                              (line  28)
+ * mpfr_underflow_p:                      Exception Related Functions.
+                                                               (line 132)
+ * mpfr_unordered_p:                      Comparison Functions.
+@@ -4181,61 +4199,61 @@
+                                                               (line 182)
+ * mpfr_vsprintf:                         Formatted Output Functions.
+                                                               (line 171)
+-* mpfr_y0:                               Special Functions.   (line 193)
+-* mpfr_y1:                               Special Functions.   (line 194)
+-* mpfr_yn:                               Special Functions.   (line 195)
++* mpfr_y0:                               Special Functions.   (line 199)
++* mpfr_y1:                               Special Functions.   (line 200)
++* mpfr_yn:                               Special Functions.   (line 201)
+ * mpfr_zero_p:                           Comparison Functions.
+                                                               (line  42)
+-* mpfr_zeta:                             Special Functions.   (line 171)
+-* mpfr_zeta_ui:                          Special Functions.   (line 172)
++* mpfr_zeta:                             Special Functions.   (line 177)
++* mpfr_zeta_ui:                          Special Functions.   (line 178)
+ * mpfr_z_sub:                            Basic Arithmetic Functions.
+-                                                              (line  39)
++                                                              (line  40)
+ 
+ 
+ 
+ Tag Table:
+ Node: Top775
+ Node: Copying2007
+-Node: Introduction to MPFR3766
+-Node: Installing MPFR5880
+-Node: Reporting Bugs11323
+-Node: MPFR Basics13353
+-Node: Headers and Libraries13669
+-Node: Nomenclature and Types16828
+-Node: MPFR Variable Conventions18874
+-Node: Rounding Modes20418
+-Ref: ternary value21544
+-Node: Floating-Point Values on Special Numbers23526
+-Node: Exceptions26572
+-Node: Memory Handling29749
+-Node: MPFR Interface30894
+-Node: Initialization Functions33008
+-Node: Assignment Functions40318
+-Node: Combined Initialization and Assignment Functions49673
+-Node: Conversion Functions50974
+-Node: Basic Arithmetic Functions60035
+-Node: Comparison Functions69200
+-Node: Special Functions72687
+-Node: Input and Output Functions86672
+-Node: Formatted Output Functions88644
+-Node: Integer Related Functions98431
+-Node: Rounding Related Functions105051
+-Node: Miscellaneous Functions108888
+-Node: Exception Related Functions117568
+-Node: Compatibility with MPF124386
+-Node: Custom Interface127127
+-Node: Internals131526
+-Node: API Compatibility133066
+-Node: Type and Macro Changes134995
+-Node: Added Functions137844
+-Node: Changed Functions141132
+-Node: Removed Functions145545
+-Node: Other Changes145973
+-Node: Contributors147576
+-Node: References150219
+-Node: GNU Free Documentation License151973
+-Node: Concept Index174562
+-Node: Function and Type Index180659
++Node: Introduction to MPFR3770
++Node: Installing MPFR5884
++Node: Reporting Bugs11327
++Node: MPFR Basics13357
++Node: Headers and Libraries13673
++Node: Nomenclature and Types16832
++Node: MPFR Variable Conventions18894
++Node: Rounding Modes20438
++Ref: ternary value21568
++Node: Floating-Point Values on Special Numbers23554
++Node: Exceptions26813
++Node: Memory Handling29990
++Node: MPFR Interface31135
++Node: Initialization Functions33249
++Node: Assignment Functions40559
++Node: Combined Initialization and Assignment Functions49914
++Node: Conversion Functions51215
++Node: Basic Arithmetic Functions60276
++Node: Comparison Functions69777
++Node: Special Functions73264
++Node: Input and Output Functions87862
++Node: Formatted Output Functions89834
++Node: Integer Related Functions99621
++Node: Rounding Related Functions106241
++Node: Miscellaneous Functions110078
++Node: Exception Related Functions118758
++Node: Compatibility with MPF125576
++Node: Custom Interface128317
++Node: Internals132716
++Node: API Compatibility134260
++Node: Type and Macro Changes136189
++Node: Added Functions139038
++Node: Changed Functions142326
++Node: Removed Functions146739
++Node: Other Changes147167
++Node: Contributors148770
++Node: References151413
++Node: GNU Free Documentation License153167
++Node: Concept Index175760
++Node: Function and Type Index181857
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
+--- mpfr-3.1.3-a/src/lngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/lngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -603,16 +603,17 @@
+       mpfr_get_prec (y), mpfr_log_prec, y, inex));
+ 
+   /* special cases */
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
++                     (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
+     {
+-      if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
++      if (MPFR_IS_NAN (x))
+         {
+           MPFR_SET_NAN (y);
+           MPFR_RET_NAN;
+         }
+-      else /* lngamma(+Inf) = lngamma(+0) = +Inf */
++      else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
+         {
+-          if (MPFR_IS_ZERO (x))
++          if (!MPFR_IS_INF (x))
+             mpfr_set_divby0 ();
+           MPFR_SET_INF (y);
+           MPFR_SET_POS (y);
+@@ -620,8 +621,8 @@
+         }
+     }
+ 
+-  /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
+-  if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
++  /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
++  if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
+     {
+       MPFR_SET_NAN (y);
+       MPFR_RET_NAN;
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3"
++#define MPFR_VERSION_STRING "3.1.3-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:49:24.042113845 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3";
++  return "3.1.3-p1";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
+--- mpfr-3.1.3-a/tests/tlngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tlngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -33,7 +33,7 @@
+ special (void)
+ {
+   mpfr_t x, y;
+-  int inex;
++  int i, inex;
+ 
+   mpfr_init (x);
+   mpfr_init (y);
+@@ -46,25 +46,29 @@
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, -1);
++  mpfr_set_inf (x, 1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(-Inf)\n");
++      printf ("Error for lngamma(+Inf)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, 1);
++  mpfr_set_inf (x, -1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(+Inf)\n");
++      printf ("Error for lngamma(-Inf)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(+0)\n");
+       exit (1);
+@@ -72,32 +76,58 @@
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+   mpfr_neg (x, x, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(-0)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(1)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  for (i = 1; i <= 5; i++)
+     {
+-      printf ("Error for lngamma(-1)\n");
+-      exit (1);
++      int c;
++
++      mpfr_set_si (x, -i, MPFR_RNDN);
++      mpfr_clear_flags ();
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++          __gmpfr_flags != MPFR_FLAGS_DIVBY0)
++        {
++          printf ("Error for lngamma(-%d)\n", i);
++          exit (1);
++        }
++      if (i & 1)
++        {
++          mpfr_nextabove (x);
++          c = '+';
++        }
++      else
++        {
++          mpfr_nextbelow (x);
++          c = '-';
++        }
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_nan_p (y))
++        {
++          printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
++          exit (1);
++        }
+     }
+ 
+   mpfr_set_ui (x, 2, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(2)\n");
+       exit (1);
+@@ -127,7 +157,7 @@
+   mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
++  if (mpfr_cmp0 (y, x))
+     {
+       printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
+               "expected ");
+@@ -143,7 +173,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDU);
+   mpfr_set_prec (x, 175);
+   mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (1)\n");
+       exit (1);
+@@ -155,7 +185,7 @@
+   mpfr_lngamma (x, y, MPFR_RNDZ);
+   mpfr_set_prec (y, 21);
+   mpfr_set_str_binary (y, "0.111000101000001100101E9");
+-  if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (120)\n");
+       printf ("Expected "); mpfr_print_binary (y); puts ("");
+@@ -169,7 +199,7 @@
+   inex = mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 206);
+   mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (768)\n");
+       exit (1);
+@@ -185,7 +215,7 @@
+   mpfr_set_str_binary (x, "0.1100E-66");
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str_binary (x, "0.1100E6");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(0.1100E-66)\n");
+       exit (1);
+@@ -199,7 +229,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 32);
+   mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(-2^199+0.5)\n");
+       printf ("Got        ");
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:50:08.046573308 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:50:08.126574142 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-overflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:50:08.126574142 +0000
+@@ -1 +1 @@
+-3.1.3-p1
++3.1.3-p2
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -49,7 +49,7 @@
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+-      else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
++      else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
+                                        exp > __gmpfr_emax + n)) )
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+ 
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
+@@ -32,7 +32,7 @@
+      rnd_mode),
+     ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
+ 
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
+     return mpfr_set (y, x, rnd_mode);
+   else
+     {
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p1"
++#define MPFR_VERSION_STRING "3.1.3-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -39,7 +39,7 @@
+     {
+       mpfr_exp_t exp = MPFR_GET_EXP (x);
+       MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
+-      if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
++      if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+                                    exp > __gmpfr_emax - n)))
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+       else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:50:08.126574142 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p1";
++  return "3.1.3-p2";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
+@@ -242,6 +242,76 @@
+   large (MPFR_EMAX_MAX);
+ }
+ 
++/* Cases where the function overflows on n = 0 when rounding is like
++   away from zero. */
++static void
++overflow0 (mpfr_exp_t emax)
++{
++  mpfr_exp_t old_emax;
++  mpfr_t x, y1, y2;
++  int neg, r, op;
++  static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
++
++  old_emax = mpfr_get_emax ();
++  set_emax (emax);
++
++  mpfr_init2 (x, 8);
++  mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_inf (x, 1);
++  mpfr_nextbelow (x);
++
++  for (neg = 0; neg <= 1; neg++)
++    {
++      RND_LOOP (r)
++        {
++          int inex1, inex2;
++          unsigned int flags1, flags2;
++
++          /* Even if there isn't an overflow (rounding ~ toward zero),
++             the result is the same as the one of an overflow. */
++          inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
++          flags1 = MPFR_FLAGS_INEXACT;
++          if (mpfr_inf_p (y1))
++            flags1 |= MPFR_FLAGS_OVERFLOW;
++          for (op = 0; op < 4; op++)
++            {
++              mpfr_clear_flags ();
++              inex2 =
++                op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                (MPFR_ASSERTN (0), 0);
++              flags2 = __gmpfr_flags;
++              if (!(mpfr_equal_p (y1, y2) &&
++                    SAME_SIGN (inex1, inex2) &&
++                    flags1 == flags2))
++                {
++                  printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
++                          MPFR_EXP_FSPEC "d,\nx = ",
++                          mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
++                          (mpfr_eexp_t) emax);
++                  mpfr_dump (x);
++                  printf ("Expected ");
++                  mpfr_dump (y1);
++                  printf ("  with inex = %d, flags =", inex1);
++                  flags_out (flags1);
++                  printf ("Got      ");
++                  mpfr_dump (y2);
++                  printf ("  with inex = %d, flags =", inex2);
++                  flags_out (flags2);
++                  exit (1);
++                }
++            }
++        }
++      mpfr_neg (x, x, MPFR_RNDN);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emax (old_emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -334,6 +404,11 @@
+   underflow0 ();
+   large0 ();
+ 
++  if (mpfr_get_emax () != MPFR_EMAX_MAX)
++    overflow0 (mpfr_get_emax ());
++  overflow0 (MPFR_EMAX_MAX);
++  overflow0 (-1);
++
+   tests_end_mpfr ();
+   return 0;
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:54:48.592799981 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:54:48.616811495 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-underflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:54:48.616811495 +0000
+@@ -1 +1 @@
+-3.1.3-p2
++3.1.3-p3
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -45,7 +45,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
+                exp < __gmpfr_emin + (n - 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-17 08:54:48.608807656 +0000
+@@ -44,7 +44,9 @@
+       if (MPFR_UNLIKELY (n >= diffexp))  /* exp - n <= emin - 1 */
+         {
+           if (rnd_mode == MPFR_RNDN &&
+-              (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
++              (n > diffexp ||
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p2"
++#define MPFR_VERSION_STRING "3.1.3-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -48,7 +48,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+                exp < __gmpfr_emin - (n + 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:54:48.616811495 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p2";
++  return "3.1.3-p3";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-17 08:54:48.608807656 +0000
+@@ -50,77 +50,82 @@
+ {
+   mpfr_t x, y, z1, z2;
+   mpfr_exp_t emin;
+-  int i, k;
++  int i, k, s;
+   int prec;
+   int rnd;
+   int div;
+   int inex1, inex2;
+   unsigned int flags1, flags2;
+ 
+-  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
+-   * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
+-   * by comparing the result with the one of a simple division.
++  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
++   * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
++   * k = 1 to 4, by comparing the result with the one of a simple division.
+    */
+   emin = mpfr_get_emin ();
+   set_emin (e);
+   mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
+   for (i = 15; i <= 17; i++)
+-    {
+-      inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
+-      MPFR_ASSERTN (inex1 == 0);
+-      for (prec = 6; prec >= 3; prec -= 3)
+-        {
+-          mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
+-          RND_LOOP (rnd)
+-            for (k = 1; k <= 4; k++)
+-              {
+-                /* The following one is assumed to be correct. */
+-                inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                mpfr_clear_flags ();
+-                /* Do not use mpfr_div_ui to avoid the optimization
+-                   by mpfr_div_2si. */
+-                inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
+-                flags1 = __gmpfr_flags;
+-
+-              for (div = 0; div <= 2; div++)
++    for (s = 1; s >= -1; s -= 2)
++      {
++        inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
++        MPFR_ASSERTN (inex1 == 0);
++        for (prec = 6; prec >= 3; prec -= 3)
++          {
++            mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
++            RND_LOOP (rnd)
++              for (k = 1; k <= 4; k++)
+                 {
++                  /* The following one is assumed to be correct. */
++                  inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
++                  inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
+                   mpfr_clear_flags ();
+-                  inex2 = div == 0 ?
+-                    mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
+-                    mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
+-                    mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
+-                  flags2 = __gmpfr_flags;
+-                  if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
+-                      mpfr_equal_p (z1, z2))
+-                    continue;
+-                  printf ("Error in underflow(");
+-                  if (e == MPFR_EMIN_MIN)
+-                    printf ("MPFR_EMIN_MIN");
+-                  else if (e == emin)
+-                    printf ("default emin");
+-                  else if (e >= LONG_MIN)
+-                    printf ("%ld", (long) e);
+-                  else
+-                    printf ("<LONG_MIN");
+-                  printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
+-                          "%s\n", div == 0 ? "mul_2si" : div == 1 ?
+-                          "div_2si" : "div_2ui", i, prec, k,
+-                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
+-                  printf ("Expected ");
+-                  mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
+-                  printf ("Got      ");
+-                  mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
+-                  exit (1);
+-                }  /* div */
+-              }  /* k */
+-          mpfr_clears (z1, z2, (mpfr_ptr) 0);
+-        }  /* prec */
+-    }  /* i */
++                  /* Do not use mpfr_div_ui to avoid the optimization
++                     by mpfr_div_2si. */
++                  inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
++                  flags1 = __gmpfr_flags;
++
++                  for (div = 0; div <= 2; div++)
++                    {
++                      mpfr_clear_flags ();
++                      inex2 =
++                        div == 0 ?
++                        mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
++                        div == 1 ?
++                        mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
++                        mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
++                      flags2 = __gmpfr_flags;
++                      if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                          mpfr_equal_p (z1, z2))
++                        continue;
++                      printf ("Error in underflow(");
++                      if (e == MPFR_EMIN_MIN)
++                        printf ("MPFR_EMIN_MIN");
++                      else if (e == emin)
++                        printf ("default emin");
++                      else if (e >= LONG_MIN)
++                        printf ("%ld", (long) e);
++                      else
++                        printf ("<LONG_MIN");
++                      printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
++                              " %s\n", div == 0 ? "mul_2si" : div == 1 ?
++                              "div_2si" : "div_2ui", s * i, prec, k,
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
++                      printf ("Expected ");
++                      mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex1), flags1);
++                      printf ("Got      ");
++                      mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex2), flags2);
++                      exit (1);
++                    }  /* div */
++                }  /* k */
++            mpfr_clears (z1, z2, (mpfr_ptr) 0);
++          }  /* prec */
++      }  /* i */
+   mpfr_clears (x, y, (mpfr_ptr) 0);
+   set_emin (emin);
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:58:21.094987384 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:58:21.118986898 +0000
+@@ -0,0 +1 @@
++frexp
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:58:21.118986898 +0000
+@@ -1 +1 @@
+-3.1.3-p3
++3.1.3-p4
+diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
+--- mpfr-3.1.3-a/src/frexp.c	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/src/frexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -26,6 +26,13 @@
+ mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+   int inex;
++  unsigned int saved_flags = __gmpfr_flags;
++  MPFR_BLOCK_DECL (flags);
++
++  MPFR_LOG_FUNC
++    (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
++     ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
++      mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
+ 
+   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
+     {
+@@ -49,8 +56,32 @@
+         }
+     }
+ 
+-  inex = mpfr_set (y, x, rnd);
++  MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
++  __gmpfr_flags = saved_flags;
++
++  /* Possible overflow due to the rounding, no possible underflow. */
++
++  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
++    {
++      int inex2;
++
++      /* An overflow here means that the exponent of y would be larger than
++         the one of x, thus x would be rounded to the next power of 2, and
++         the returned y should be 1/2 in absolute value, rounded (i.e. with
++         possible underflow or overflow). This also implies that x and y are
++         different objects, so that the exponent of x has not been lost. */
++      MPFR_LOG_MSG (("Internal overflow\n", 0));
++      MPFR_ASSERTD (x != y);
++      *exp = MPFR_GET_EXP (x) + 1;
++      inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
++      MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
++      if (inex2 != 0)
++        inex = inex2;
++      MPFR_RET (inex);
++    }
++
+   *exp = MPFR_GET_EXP (y);
+-  MPFR_SET_EXP (y, 0);
++  /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
++  MPFR_EXP (y) = 0;
+   return mpfr_check_range (y, inex, rnd);
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p3"
++#define MPFR_VERSION_STRING "3.1.3-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:58:21.118986898 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p3";
++  return "3.1.3-p4";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
+--- mpfr-3.1.3-a/tests/tfrexp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tfrexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -129,12 +129,115 @@
+   mpfr_clear (x);
+ }
+ 
++static void check1 (void)
++{
++  mpfr_exp_t emin, emax, e;
++  mpfr_t x, y1, y2;
++  int r, neg, red;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  mpfr_init2 (x, 7);
++  mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
++  while (mpfr_regular_p (x))
++    {
++      /* Test the exponents up to 3 and with the maximum exponent
++         (to check potential intermediate overflow). */
++      if (MPFR_GET_EXP (x) == 4)
++        mpfr_set_exp (x, MPFR_EMAX_MAX);
++      e = MPFR_GET_EXP (x);
++      for (neg = 0; neg < 2; neg++)
++        {
++          RND_LOOP (r)
++            {
++              int inex1, inex2;
++              mpfr_exp_t e1, e2;
++              unsigned int flags1, flags2;
++
++              for (red = 0; red < 2; red++)
++                {
++                  if (red)
++                    {
++                      /* e1: exponent of the rounded value of x. */
++                      MPFR_ASSERTN (e1 == e || e1 == e + 1);
++                      set_emin (e);
++                      set_emax (e);
++                      mpfr_clear_flags ();
++                      inex1 = e1 < 0 ?
++                        mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
++                        mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
++                      flags1 = __gmpfr_flags;
++                    }
++                  else
++                    {
++                      inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
++                      e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
++                      flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
++                    }
++                  mpfr_clear_flags ();
++                  inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
++                  flags2 = __gmpfr_flags;
++                  set_emin (MPFR_EMIN_MIN);
++                  set_emax (MPFR_EMAX_MAX);
++                  if ((!red || e == 0) &&
++                      (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected 1/2 <= |y| < 1, got y = ");
++                      mpfr_dump (y2);
++                      exit (1);
++                    }
++                  if (!red)
++                    {
++                      if (e2 > 0)
++                        mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
++                      else if (e2 < 0)
++                        mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
++                    }
++                  if (! (SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (y1, y2) &&
++                         flags1 == flags2))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected y1 = ");
++                      mpfr_dump (y1);
++                      printf ("Got      y2 = ");
++                      mpfr_dump (y2);
++                      printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
++                      printf ("Expected flags:");
++                      flags_out (flags1);
++                      printf ("Got flags:     ");
++                      flags_out (flags2);
++                      exit (1);
++                    }
++                }
++            }
++          mpfr_neg (x, x, MPFR_RNDN);
++        }
++      mpfr_nextabove (x);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+   tests_start_mpfr ();
+ 
+   check_special ();
++  check1 ();
+ 
+   tests_end_mpfr ();
+   return 0;
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index 4aecfa4b01a..2fa62ced2d5 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -1,16 +1,19 @@
-{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}:
+{stdenv, fetchFromGitHub, libX11, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "mygui-3.2.0";
+  name = "mygui-${version}";
+  version = "3.2.2";
   
-  src = fetchurl {
-    url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip;
-    sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p";
+  src = fetchFromGitHub {
+    owner = "MyGUI";
+    repo = "mygui";
+    rev = "MyGUI${version}";
+    sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ];
+  buildInputs = [ libX11 unzip ogre cmake ois freetype libuuid boost pkgconfig ];
 
   meta = {
     homepage = http://mygui.info/;
diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix
index a74cd81854e..88f6740f733 100644
--- a/pkgs/development/libraries/ncbi/default.nix
+++ b/pkgs/development/libraries/ncbi/default.nix
@@ -1,11 +1,11 @@
-a :  
-let 
+a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
+let
   fetchurl = a.fetchurl;
 
-  version = "20090809"; 
+  version = "20090809";
   buildInputs = with a; [
-    tcsh libX11 libXaw lesstif xproto mesa libXt 
-    libSM libICE libXmu libXext 
+    tcsh libX11 libXaw lesstif xproto mesa libXt
+    libSM libICE libXmu libXext
   ];
 in
 rec {
@@ -40,7 +40,7 @@ rec {
     cp ../make/makedis.csh $out/share/${name}/build-snapshot
     cp *.h $out/include 
     cp *.c *.h $out/source
-    find . -perm +111 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';'
+    find . -perm -0100 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';'
   '') ["defEnsureDir" "build" "minInit"];
       
   name = "NCBI-Toolbox-" + version;
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index a4b8c8d4567..c505d89a6d8 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,15 +1,14 @@
-{ lib, stdenv, fetchurl, unicode ? true }:
-
-let
-  /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3:
-     <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
-     It seems that it could be worked around by #including <wchar.h> in the
-     right place, according to
-     <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
-     but this is left as an exercise to the reader.
-     So disable them for now.  */
-  cxx = !stdenv.isSunOS;
-in
+{ lib, stdenv, fetchurl
+
+, mouseSupport ? false
+, unicode ? true
+
+, gpm
+
+# Extra Options
+, abiVersion ? "5"
+}:
+
 stdenv.mkDerivation rec {
   name = "ncurses-5.9";
 
@@ -18,54 +17,74 @@ stdenv.mkDerivation rec {
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   };
 
-  patches = [ ./patch-ac ./clang.patch ];
+  # gcc-5.patch should be removed after 5.9
+  patches = [ ./clang.patch ./gcc-5.patch ];
 
-  configureFlags = ''
-    --with-shared --without-debug --enable-pc-files --enable-symlinks
-    ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
-  '';
+  configureFlags = [
+    "--with-shared"
+    "--without-debug"
+    "--enable-pc-files"
+    "--enable-symlinks"
+  ] ++ lib.optional unicode "--enable-widec";
+
+  buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
-  # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
-  # directory doesn't exist, the configure script will disable installation of
-  # *.pc files. The configure script usually (on LSB distros) pick $(path of
-  # pkg-config)/../lib/pkgconfig. On NixOS that path doesn't exist and is not
-  # the place we want to put *.pc files from other packages anyway. So we must
-  # tell it explicitly where to install with PKG_CONFIG_LIBDIR.
   preConfigure = ''
-    export configureFlags="$configureFlags --includedir=$out/include"
+    configureFlagsArray+=("--includedir=$out/include")
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
+  '' + lib.optionalString stdenv.isCygwin ''
+    sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
   selfNativeBuildInput = true;
 
   enableParallelBuilding = true;
 
-  preBuild =
-    # On Darwin, we end up using the native `sed' during bootstrap, and it
-    # fails to run this command, which isn't needed anyway.
-    lib.optionalString (!stdenv.isDarwin)
-      ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
+  doCheck = false;
 
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
-  postInstall = if unicode then ''
-    ${if cxx then "chmod 644 $out/lib/libncurses++w.a" else ""}
-    for lib in curses ncurses form panel menu; do
-      if test -e $out/lib/lib''${lib}w.a; then
-        rm -f $out/lib/lib$lib.so
-        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
-        ln -svf lib''${lib}w.a $out/lib/lib$lib.a
-        ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
-        ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
-      fi
-    done;
-    ln -svf . $out/include/ncursesw
-    ln -svf ncursesw5-config $out/bin/ncurses5-config
-  '' else "";
-
-  postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so";
+  postInstall = ''
+    # Determine what suffixes our libraries have
+    suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)"
+    libs="$(ls $out/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")"
+    suffixes="$(echo "$suffix" | awk '{for (i=1; i < length($0); i++) {x=substr($0, i+1, length($0)-i); print x}}')"
+
+    # Get the path to the config util
+    cfg=$(basename $out/bin/ncurses*-config)
+
+    # symlink the full suffixed include directory
+    ln -svf . $out/include/ncurses$suffix
+
+    for newsuffix in $suffixes ""; do
+      # Create a non-abi versioned config util links
+      ln -svf $cfg $out/bin/ncurses$newsuffix-config
+
+      # Allow for end users who #include <ncurses?w/*.h>
+      ln -svf . $out/include/ncurses$newsuffix
+
+      for lib in $libs; do
+        for dylibtype in so dll dylib; do
+          if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then
+            ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype
+            ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion}
+          fi
+        done
+        for statictype in a dll.a la; do
+          if [ -e "$out/lib/lib''${lib}$suffix.$statictype" ]; then
+            ln -svf lib''${lib}$suffix.$statictype $out/lib/lib$lib$newsuffix.$statictype
+          fi
+        done
+        ln -svf ''${lib}$suffix.pc $out/lib/pkgconfig/$lib$newsuffix.pc
+      done
+    done
+  '';
+
+  preFixup = ''
+    rm $out/lib/*.a
+  '';
 
   meta = {
     description = "Free software emulation of curses in SVR4 and more";
@@ -87,8 +106,12 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/ncurses/;
 
     license = lib.licenses.mit;
-
-    maintainers = [ ];
     platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.wkennington ];
+  };
+
+  passthru = {
+    ldflags = "-lncurses";
+    inherit unicode abiVersion;
   };
 }
diff --git a/pkgs/development/libraries/ncurses/gcc-5.patch b/pkgs/development/libraries/ncurses/gcc-5.patch
new file mode 100644
index 00000000000..2448229b88e
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/pkgs/development/libraries/ncurses/patch-ac b/pkgs/development/libraries/ncurses/patch-ac
deleted file mode 100644
index 73578f8a367..00000000000
--- a/pkgs/development/libraries/ncurses/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2011/11/01 14:47:46 hans Exp $
-
---- ncurses-5.9/configure.orig	2011-02-21 01:40:36.000000000 +0000
-+++ ncurses-5.9/configure
-@@ -7096,6 +7096,13 @@ sco*) #(vi
- 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
- 	;;
- solaris2.1[0-9]) #(vi
-+	case "$GCC_VERSION" in 
-+		4.[67].*)
-+			cf_XOPEN_SOURCE=600
-+			cf_add_cflags=-std=c99
-+			CPPFLAGS="$CPPFLAGS -std=c99"
-+			;;
-+	esac
- 	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	;;
- solaris2.[1-9]) #(vi
-@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi
- .no) #(vi
-   ;;
- .|.yes)
--  # Debian 'man' program?
--  if test -f /etc/debian_version ; then
--    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
--  else
-     MANPAGE_RENAMES=no
--  fi
-   ;;
- esac
- 
-@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
- 
--CPPFLAGS="$CPPFLAGS -I. -I../include"
-+CPPFLAGS="-I. -I../include $CPPFLAGS"
- if test "$srcdir" != "."; then
- 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
- fi
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
new file mode 100644
index 00000000000..23098a46337
--- /dev/null
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "neardal-0.7-post-git-20150930";
+
+  src = fetchFromGitHub {
+    owner = "connectivity";
+    repo = "neardal";
+    rev = "5b1c8b5c2c45c10f11cee12fbcb397f8953850d7";
+    sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig glib readline makeWrapper ];
+
+  preConfigure = ''
+    substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS"
+    substituteInPlace "demo/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS"
+    sh autogen.sh
+  '';
+
+  configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ];
+
+  meta = with stdenv.lib; {
+    description = "C APIs to exchange datas with the NFC daemon 'Neard'";
+    license = licenses.lgpl2;
+    homepage = https://01.org/linux-nfc;
+    maintainers = with maintainers; [ tstrobel ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
new file mode 100644
index 00000000000..9b2364e7090
--- /dev/null
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, netcdf, hdf5, curl }:
+stdenv.mkDerivation rec {
+  name = "netcdf-cxx4-${version}";
+  version = "4.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
+    sha256 = "1g0fsmz59dnjib4a7r899lm99j3z6yxsw10c0wlihclzr6znmmds";
+  };
+
+  buildInputs = [ netcdf hdf5 curl ];
+  doCheck = true;
+
+  meta = {
+    description = "C++ API to manipulate netcdf files";
+    homepage = "http://www.unidata.ucar.edu/software/netcdf/";
+    license = stdenv.lib.licenses.free;
+  };
+}
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 505c9b5c0d9..9659ae5273d 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl,
-  zlib, hdf5,
+  zlib, hdf5, m4,
   curl # for DAP
 }:
     
 stdenv.mkDerivation rec {
-    name = "netcdf-4.3.2";
+    name = "netcdf-4.3.3.1";
     src = fetchurl {
         url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
-        sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e";
+        sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx";
     };
 
     buildInputs = [
-        zlib hdf5 curl
+        zlib hdf5 m4 curl
     ];
 
     configureFlags = [
diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix
deleted file mode 100644
index fc85f5eb9de..00000000000
--- a/pkgs/development/libraries/nettle/27.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2.7.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
-  };
-})
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 6044f978402..3c439eb404c 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -16,9 +16,6 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  # It doesn't build otherwise
-  dontDisableStatic = true;
-
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;
 
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
new file mode 100644
index 00000000000..c4257fe97d2
--- /dev/null
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, pkgconfig
+
+# Optinal Dependencies
+, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null
+, libxml2 ? null, jemalloc ? null
+
+# Extra argument
+, prefix ? ""
+}:
+
+let
+  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;
+
+  isLib = prefix == "lib";
+
+  optOpenssl = if isLib then null else shouldUsePkg openssl;
+  optLibev = if isLib then null else shouldUsePkg libev;
+  optZlib = if isLib then null else shouldUsePkg zlib;
+
+  hasApp = optOpenssl != null && optLibev != null && optZlib != null;
+
+  optJansson = if isLib then null else shouldUsePkg jansson;
+  #optBoost = if isLib then null else shouldUsePkg boost;
+  optBoost = null; # Currently detection is broken
+  optLibxml2 = if !hasApp then null else shouldUsePkg libxml2;
+  optJemalloc = if !hasApp then null else shouldUsePkg jemalloc;
+in
+stdenv.mkDerivation rec {
+  name = "${prefix}nghttp2-${version}";
+  version = "1.2.1";
+
+  # Don't use fetchFromGitHub since this needs a bootstrap curl
+  src = fetchurl {
+    url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
+    sha256 = "8027461a231d205394890b2fee34d1c3751e28e7d3f7c1ebc1b557993ea4045e";
+  };
+
+  # Configure script searches for a symbol which does not exist in jemalloc on Darwin
+  # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233
+  postPatch = if (stdenv.isDarwin && optJemalloc != null) then ''
+    substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print"
+  '' else null;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ]
+    ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ];
+
+  configureFlags = [
+    (mkEnable false                 "werror"          null)
+    (mkEnable false                 "debug"           null)
+    (mkEnable true                  "threads"         null)
+    (mkEnable hasApp                "app"             null)
+    (mkEnable (optJansson != null)  "hpack-tools"     null)
+    (mkEnable (optBoost != null)    "asio-lib"        null)
+    (mkEnable false                 "examples"        null)
+    (mkEnable false                 "python-bindings" null)
+    (mkEnable false                 "failmalloc"      null)
+    (mkWith   (optLibxml2 != null)  "libxml2"         null)
+    (mkWith   (optJemalloc != null) "jemalloc"        null)
+    (mkWith   false                 "spdylay"         null)
+    (mkWith   false                 "cython"          null)
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://nghttp2.org/;
+    description = "an implementation of HTTP/2 in C";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 2c208ce86bb..2db193abe59 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
     description = "Collection of miscellaneous plugins for the nix expression language";
     homepage = https://github.com/shlevy/nix-plugins;
     license = stdenv.lib.licenses.mit;
-    maintaners = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
     broken = true;
   };
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index ad194437727..080f09dfdf4 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
-
     hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
+    broken = true;              # cannot cope with Octave 4.x
   };
 
 }
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index 57b1b3af2d1..c2799d039cc 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "NPAPI-SDK is a bundle of NPAPI headers by Mozilla";
+    description = "A bundle of NPAPI headers by Mozilla";
 
     homepage = https://code.google.com/p/npapi-sdk/;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index ba75c8aefe7..0c28a921995 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npth-1.1";
+  name = "npth-1.2";
 
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
-    sha256 = "0zyzwmk4mp6pas87jz35zx0jvwdz7x5b13w225gs73gcn8g5cv49";
+    sha256 = "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 1494092fc47..55cb75d6b7d 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,28 +1,33 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.8"; in
+let version = "4.10.9"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15";
+    sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881";
   };
 
-  preConfigure = "cd nspr";
+  preConfigure = ''
+    cd nspr
+  '';
 
-  configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}";
+  configureFlags = [
+    "--enable-optimize"
+    "--disable-debug"
+  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
 
-  postInstall =
-    ''
-      find $out -name "*.a" | xargs rm
-    '';
+  postInstall = ''
+    find $out -name "*.a" -delete
+  '';
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.mozilla.org/projects/nspr/;
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d91a905f7ba..27fb7cec81a 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.1";
+  version = "3.20";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz";
-    sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz";
+    sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
@@ -82,5 +82,6 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = https://developer.mozilla.org/en-US/docs/NSS;
     description = "A set of libraries for development of security-enabled client and server applications";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 78932259841..754ab4233e5 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
   # No support yet for cg, cuda, glew, glut, openexr.
 
-  name = "nvidia-texture-tools";
+  name = "nvidia-texture-tools-1388";
 
   src = fetchsvn {
     url = "http://nvidia-texture-tools.googlecode.com/svn/trunk";
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 93803b61fb1..51782449a25 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -1,4 +1,4 @@
-{ fetchhg, stdenv
+{ fetchurl, stdenv
 , cmake, mesa
 , freetype, freeimage, zziplib, randrproto, libXrandr
 , libXaw, freeglut, libXt, libpng, boost, ois
@@ -10,10 +10,9 @@
 stdenv.mkDerivation {
   name = "ogre-1.9.0";
 
-  src = fetchhg {
-    url = "https://bitbucket.org/sinbad/ogre/src/";
-    rev = "v1-9-0";
-    sha256 = "06hnf4c2kpycm3mglwdyywvj931k8ym808c15xighpyd8h9j4xdi";
+  src = fetchurl {
+     url = "https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.gz";
+     sha256 = "0p8gyn293qn3iyiy1smfmjd9zpnjb8h2zgvff8778fwh0ylbmlpa";
   };
 
   cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ]
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index eedc9e9ff93..89dc32b61f2 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake
 , alsaSupport ? true, alsaLib ? null
-, pulseSupport ? true, pulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
 }:
 
 with stdenv.lib;
 
 assert alsaSupport -> alsaLib != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "1.16.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ]
     ++ optional alsaSupport alsaLib
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport libpulseaudio;
 
   NIX_LDFLAGS = []
     ++ optional alsaSupport "-lasound"
diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
index 5a935691ca5..ac39ef2e84c 100644
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, alsaLib, cmake }:
 
-let version = "1.7.411"; in
+let version = "1.16.0"; in
 stdenv.mkDerivation rec {
   name = "openal-${version}";
 
   src = fetchurl {
-    url = "http://connect.creativelabs.com/openal/Downloads/openal-soft-${version}.bz2";
-    sha256 = "1nbqvg08hy5p2cxy2i2mmh2szmbpsg2dcvhr61iplyisw04rwc8i";
-    name = "openal-soft-${version}.tar.bz2";
+    url = "http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2";
+    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
   };
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
       is done from the perspective of the Listener.
     '';
 
-    homepage = http://www.openal.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = http://kcat.strangesoft.net/openal.html;
+    license = stdenv.lib.licenses.lgpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 447b5e45dfb..2b4d11919fb 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, opencv, qt5 }:
+{ stdenv, fetchgit, cmake, opencv, qtbase, qtsvg }:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3";
   };
 
-  buildInputs = [ opencv qt5.base qt5.svg ];
+  buildInputs = [ opencv qtbase qtsvg ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix
index b0ef9e83242..4228c285dfd 100644
--- a/pkgs/development/libraries/opencascade/6.5.nix
+++ b/pkgs/development/libraries/opencascade/6.5.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
   # -fpermissive helps building opencascade, although gcc detects a flaw in the code
   # and reports an error otherwise. Further versions may fix that.
   NIX_CFLAGS_COMPILE = "-fpermissive"
+  # https://bugzilla.redhat.com/show_bug.cgi?id=902561
+    + " -DUSE_INTERP_RESULT"
   # https://bugs.freedesktop.org/show_bug.cgi?id=83631
     + " -DGLX_GLXEXT_LEGACY";
 
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index 20003f23874..eaa90efc131 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }:
 
 # The exact revision specified by Blender's install_deps.sh script.
-let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in
+let rev = "3335ac164e68b2512a40914b14c74db260e6ff7d"; in
 
 stdenv.mkDerivation {
   name = "opencollada-1.3-${rev}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     inherit rev;
-    sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d";
+    sha256 = "0s2m8crbg1kf09hpscrplv65a45dlg157b9c20chrv7wy0qizbw5";
   };
 
   buildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
new file mode 100644
index 00000000000..4a58ae43bb7
--- /dev/null
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, fetchurl, fetchzip, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
+, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
+, enableIpp ? false
+, enableContrib ? false
+, enableBloat ? false }:
+
+let
+  v = "3.0.0";
+
+  contribSrc = fetchzip {
+    url = "https://github.com/Itseez/opencv_contrib/archive/3.0.0.tar.gz";
+    sha256 = "1gx7f9v85hmzh37s0zaillg7bs6cy9prm3wl0jb5zc5zrf9d8bm8";
+    name = "opencv-contrib-3.0.0-src";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "opencv-${v}";
+
+  src = fetchurl {
+    url = "https://github.com/Itseez/opencv/archive/${v}.zip";
+    sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287";
+  };
+
+  postPatch =
+    let ippicv = fetchurl {
+          url = "http://sourceforge.net/projects/opencvlibrary/files/3rdparty/ippicv/${ippicvName}";
+          md5 = ippicvHash;
+        };
+        ippicvName    = "ippicv_linux_20141027.tgz";
+        ippicvHash    = "8b449a536a2157bcad08a2b9f266828b";
+        ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}";
+    in stdenv.lib.optionalString enableIpp
+      ''
+        mkdir -p $(dirname ${ippicvArchive})
+        ln -s ${ippicv}    ${ippicvArchive}
+      '';
+
+  buildInputs =
+    [ unzip libjpeg libpng libtiff ]
+    ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Open Computer Vision Library with more than 500 algorithms";
+    homepage = http://opencv.org/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [viric flosse];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index e0b8dcca1af..4ce1787dbac 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-  ];
-
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 63a8c11a341..738e7d87af6 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,33 +1,30 @@
-{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
-let
-  source = callPackage ./source.nix { };
-in
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
+
 stdenv.mkDerivation rec {
-  name = "openexr-${source.version}";
-  
-  src = source.src;
+  name = "openexr-${lib.getVersion ilmbase}";
 
-  prePatch = ''
-    cd OpenEXR
-  '';
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
+  };
+
+  outputs = [ "out" "doc" ];
 
   preConfigure = ''
     ./bootstrap
   '';
 
-  configureFlags = [ "--enable-imfexamples" ];
-  
   buildInputs = [ autoconf automake libtool pkgconfig ];
   propagatedBuildInputs = [ ilmbase zlib ];
 
+  enableParallelBuilding = true;
+
   patches = [ ./bootstrap.patch ];
-  
+
   meta = with stdenv.lib; {
     homepage = http://www.openexr.com/;
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
-
-  passthru.source = source;
 }
diff --git a/pkgs/development/libraries/openexr/source.nix b/pkgs/development/libraries/openexr/source.nix
deleted file mode 100644
index 30675dc54ec..00000000000
--- a/pkgs/development/libraries/openexr/source.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ fetchFromGitHub }:
-rec {
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "openexr";
-    repo = "openexr";
-    rev = "v${version}";
-    sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
-  };
-}
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
deleted file mode 100644
index cd26aae660c..00000000000
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, openexr, ilmbase, ctl }:
-
-stdenv.mkDerivation {
-  name = "openexr_ctl-1.0.1";
-
-  src = fetchurl {
-    url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
-    sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
-  };
-
-  propagatedBuildInputs = [ ilmbase ];
-  
-  buildInputs = [ openexr ctl ];
-  
-  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
-
-  meta = {
-    description = "Color Transformation Language";
-    homepage = http://ampasctl.sourceforge.net;
-  };
-}
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
new file mode 100644
index 00000000000..76188d484f9
--- /dev/null
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, nasm }:
+
+stdenv.mkDerivation rec {
+  name = "openh264-1.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";
+    sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";
+  };
+
+  buildInputs = [ nasm ];
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A codec library which supports H.264 encoding and decoding";
+    homepage = http://www.openh264.org;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 14886f02142..2147bab0a6a 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,10 +1,7 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.2";
   branch = "1.5";
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
-    sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
-  };
+  sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
 })
diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix
deleted file mode 100644
index 25575450b47..00000000000
--- a/pkgs/development/libraries/openjpeg/2.0.1.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.0.1";
-  branch = "2";
-  src = fetchurl {
-    url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";
-    sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
-  };
-})
diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix
new file mode 100644
index 00000000000..034942b25dd
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0.1";
+  branch = "2";
+  sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+})
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index 7e48b656ae2..f6b3ce3a9cd 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -1,10 +1,7 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.0";
   branch = "2.1";
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
-    sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
-  };
+  sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
 })
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 4ffcd62f982..717e5a4de2c 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,83 +1,70 @@
-{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/
-, sharedLibsSupport ? true # Build shared libraries
-, codecSupport ? true # Codec executables
+{ stdenv, fetchurl, cmake, pkgconfig
+, libpng, libtiff, lcms2
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
-, jpipLibSupport ? true # JPIP library & executables
+, jpipLibSupport ? false # JPIP library & executables
 , jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server
 #, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable
-, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java)
+, openjpegJarSupport ? false # Openjpeg jar (Java)
 , jp3dSupport ? true # # JP3D comp
 , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
 , testsSupport ? false
+, jdk ? null
 # Inherit generics
-, branch, src, version, ...
+, branch, sha256, version, ...
 }:
 
-assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));
+assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
 #assert opjViewerSupport -> (wxGTK != null);
-assert openjpegJarSupport -> (jdk != null);
-assert testsSupport -> codecSupport;
+assert (openjpegJarSupport || jpipLibSupport) -> jdk != null;
 
 let
-  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+  inherit (stdenv.lib) optional optionals;
+  mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
 in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "openjpeg-${version}";
-  inherit branch;
-  inherit version;
-  inherit src;
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";
+    inherit sha256;
+  };
 
   cmakeFlags = [
-    (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")
-    (mkFlag codecSupport "BUILD_CODEC")
+    "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_CODEC=ON"
     (mkFlag mj2Support "BUILD_MJ2")
     (mkFlag jpwlLibSupport "BUILD_JPWL")
     (mkFlag jpipLibSupport "BUILD_JPIP")
     (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")
     #(mkFlag opjViewerSupport "BUILD_VIEWER")
+    "-DBUILD_VIEWER=OFF"
     (mkFlag openjpegJarSupport "BUILD_JAVA")
     (mkFlag jp3dSupport "BUILD_JP3D")
     (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
     (mkFlag testsSupport "BUILD_TESTING")
   ];
 
-  nativebuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ cmake ]
+  buildInputs = [ ]
     ++ optionals jpipServerSupport [ curl fcgi ]
     #++ optional opjViewerSupport wxGTK
-    ++ optional openjpegJarSupport jdk;
+    ++ optional (openjpegJarSupport || jpipLibSupport) jdk;
 
   propagatedBuildInputs = [ libpng libtiff lcms2 ];
 
-  postInstall = glib.flattenInclude + ''
-    mkdir -p "$out/lib/pkgconfig"
-    cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF
-    prefix=$out
-    libdir=$out/lib
-    includedir=$out/include
-
-    Name: openjp2
-    Description: JPEG2000 library (Part 1 and 2)
-    URL: http://www.openjpeg.org/
-    Version: ${version}
-    Libs: -L$out/lib -lopenjp2
-    Cflags: -I$out/include
-    EOF
-  '';
-
   passthru = {
     incDir = "openjpeg-${branch}";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open-source JPEG 2000 codec written in C language";
-    homepage    = http://www.openjpeg.org/;
-    license     = licenses.bsd2;
-    maintainer  = with maintainers; [ codyopel ];
-    platforms   = platforms.all;
+    homepage = http://www.openjpeg.org/;
+    license = licenses.bsd2;
+    maintainer = with maintainers; [ codyopel ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/openldap/CVE-2015-6908.patch b/pkgs/development/libraries/openldap/CVE-2015-6908.patch
new file mode 100644
index 00000000000..5db36629475
--- /dev/null
+++ b/pkgs/development/libraries/openldap/CVE-2015-6908.patch
@@ -0,0 +1,25 @@
+From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Thu, 10 Sep 2015 00:37:32 +0100
+Subject: [PATCH] ITS#8240 remove obsolete assert
+
+---
+ libraries/liblber/io.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
+index 85c3e23..c05dcf8 100644
+--- a/libraries/liblber/io.c
++++ b/libraries/liblber/io.c
+@@ -679,7 +679,7 @@ done:
+ 		return (ber->ber_tag);
+ 	}
+ 
+-	assert( 0 ); /* ber structure is messed up ?*/
++	/* invalid input */
+ 	return LBER_DEFAULT;
+ }
+ 
+-- 
+1.7.10.4
+
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 8ab9becf346..253f74ecc6a 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,13 +1,18 @@
-{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
+{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.40";
+  name = "openldap-2.4.42";
 
   src = fetchurl {
     url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni";
+    sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf";
   };
 
+  # Should be removed with >=2.4.43
+  patches = [ ./CVE-2015-6908.patch ];
+
+  outputs = [ "out" "man" ];
+
   buildInputs = [ openssl cyrus_sasl db groff ];
 
   configureFlags =
@@ -18,6 +23,13 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = 1; # !!!
 
+  # Fixup broken libtool
+  preFixup = ''
+    sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \
+        -e 's,-lssl,-L${openssl}/lib -lssl,' \
+        -i $out/lib/libldap.la -i $out/lib/libldap_r.la
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 9be9f838632..476f7e14c60 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
+  , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa
   , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
   , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
   , qt4, poppler, librsvg, gtk
@@ -17,7 +17,7 @@ let
     baseName="OpenSceneGraph";
     version="3.2.1";
     name="${baseName}-${version}";
-    url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
     hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 in
diff --git a/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch
new file mode 100644
index 00000000000..63112abf3a3
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch
@@ -0,0 +1,136 @@
+--- openssl-1.0.1e/config      2014-10-23 15:53:23.436600000 +0200
++++ openssl-1.0.1e/config      2014-10-23 15:55:33.837000000 +0200
+@@ -832,6 +832,7 @@
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;
++  x86_64-*-cygwin) OUT="Cygwin-x86_64" ;;
+   *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+   *-*-cygwin) OUT="Cygwin" ;;
+   t3e-cray-unicosmk) OUT="cray-t3e" ;;
+--- openssl-1.0.1e/Configure	2013-02-17 17:06:18.682058900 -0600
++++ openssl-1.0.1e/Configure	2013-02-17 16:38:08.000000000 -0600
+@@ -550,6 +550,7 @@ my %table=(
+ "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
+ "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
++"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ 
+ # NetWare from David Ward (dsward@novell.com)
+ # requires either MetroWerks NLM development tools, or gcc / nlmconv
+@@ -1128,7 +1129,7 @@ foreach (sort @experimental)
+ 
+ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
+ 
+-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
++$exe_ext=".exe" if ($target =~ /^Cygwin/ || $target eq "DJGPP" || $target =~ /^mingw/);
+ $exe_ext=".nlm" if ($target =~ /netware/);
+ $exe_ext=".pm"  if ($target =~ /vos/);
+ $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
+--- openssl-1.0.1e/Makefile.org	2013-02-11 09:26:04.000000000 -0600
++++ openssl-1.0.1e/Makefile.org	2013-02-17 16:38:08.000000000 -0600
+@@ -326,9 +326,9 @@ clean-shared:
+ 			done; \
+ 		fi; \
+ 		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
+-		if [ "$(PLATFORM)" = "Cygwin" ]; then \
++		case "$(PLATFORM)" in Cygwin*)  \
+ 			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+-		fi; \
++		esac; \
+ 	done
+ 
+ link-shared:
+@@ -571,11 +571,7 @@ install_sw:
+ 		do \
+ 			if [ -f "$$i" -o -f "$$i.a" ]; then \
+ 			(       echo installing $$i; \
+-				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+-				else \
++				case "$(PLATFORM)" in Cygwin*) \
+ 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+@@ -583,7 +579,12 @@ install_sw:
+ 					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+-				fi ); \
++					;; \
++				*) \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
++				esac ); \
+ 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+ 				(	case $$i in \
+ 						*crypto*) i=libeay32.dll;; \
+@@ -643,9 +644,9 @@ install_docs:
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+-	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
++	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
+ 		filecase=-i; \
+-	fi; \
++	esac; \
+ 	set -e; for i in doc/apps/*.pod; do \
+ 		fn=`basename $$i .pod`; \
+ 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
+--- openssl-1.0.1e/engines/ccgost/Makefile	2013-02-11 09:26:04.000000000 -0600
++++ openssl-1.0.1e/engines/ccgost/Makefile	2013-02-17 17:05:47.759290200 -0600
+@@ -45,7 +45,11 @@ install:
+ 		set -e; \
+ 		echo installing $(LIBNAME); \
+ 		pfx=lib; \
+-		if [ "$(PLATFORM)" != "Cygwin" ]; then \
++		case "$(PLATFORM)" in Cygwin*) \
++			sfx=".so"; \
++			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			;; \
++		*) \
+ 			case "$(CFLAGS)" in \
+ 			*DSO_BEOS*) sfx=".so";; \
+ 			*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
+@@ -54,10 +58,7 @@ install:
+ 			*) sfx=".bad";; \
+ 			esac; \
+ 			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+-		else \
+-			sfx=".so"; \
+-			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+-		fi; \
++		esac; \
+ 		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ 		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
+ 	fi
+--- openssl-1.0.1i/engines/Makefile	2014-10-23 16:08:19.360200000 +0200
++++ openssl-1.0.1i/engines/Makefile	2014-10-23 16:10:54.205800000 +0200
+@@ -111,7 +111,11 @@
+ 		for l in $(LIBNAMES); do \
+ 			( echo installing $$l; \
+ 			  pfx=lib; \
+-			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
++			  case "$(PLATFORM)" in Cygwin*) \
++				sfx=".so"; \
++				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++				;; \
++			  *) \
+ 				case "$(CFLAGS)" in \
+ 				*DSO_BEOS*)	sfx=".so";;	\
+ 				*DSO_DLFCN*)	sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;	\
+@@ -120,10 +124,7 @@
+ 				*)		sfx=".bad";;	\
+ 				esac; \
+ 				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+-			  else \
+-				sfx=".so"; \
+-				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+-			  fi; \
++			  esac; \
+ 			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
new file mode 100644
index 00000000000..28254cb390d
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, perl
+, withCryptodev ? false, cryptodevHeaders }:
+
+with stdenv.lib;
+let
+  opensslCrossSystem = attrByPath [ "openssl" "system" ]
+    (throw "openssl needs its platform name cross building" null)
+    stdenv.cross;
+in
+stdenv.mkDerivation rec {
+  name = "openssl-1.0.2d";
+
+  src = fetchurl {
+    urls = [
+      "http://www.openssl.org/source/${name}.tar.gz"
+      "http://openssl.linux-mirror.org/source/${name}.tar.gz"
+    ];
+    sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d";
+  };
+
+  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
+
+  nativeBuildInputs = [ perl ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
+  # On x86_64-darwin, "./config" misdetects the system as
+  # "darwin-i386-cc".  So specify the system type explicitly.
+  configureScript =
+    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
+    else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
+    else "./config";
+
+  configureFlags = [
+    "shared"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
+
+  makeFlags = [
+    "MANDIR=$(out)/share/man"
+  ];
+
+  # Parallel building is broken in OpenSSL.
+  enableParallelBuilding = false;
+
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
+
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
+
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
+
+  crossAttrs = {
+    preConfigure=''
+      # It's configure does not like --build or --host
+      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
+    '';
+
+    configureScript = "./Configure";
+  };
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    priority = 10; # resolves collision with ‘man-pages’
+  };
+}
diff --git a/pkgs/development/libraries/openssl/cert-file-path-max.patch b/pkgs/development/libraries/openssl/cert-file-path-max.patch
deleted file mode 100644
index 50621c5cb82..00000000000
--- a/pkgs/development/libraries/openssl/cert-file-path-max.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch, to be applied after `cert-file.patch', fixes compilation
-on GNU/Hurd where `PATH_MAX' is not defined.
-
-diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c
---- openssl-1.0.0e/crypto/x509/x509_def.c.orig	2012-01-06 00:08:48.000000000 +0100
-+++ openssl-1.0.0e/crypto/x509/x509_def.c	2012-01-06 00:11:29.000000000 +0100
-@@ -58,6 +58,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <limits.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo
- 
- const char *X509_get_default_cert_file(void)
- 	{
--	static char buf[PATH_MAX] = X509_CERT_FILE;
-+	static char *buf;
- 	static int init = 0;
- 	if (!init) {
- 	    init = 1;
- 	    char * s = getenv("OPENSSL_X509_CERT_FILE");
- 	    if (s && getuid() == geteuid()) {
--		strncpy(buf, s, sizeof(buf));
--		buf[sizeof(buf) - 1] = 0;
-+	         buf = strdup(s);
-+	    }
-+	    if (!s) {
-+	         buf = strdup(X509_CERT_FILE);
- 	    }
- 	}
- 	return buf;
diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch
deleted file mode 100644
index e6e66111201..00000000000
--- a/pkgs/development/libraries/openssl/cert-file.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c
---- openssl-1.0.1m-orig/crypto/x509/x509_def.c	2015-03-19 14:19:00.000000000 +0100
-+++ openssl-1.0.1m/crypto/x509/x509_def.c	2015-03-19 15:50:44.676683616 +0100
-@@ -57,6 +57,10 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/types.h>
- #include "cryptlib.h"
- #include <openssl/crypto.h>
- #include <openssl/x509.h>
-@@ -78,7 +82,23 @@
- 
- const char *X509_get_default_cert_file(void)
- {
--    return (X509_CERT_FILE);
-+    static char buf[PATH_MAX] = X509_CERT_FILE;
-+    static int init = 0;
-+    if (!init) {
-+        init = 1;
-+        char * s = getenv("OPENSSL_X509_CERT_FILE");
-+        if (s) {
-+#ifndef OPENSSL_SYS_WINDOWS
-+            if (getuid() == geteuid()) {
-+#endif
-+                strncpy(buf, s, sizeof(buf));
-+                buf[sizeof(buf) - 1] = 0;
-+#ifndef OPENSSL_SYS_WINDOWS
-+            }
-+#endif
-+        }
-+    }
-+    return buf;
- }
- 
- const char *X509_get_default_cert_dir_env(void)
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 3504cf5fd97..3ed9ca9e847 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,62 +1,31 @@
 { stdenv, fetchurl, perl
 , withCryptodev ? false, cryptodevHeaders }:
 
+with stdenv.lib;
 let
-  name = "openssl-1.0.1m";
-
-  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+  opensslCrossSystem = attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
-
-  patchesCross = isCross: let
-    isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
-  in
-    [ # Allow the location of the X509 certificate file (the CA
-      # bundle) to be set through the environment variable
-      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
-      # default location ($out/ssl/cert.pem) doesn't exist, and
-      # hardcoding something like /etc/ssl/cert.pem is impure and
-      # cannot be overriden per-process.  For security, the
-      # environment variable is ignored for setuid binaries.
-      # FIXME: drop this patch; it really isn't necessary, because
-      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.
-      ./cert-file.patch
-    ]
-
-    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
-         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
-           ./gnu.patch                # submitted upstream
-         ]
-
-    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
-        [ ./gnu.patch
-          ./kfreebsd-gnu.patch
-        ]
-
-    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
-
 in
-
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "openssl-1.0.1p";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9";
+    sha1 = "9d1977cc89242cd11471269ece2ed4650947c046";
   };
 
-  patches = patchesCross false;
+  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch
+    ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
 
   outputs = [ "dev" "out" "man" "bin" ];
   setOutputFlags = false;
 
-  buildInputs = [ ]
-    ++ stdenv.lib.optional withCryptodev cryptodevHeaders;
-
   nativeBuildInputs = [ perl ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
@@ -65,26 +34,25 @@ stdenv.mkDerivation {
     else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
     else "./config";
 
-  configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
-    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +
-    stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm";
-
-  preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") ''
-    sed -i -e "s|-march=i486|-march=x86-64|g" Makefile
-  '';
+  configureFlags = [
+    "shared"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
 
-  makeFlags = "MANDIR=$(man)/share/man";
 
   # Parallel building is broken in OpenSSL.
   enableParallelBuilding = false;
 
-  postInstall =
-    ''
-      # If we're building dynamic libraries, then don't install static
-      # libraries.
-      if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
-          rm $out/lib/*.a
-      fi
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
 
       mkdir -p $bin
       mv $out/bin $bin/
@@ -97,19 +65,26 @@ stdenv.mkDerivation {
       # OpenSSL installs readonly files, which otherwise we can't strip.
       # FIXME: Can remove this after the next stdenv merge.
       chmod -R +w $out
-    ''; # */
 
-  crossAttrs = {
-    patches = patchesCross true;
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
 
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
+
+  crossAttrs = {
     preConfigure=''
       # It's configure does not like --build or --host
-      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
+      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
     '';
 
     configureScript = "./Configure";
-  } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") {
-    CC = "gcc";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch
deleted file mode 100644
index 3cc6d049c94..00000000000
--- a/pkgs/development/libraries/openssl/gnu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.
-
---- openssl-1.0.0e/Configure	2012-01-06 00:39:49.000000000 +0100
-+++ openssl-1.0.0e/Configure	2012-01-06 00:39:51.000000000 +0100
-@@ -563,7 +563,7 @@ my %table=(
- "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
- 
- ##### GNU Hurd
--"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
-+"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",
-
---- openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:05:47.000000000 +0100
-+++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:21:05.000000000 +0100
-@@ -60,7 +60,7 @@
-    that handle _GNU_SOURCE and other similar macros.  Defining it later
-    is simply too late, because those headers are protected from re-
-    inclusion.  */
--#ifdef __linux
-+#if defined __linux || defined __GNU__ || defined __GLIBC__
- # ifndef _GNU_SOURCE
- #  define _GNU_SOURCE	/* make sure dladdr is declared */
- # endif
diff --git a/pkgs/development/libraries/openssl/hurd-target.patch b/pkgs/development/libraries/openssl/hurd-target.patch
deleted file mode 100644
index 399a37a69ed..00000000000
--- a/pkgs/development/libraries/openssl/hurd-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure
---- openssl-1.0.0d-orig/Configure	2010-11-30 17:19:26.000000000 -0500
-+++ openssl-1.0.0d/Configure	2011-11-16 13:52:57.614416683 -0500
-@@ -563,7 +563,7 @@
- "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
- 
- ##### GNU Hurd
--"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
-+"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",
diff --git a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch
deleted file mode 100644
index 66cedf746ba..00000000000
--- a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Allow compilation on GNU/kFreeBSD.  Ideally, there'd be a single way to process
-all glibc-based system, but the build system is soooo broken.
-
---- openssl-1.0.0i/config
-+++ openssl-1.0.0i/config
-@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
- 	echo "${MACHINE}-whatever-linux1"; exit 0
- 	;;
- 
-+    GNU/kFreeBSD*)
-+    	echo "kfreebsd-gnu"; exit 0;
-+    	;;
-+
-     GNU*)
- 	echo "hurd-x86"; exit 0;
- 	;;
-@@ -810,6 +814,7 @@ case "$GUESSOS" in
-   beos-*) OUT="$GUESSOS" ;;
-   x86pc-*-qnx6) OUT="QNX6-i386" ;;
-   *-*-qnx6) OUT="QNX6" ;;
-+  kfreebsd-gnu) OUT="kfreebsd-gnu";;
-   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
- esac
- 
-
---- openssl-1.0.0i/Configure
-+++ openssl-1.0.0i/Configure
-@@ -565,6 +565,9 @@ my %table=(
- ##### GNU Hurd
- "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
- 
-+##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64"
-+"kfreebsd-gnu",	"gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
new file mode 100644
index 00000000000..0eb940c119e
--- /dev/null
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }:
+
+stdenv.mkDerivation rec {
+  version = "2.6.0";
+  name = "openwsman-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz";
+    sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig libxml2 curl cmake pam sblim-sfcc ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_RUBY_GEM=no"
+  ];
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)";
+  '';
+
+  configureFlags = "--disable-more-warnings";
+
+  meta = {
+    description = "Openwsman server implementation and client api with bindings";
+
+    homepage = https://github.com/Openwsman/openwsman;
+    downloadPage = "https://github.com/Openwsman/openwsman/releases";
+
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+
+    license = stdenv.lib.licenses.bsd3;
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    inherit version;
+  };
+}
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
new file mode 100644
index 00000000000..c29a5da9f21
--- /dev/null
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }:
+
+let requireSource = version: part: hash: (requireFile rec {
+  name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm";
+  message = ''
+    This Nix expression requires that ${name} already
+    be part of the store. Download the file
+    manually at
+
+    http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
+
+    and add it to the Nix store with the following command:
+
+    nix-prefetch-url file://${name} ${hash} --type sha256
+'';
+  url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
+  sha256 = hash;
+}); in stdenv.mkDerivation rec {
+  version = "12.1.0.2.0-1";
+  name = "oracle-instantclient-${version}";
+
+  srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed");
+  srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296");
+  srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam");
+
+  buildInputs = [ glibc patchelf rpmextract ];
+
+  buildCommand = ''
+    mkdir -p "${name}"
+    cd "${name}"
+    ${rpmextract}/bin/rpmextract "${srcBase}"
+    ${rpmextract}/bin/rpmextract "${srcDevel}"
+    ${rpmextract}/bin/rpmextract "${srcSqlplus}"
+
+    mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
+    mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/"
+    mv "usr/include/oracle/12.1/client64/"* "$out/include/"
+    mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/"
+    mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/"
+    ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64"
+
+    for lib in $out/lib/lib*.so; do
+      test -f $lib || continue
+      chmod +x $lib
+      patchelf --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
+               $lib
+    done
+
+    for exe in $out/bin/sqlplus; do
+      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+               --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
+               $exe
+    done
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "Oracle instant client libraries and sqlplus CLI";
+    longDescription = ''
+      Oracle instant client provides access to Oracle databases (OCI,
+      OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
+      command line SQL client.
+    '';
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pesterhazy ];
+  };
+}
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 561d0df4e80..746f10eebed 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.24.1";
+  name = "ortp-0.24.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";
+    sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index e72071b4cfd..01c76489ba5 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,36 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
+{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz
 , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
 }:
 
 let
-  ver_maj = "1.36";
-  ver_min = "8";
+  ver_maj = "1.38";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq";
+    sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx";
   };
 
   outputs = [ "dev" "out" "bin" "doc" ];
 
-  buildInputs = with stdenv.lib; [ gobjectIntrospection ];
+  buildInputs = [ gobjectIntrospection ];
   nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
+  propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
 
   enableParallelBuilding = true;
 
-  doCheck = false; # test-layout fails on 1.36.8
+  doCheck = false; # test-layout fails on 1.38.0
   # jww (2014-05-05): The tests currently fail on Darwin:
   #
   # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
   # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
   # FAIL: testiter
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
 
     longDescription = ''
@@ -42,9 +41,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.pango.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
-    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with maintainers; [ raskin urkud ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 4b8cedd90c7..a165c539ae8 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = [ maintainers.linus ];
     repositories.git = git://github.com/imneme/pcg-c.git;
+    broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11
   };
 }
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index a71709b554b..46e2da18aa1 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }:
+{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
+, libusb1, libpcap, libXt
+}:
 
-stdenv.mkDerivation {
-  name = "pcl-1.6.0";
+stdenv.mkDerivation rec {
+  name = "pcl-1.7.2";
 
-  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ];
-
-  src = fetchurl {
-    url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2;
-    sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x";
+  src = fetchzip {
+    name = name + "-src";
+    url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
+    sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
+
   meta = {
     homepage = http://pointclouds.org/;
     description = "Open project for 2D/3D image and point cloud processing";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/pcre/cve-2015-3210.patch b/pkgs/development/libraries/pcre/cve-2015-3210.patch
new file mode 100644
index 00000000000..c97849fb70c
--- /dev/null
+++ b/pkgs/development/libraries/pcre/cve-2015-3210.patch
@@ -0,0 +1,87 @@
+From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Fri, 15 May 2015 17:17:03 +0000
+Subject: [PATCH] Fix buffer overflow for named recursive back reference when
+ the name is duplicated.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream commit ported to pcre-8.37:
+
+commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
+Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date:   Fri May 15 17:17:03 2015 +0000
+
+    Fix buffer overflow for named recursive back reference when the name is
+    duplicated.
+
+    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+This fixes CVE-2015-3210.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ pcre_compile.c       | 16 ++++++++++++++--
+ testdata/testinput2  |  2 ++
+ testdata/testoutput2 |  2 ++
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 0efad26..6f06912 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -7173,14 +7173,26 @@ for (;; ptr++)
+           number. If the name is not found, set the value to 0 for a forward
+           reference. */
+ 
++          recno = 0;
+           ng = cd->named_groups;
+           for (i = 0; i < cd->names_found; i++, ng++)
+             {
+             if (namelen == ng->length &&
+                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
+-              break;
++              {
++              open_capitem *oc;
++              recno = ng->number;
++              if (is_recurse) break;
++              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
++                {          
++                if (oc->number == recno)                                     
++                  {               
++                  oc->flag = TRUE;                                      
++                  break;
++                  }                                                         
++                }                          
++              }    
+             }
+-          recno = (i < cd->names_found)? ng->number : 0;
+ 
+           /* Count named back references. */
+ 
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 58fe53b..83bb471 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4152,4 +4152,6 @@ backtracking verbs. --/
+ 
+ /((?2){73}(?2))((?1))/
+ 
++"(?J)(?'d'(?'d'\g{d}))"
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index b718df0..7dff52a 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
+ 
+ /((?2){73}(?2))((?1))/
+ 
++"(?J)(?'d'(?'d'\g{d}))"
++
+ /-- End of testinput2 --/
+-- 
+2.4.3
+
diff --git a/pkgs/development/libraries/pcre/cve-2015-5073.patch b/pkgs/development/libraries/pcre/cve-2015-5073.patch
new file mode 100644
index 00000000000..16fd45c87b1
--- /dev/null
+++ b/pkgs/development/libraries/pcre/cve-2015-5073.patch
@@ -0,0 +1,68 @@
+From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Tue, 23 Jun 2015 16:34:53 +0000
+Subject: [PATCH] Fix buffer overflow for forward reference within backward
+ assertion with excess closing parenthesis. Bugzilla 1651.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is upstream commit ported to 8.37:
+
+commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
+Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date:   Tue Jun 23 16:34:53 2015 +0000
+
+    Fix buffer overflow for forward reference within backward assertion with excess
+    closing parenthesis. Bugzilla 1651.
+
+    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+It fixes CVE-2015-5073.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ pcre_compile.c       | 2 +-
+ testdata/testinput2  | 2 ++
+ testdata/testoutput2 | 3 +++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 6f06912..b66b1f6 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
+ exceptional ones forgo this. We scan the pattern to check that they are fixed
+ length, and set their lengths. */
+ 
+-if (cd->check_lookbehind)
++if (errorcode == 0 && cd->check_lookbehind)
+   {
+   pcre_uchar *cc = (pcre_uchar *)codestart;
+ 
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 83bb471..5cc9ce6 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4154,4 +4154,6 @@ backtracking verbs. --/
+ 
+ "(?J)(?'d'(?'d'\g{d}))"
+ 
++/(?=di(?<=(?1))|(?=(.))))/
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 7dff52a..4decb8d 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
+ 
+ "(?J)(?'d'(?'d'\g{d}))"
+ 
++/(?=di(?<=(?1))|(?=(.))))/
++Failed: unmatched parentheses at offset 23
++
+ /-- End of testinput2 --/
+-- 
+2.4.3
+
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 6ae8e475d1e..cc655579289 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,13 +5,18 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.36";
+  name = "pcre-8.37";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg";
+    sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
   };
 
+  patches =
+    [ ./cve-2015-3210.patch
+      ./cve-2015-5073.patch
+    ];
+
   outputs = [ "dev" "out" "bin" "doc" "man" ];
 
   configureFlags = ''
diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
deleted file mode 100644
index 596a3aea674..00000000000
--- a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux
-*** pdf2xml/Makefile.linux	2008-02-07 17:43:10.000000000 +0100
---- pdf2xml-new/Makefile.linux	2010-08-25 15:41:23.000000000 +0200
-***************
-*** 30,36 ****
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml.exe
-  
-  # Main target
-  all: pdftoxmlEXE
---- 30,36 ----
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml
-  
-  # Main target
-  all: pdftoxmlEXE
-diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc
-*** pdf2xml/src/pdftoxml.cc	2010-04-26 10:58:01.000000000 +0200
---- pdf2xml-new/src/pdftoxml.cc	2010-08-25 15:36:15.000000000 +0200
-***************
-*** 11,21 ****
-  //
-  //===========================================================================
-  
-  #include <aconf.h>
-- #include <stdio.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <string.h>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
---- 11,21 ----
-  //
-  //===========================================================================
-  
-+ #include <string.h>
-  #include <aconf.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <cstdio>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
index bc34d249b46..2c6e40eaf73 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }:
 
 with stdenv.lib;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
   };
 
-  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ];
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
new file mode 100644
index 00000000000..bc34d249b46
--- /dev/null
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }:
+
+with stdenv.lib;
+
+let
+  version = "4.8.2";
+  pname = "phonon-backend-gstreamer";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
+  };
+
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+  ]
+  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  meta = with stdenv.lib; {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = platforms.linux;
+    maintainer = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
index 8883f5c11d9..70b6174c635 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
@@ -1,16 +1,13 @@
-{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon
-, qt4 ? null, qt5 ? null, withQt5 ? false }:
+{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}:
 
 with stdenv.lib;
 
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
-
 let
   pname = "phonon-backend-vlc";
   v = "0.8.1";
   # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override { inherit qt4 qt5 withQt5; };
-  phonon_ = phonon.override { inherit qt4 qt5 withQt5; };
+  vlc_ = vlc.override { inherit qt4; };
+  phonon_ = phonon.override { inherit qt4; };
 in
 
 stdenv.mkDerivation {
@@ -23,9 +20,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
 
-  buildInputs = [ vlc_ phonon_ (if withQt5 then qt5 else qt4)];
-
-  cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+  buildInputs = [ vlc_ phonon_ qt4 ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
index b7e4dc7c2b0..744d681a694 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
@@ -1,16 +1,10 @@
-{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon_qt5, qt5 }:
+{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }:
 
 with stdenv.lib;
 
 let
   pname = "phonon-backend-vlc";
   v = "0.8.2";
-  # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override {
-    inherit qt5;
-    qt4 = null;
-    withQt5 = true;
-  };
 in
 
 stdenv.mkDerivation {
@@ -23,7 +17,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig xz ];
 
-  buildInputs = [ vlc_ phonon_qt5 qt5.base ];
+  buildInputs = [ vlc phonon qtbase ];
 
   cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
 
diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index a127c063ffb..9875b216e06 100644
--- a/pkgs/development/libraries/phonon/qt4/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
   };
 
-  buildInputs = [ qt4 pulseaudio ];
+  buildInputs = [ qt4 libpulseaudio ];
 
   nativeBuildInputs = [ cmake automoc4 ];
 
diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
index 248e0427709..fc07344d2d1 100644
--- a/pkgs/development/libraries/phonon/qt5/default.nix
+++ b/pkgs/development/libraries/phonon/qt5/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
+, qtbase, qtquick1, qttools
+, debug ? false }:
 
 with stdenv.lib;
 
@@ -14,15 +16,17 @@ stdenv.mkDerivation rec {
     sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
   };
 
-  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ];
+  buildInputs = [ mesa qtbase qtquick1 qttools libpulseaudio ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
   cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
     "-DPHONON_BUILD_PHONON4QT5=ON"
     "-DCMAKE_INSTALL_LIBDIR=lib"
-  ]
-  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+  ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix
new file mode 100644
index 00000000000..3dddd60b59f
--- /dev/null
+++ b/pkgs/development/libraries/phonon/qt5/old.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }:
+
+with stdenv.lib;
+
+let
+  v = "4.8.3";
+in
+
+stdenv.mkDerivation rec {
+  name = "phonon-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
+    sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
+  };
+
+  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "Multimedia API for Qt";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 1e1fc7ea3b8..2c07c1e0858 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -26,7 +26,7 @@
 
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
 , mesa   ? null
-, x11    ? null
+, xlibsWrapper    ? null
 , libXmu ? null
 }:
 
@@ -41,7 +41,7 @@ assert enableXM -> motif != null;
 
 # OpenGL/X11 User Interface and Visualisation drivers.
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa   != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11    != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
 
 let
@@ -81,8 +81,8 @@ let
       };
 
       enableParallelBuilding = true;
-      buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ];
-      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+      buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
+      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
 
       setupHook = ./setup-hook.sh;
 
@@ -92,7 +92,7 @@ let
       '';
 
       meta = {
-        description = "A toolkit for the simulation of the passage of particles through matter.";
+        description = "A toolkit for the simulation of the passage of particles through matter";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.
           Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
@@ -129,7 +129,7 @@ let
       '';
 
       meta = {
-        description = "Data files for the Geant4 toolkit.";
+        description = "Data files for the Geant4 toolkit";
         homepage = http://www.geant4.org;
         license = stdenv.lib.licenses.g4sl;
         maintainers = [ ];
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index f90b2e6c4ae..e023b122091 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -45,7 +45,7 @@ let
       '';
 
       meta = {
-        description = "Python bindings and utilities for Geant4.";
+        description = "Python bindings and utilities for Geant4";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.      
           Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 14529c6c643..30cceb59c00 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,24 +1,28 @@
-{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }:
+{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.6";
+  name = "pixman-0.32.8";
 
   src = fetchurl {
-    url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix";
+    url = "mirror://xorg/individual/lib/${name}.tar.bz2";
+    sha1 = "5c57045622265b877c9bf02d531973eadf942140";
   };
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
 
-  buildInputs = [ libpng ]; # NOT in closure anyway
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = stdenv.lib.optional doCheck libpng;
 
-  postInstall = glib.flattenInclude;
+  configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";
+
+  doCheck = true;
 
-  patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch;
+  postInstall = glib.flattenInclude;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pixman.org;
     description = "A low-level library for pixel manipulation";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 5443df89704..c4f0ad16fb7 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ pkgconfig openssl autoconf automake libtool ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
-    license = [ "BSD" "GPLv2" ];
+    license = with licenses; [ "BSD" gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
   };
 }
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 2a35fbd7515..0b67ce16331 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -2,11 +2,11 @@
 , openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.2";
+  name = "podofo-0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
+    sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix
index b887134e5b9..3715158705c 100644
--- a/pkgs/development/libraries/polkit-qt-1/default.nix
+++ b/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -1,7 +1,10 @@
 { stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib
-, qt4 ? null, qt5 ? null, withQt5 ? false }:
+, qt4 ? null
+, withQt5 ? false, qtbase ? null }:
 
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+with stdenv.lib;
+
+assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation {
   name = "polkit-qt-1-0.112.0";
@@ -11,9 +14,9 @@ stdenv.mkDerivation {
     sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
   };
 
-  nativeBuildInputs = [ cmake automoc4 pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt5) automoc4;
 
-  propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
+  propagatedBuildInputs = [ polkit glib ] ++ [(if withQt5 then qtbase else qt4)];
 
   meta = {
     description = "A Qt wrapper around PolKit";
diff --git a/pkgs/development/libraries/polkit-qt-1/old.nix b/pkgs/development/libraries/polkit-qt-1/old.nix
new file mode 100644
index 00000000000..b887134e5b9
--- /dev/null
+++ b/pkgs/development/libraries/polkit-qt-1/old.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib
+, qt4 ? null, qt5 ? null, withQt5 ? false }:
+
+assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+
+stdenv.mkDerivation {
+  name = "polkit-qt-1-0.112.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
+    sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
+  };
+
+  nativeBuildInputs = [ cmake automoc4 pkgconfig ];
+
+  propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
+
+  meta = {
+    description = "A Qt wrapper around PolKit";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 7fe16cec56b..cdeaa0cb1d9 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.112";
+  name = "polkit-0.113";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
-    sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn";
+    sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
   };
 
   buildInputs =
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs .
   '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
-    sed '/libsystemd-login autoconfigured, but system does not appear to use systemd/s/.*/:/' -i configure
+    sed '/libsystemd autoconfigured/s/.*/:/' -i configure
   ''
     # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
     # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c79cdfd4466..b15142dc673 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
-, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null
+, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null
 , utils ? false, suffix ? "glib"
 }:
 
-let
-  version = "0.32.0"; # even major numbers are stable
-  sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
+let # beware: updates often break cups_filters build
+  version = "0.34.0"; # even major numbers are stable
+  sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v";
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";
@@ -16,26 +16,31 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  outputs = [ "out" ] ++ lib.optional (!minimal) "doc";
+
   patches = [ ./datadir_env.patch ];
 
-  propagatedBuildInputs = with stdenv.lib;
-    [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]
+  # TODO: reduce propagation to necessary libs
+  propagatedBuildInputs = with lib;
+    [ zlib freetype fontconfig libjpeg lcms curl openjpeg ]
+    ++ optional (!minimal) cairo
     ++ optional qt4Support qt4
-    ++ optional qt5Support qt5.base;
+    ++ optional qt5Support qtbase;
 
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
-  configureFlags =
+  configureFlags = with lib;
     [
       "--enable-xpdf-headers"
       "--enable-libcurl"
       "--enable-zlib"
     ]
-    ++ stdenv.lib.optional (!utils) "--disable-utils";
+    ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ]
+    ++ optional (!utils) "--disable-utils";
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     homepage = http://poppler.freedesktop.org/;
     description = "A PDF rendering library";
 
@@ -43,8 +48,8 @@ stdenv.mkDerivation rec {
       Poppler is a PDF rendering library based on the xpdf-3.0 code base.
     '';
 
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/development/libraries/popt/1.16-cygwin.patch
new file mode 100644
index 00000000000..9c084f0b8ea
--- /dev/null
+++ b/pkgs/development/libraries/popt/1.16-cygwin.patch
@@ -0,0 +1,11 @@
+--- origsrc/poptconfig.c	2009-05-20 08:18:07.000000000 -0500
++++ src/poptconfig.c	2012-03-29 18:13:46.869286100 -0500
+@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_
+ /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+ #endif	/* __LCLINT__ */
+ 
+-#if !defined(__GLIBC__)
++#if !defined(__GLIBC__) && !defined(__CYGWIN__)
+ /* Return nonzero if PATTERN contains any metacharacters.
+    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+ static int
diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/development/libraries/popt/1.16-vpath.patch
new file mode 100644
index 00000000000..4cfa1c8fb4d
--- /dev/null
+++ b/pkgs/development/libraries/popt/1.16-vpath.patch
@@ -0,0 +1,34 @@
+--- origsrc/Doxyfile.in	2008-04-26 16:57:32.000000000 -0500
++++ src/Doxyfile.in	2012-03-29 18:15:56.649709100 -0500
+@@ -460,14 +460,14 @@ WARN_LOGFILE           =
+ # with spaces.
+ 
+ INPUT                  = \
+-                        ./popt.c \
+-                        ./popt.h \
+-                        ./poptconfig.c \
+-                        ./popthelp.c \
+-                        ./poptint.c \
+-                        ./poptint.h \
+-                        ./poptparse.c \
+-			./system.h
++                        @srcdir@/popt.c \
++                        @srcdir@/popt.h \
++                        @srcdir@/poptconfig.c \
++                        @srcdir@/popthelp.c \
++                        @srcdir@/poptint.c \
++                        @srcdir@/poptint.h \
++                        @srcdir@/poptparse.c \
++			@srcdir@/system.h
+ 
+ # If the value of the INPUT tag contains directories, you can use the 
+ # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+@@ -658,7 +658,7 @@ HTML_HEADER            =
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER            = footer_no_timestamp.html
++HTML_FOOTER            = @srcdir@/footer_no_timestamp.html
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+ # style sheet that is used by each HTML page. It can be used to 
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 03f917daa23..f99514f054a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -2,12 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "popt-1.16";
-  
+
   src = fetchurl {
     url = "http://rpm5.org/files/popt/${name}.tar.gz";
     sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
   };
 
+  patches = if stdenv.isCygwin then [
+    ./1.16-cygwin.patch
+    ./1.16-vpath.patch
+  ] else null;
+
   meta = {
     description = "command line option parsing library";
   };
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 9edef767481..96388c3a35a 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "1.0"; in
+let version = "1.1"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "0m0b6dzablci8mlavpsmn5w1v3r46li0wpjwvsybgxx0p1ifjsf1";
+    sha256 = "1vrqhbpyca6sf984cfcwlp8wdnfzj1g7ph9958qdky9978i1nlny";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
 
-  patches = [ ./upstream-based.patch ];
+  patches = [ ./ppl-cstddef.patch /* from Fedora */ ];
 
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
diff --git a/pkgs/development/libraries/ppl/ppl-cstddef.patch b/pkgs/development/libraries/ppl/ppl-cstddef.patch
new file mode 100644
index 00000000000..8c43b26bef7
--- /dev/null
+++ b/pkgs/development/libraries/ppl/ppl-cstddef.patch
@@ -0,0 +1,238 @@
+diff -up ppl-1.1/src/Dense_Row_defs.hh.orig ppl-1.1/src/Dense_Row_defs.hh
+--- ppl-1.1/src/Dense_Row_defs.hh.orig	2014-04-29 13:08:10.516682937 -0300
++++ ppl-1.1/src/Dense_Row_defs.hh	2014-04-29 13:08:50.447684466 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include <memory>
+ #include <vector>
+ #include <limits>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A finite sequence of coefficients.
+@@ -433,7 +434,7 @@ public:
+ 
+   typedef std::bidirectional_iterator_tag iterator_category;
+   typedef Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+ 
+@@ -474,7 +475,7 @@ class Parma_Polyhedra_Library::Dense_Row
+ public:
+ 
+   typedef const Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig ppl-1.1/src/Linear_Expression_Interface_defs.hh
+--- ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig	2014-04-29 13:08:17.337683198 -0300
++++ ppl-1.1/src/Linear_Expression_Interface_defs.hh	2014-04-29 13:08:40.999684104 -0300
+@@ -32,6 +32,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Sparse_Row_types.hh"
+ #include <vector>
+ #include <set>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A linear expression.
+@@ -65,7 +66,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_defs.hh.orig ppl-1.1/src/CO_Tree_defs.hh
+--- ppl-1.1/src/CO_Tree_defs.hh.orig	2014-04-29 13:11:33.725690719 -0300
++++ ppl-1.1/src/CO_Tree_defs.hh	2014-04-29 13:11:55.943691569 -0300
+@@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Coefficient_defs.hh"
+ #include <memory>
++#include <cstddef>
+ 
+ #ifndef PPL_CO_TREE_EXTRA_DEBUG
+ #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG
+@@ -159,7 +160,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef data_type_const_reference reference;
+ 
+@@ -314,7 +315,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef value_type& reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_inlines.hh.orig ppl-1.1/src/CO_Tree_inlines.hh
+--- ppl-1.1/src/CO_Tree_inlines.hh.orig	2014-04-29 13:14:12.738696808 -0300
++++ ppl-1.1/src/CO_Tree_inlines.hh	2014-04-29 13:14:48.887698192 -0300
+@@ -24,6 +24,8 @@ site: http://bugseng.com/products/ppl/ .
+ #ifndef PPL_CO_Tree_inlines_hh
+ #define PPL_CO_Tree_inlines_hh 1
+ 
++#include <cstddef>
++
+ namespace Parma_Polyhedra_Library {
+ 
+ inline dimension_type
+@@ -31,7 +33,7 @@ CO_Tree::dfs_index(const_iterator itr) c
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -40,7 +42,7 @@ CO_Tree::dfs_index(iterator itr) const {
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -772,7 +774,7 @@ CO_Tree::tree_iterator::follow_left_chil
+   p -= (offset - 1);
+   while (*p == unused_index)
+     ++p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+@@ -787,7 +789,7 @@ CO_Tree::tree_iterator::follow_right_chi
+   p += (offset - 1);
+   while (*p == unused_index)
+     --p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+diff -up ppl-1.1/src/Linear_Expression_defs.hh.orig ppl-1.1/src/Linear_Expression_defs.hh
+--- ppl-1.1/src/Linear_Expression_defs.hh.orig	2014-04-29 13:15:39.793700141 -0300
++++ ppl-1.1/src/Linear_Expression_defs.hh	2014-04-29 13:16:07.464701201 -0300
+@@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Linear_Expression_Interface_defs.hh"
+ #include "Variable_defs.hh"
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -381,7 +382,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree.cc.orig ppl-1.1/src/CO_Tree.cc
+--- ppl-1.1/src/CO_Tree.cc.orig	2014-04-29 13:19:37.192709232 -0300
++++ ppl-1.1/src/CO_Tree.cc	2014-04-29 13:19:58.000710029 -0300
+@@ -954,7 +954,7 @@ PPL::CO_Tree
+     --subtree_size;
+   }
+ 
+-  const ptrdiff_t distance = first_unused_index - indexes;
++  const std::ptrdiff_t distance = first_unused_index - indexes;
+   PPL_ASSERT(distance >= 0);
+   return static_cast<dimension_type>(distance);
+ }
+diff -up ppl-1.1/src/Constraint_System_defs.hh.orig ppl-1.1/src/Constraint_System_defs.hh
+--- ppl-1.1/src/Constraint_System_defs.hh.orig	2014-04-29 13:30:05.530733294 -0300
++++ ppl-1.1/src/Constraint_System_defs.hh	2014-04-29 13:30:27.167734122 -0300
+@@ -37,6 +37,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "termination_types.hh"
+ #include <iterator>
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -609,7 +610,7 @@ for (Constraint_System::const_iterator i
+ class Parma_Polyhedra_Library::Constraint_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+                          Constraint,
+-                         ptrdiff_t,
++                         std::ptrdiff_t,
+                          const Constraint*,
+                          const Constraint&> {
+ public:
+diff -up ppl-1.1/src/Congruence_System_defs.hh.orig ppl-1.1/src/Congruence_System_defs.hh
+--- ppl-1.1/src/Congruence_System_defs.hh.orig	2014-04-29 13:33:56.927742155 -0300
++++ ppl-1.1/src/Congruence_System_defs.hh	2014-04-29 13:34:15.535742867 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Congruence_defs.hh"
+ #include "Constraint_System_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -249,7 +250,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Congruence,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Congruence*,
+                            const Congruence&> {
+   public:
+diff -up ppl-1.1/src/Generator_System_defs.hh.orig ppl-1.1/src/Generator_System_defs.hh
+--- ppl-1.1/src/Generator_System_defs.hh.orig	2014-04-29 13:44:30.122766402 -0300
++++ ppl-1.1/src/Generator_System_defs.hh	2014-04-29 13:44:48.167767093 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Poly_Con_Relation_defs.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -679,7 +680,7 @@ copy(gs.begin(), gs.end(), ostream_itera
+ class Parma_Polyhedra_Library::Generator_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+         Generator,
+-        ptrdiff_t,
++        std::ptrdiff_t,
+         const Generator*,
+         const Generator&> {
+ public:
+diff -up ppl-1.1/src/Grid_Generator_System_defs.hh.orig ppl-1.1/src/Grid_Generator_System_defs.hh
+--- ppl-1.1/src/Grid_Generator_System_defs.hh.orig	2014-04-29 13:45:26.073768544 -0300
++++ ppl-1.1/src/Grid_Generator_System_defs.hh	2014-04-29 13:45:42.535769175 -0300
+@@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Variables_Set_types.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -277,7 +278,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Grid_Generator,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Grid_Generator*,
+                            const Grid_Generator&> {
+   public:
diff --git a/pkgs/development/libraries/ppl/upstream-based.patch b/pkgs/development/libraries/ppl/upstream-based.patch
deleted file mode 100644
index 551050f67bf..00000000000
--- a/pkgs/development/libraries/ppl/upstream-based.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=447928
---- ppl-1.0/src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
-+++ ppl-1.0/src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
-@@ -25,6 +25,9 @@
- #include "ppl-config.h"
- #include "mp_std_bits.defs.hh"
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- const bool std::numeric_limits<mpz_class>::is_specialized;
- const int std::numeric_limits<mpz_class>::digits;
- const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +73,6 @@
- const bool std::numeric_limits<mpq_class>::traps;
- const bool std::numeric_limits<mpq_class>::tininess_before;
- const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
---- ppl-1.0/src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
-+++ ppl-1.0/src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
-@@ -38,6 +38,9 @@
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
- void swap(mpq_class& x, mpq_class& y);
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- namespace std {
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
-@@ -164,6 +167,9 @@
- 
- } // namespace std
- 
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- #include "mp_std_bits.inlines.hh"
- 
- #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 85962d56cc3..14f459cc6fe 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,26 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.8.0";
+  name = "proj-4.9.2";
 
   src = fetchurl {
-    url = http://download.osgeo.org/proj/proj-4.8.0.tar.gz;
-    sha256 = "1dfim63ks298204lv2z0v16njz6fs7bf0m4icy09i3ffzvqdpcid";
+    url = http://download.osgeo.org/proj/proj-4.9.2.tar.gz;
+    sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0";
   };
 
-  postConfigure = ''
-    patch src/Makefile <<EOF
-    272c272
-    < include_HEADERS = proj_api.h org_proj4_Projections.h
-    ---
-    > include_HEADERS = proj_api.h org_proj4_Projections.h projects.h
-    EOF
-  '';
-
   meta = with stdenv.lib; {
     description = "Cartographic Projections Library";
     homepage = http://trac.osgeo.org/proj/;
     license = licenses.mit;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
new file mode 100644
index 00000000000..900c9dc5a51
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.0.0-alpha-3.1";
+  # make sure you test also -A pythonPackages.protobuf
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "protobuf";
+    rev = "v${version}";
+    sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45";
+  };
+})
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
new file mode 100644
index 00000000000..153d3ce8e80
--- /dev/null
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "pugixml-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1pnrdi8n9fdclmhxri3jwc6xwpgvblbjnqkk9ykycpnljv20ads7";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  sourceRoot = "${name}/scripts";
+
+  preConfigure = ''
+    # Enable long long support (required for filezilla)
+    sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Light-weight, simple and fast XML parser for C++ with XPath support";
+    homepage = http://pugixml.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
new file mode 100644
index 00000000000..cabe672d7bc
--- /dev/null
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, openssl, pkgconfig, qtbase }:
+
+let
+  rev = "088ff642fc2990871e3555e73c94c9287e7514a9";
+  shortrev = builtins.substring 0 7 rev;
+in
+stdenv.mkDerivation rec {
+  name = "qca-qt5-20150422-${shortrev}";
+  src = fetchgit {
+    url = "git://anongit.kde.org/qca.git";
+    branchName = "qt5";
+    inherit rev;
+    sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8";
+  };
+
+  buildInputs = [ openssl qtbase ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Qt 5 Cryptographic Architecture";
+    homepage = http://delta.affinix.com/qca;
+    maintainers = with maintainers; [ ttuegel ];
+    license = licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/qca-qt5/old.nix b/pkgs/development/libraries/qca-qt5/old.nix
new file mode 100644
index 00000000000..d0bcb73151f
--- /dev/null
+++ b/pkgs/development/libraries/qca-qt5/old.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }:
+
+let
+  rev = "088ff642fc2990871e3555e73c94c9287e7514a9";
+  shortrev = builtins.substring 0 7 rev;
+in
+stdenv.mkDerivation rec {
+  name = "qca-qt5-20150422-${shortrev}";
+  src = fetchgit {
+    url = "git://anongit.kde.org/qca.git";
+    branchName = "qt5";
+    inherit rev;
+    sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8";
+  };
+
+  buildInputs = [ openssl qt5.base ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Qt 5 Cryptographic Architecture";
+    homepage = http://delta.affinix.com/qca;
+    maintainers = with maintainers; [ ttuegel ];
+    license = licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index a1be2afcd6c..4d12f020d1e 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qt5 }:
+{ stdenv, fetchgit, qtbase, qtquick1 }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz";
   };
 
-  buildInputs = [ qt5.base qt5.quick1 ];
+  buildInputs = [ qtbase qtquick1 ];
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "This project is a QML port of qtermwidget";
+    description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
-    license = with stdenv.lib.licenses; [ gpl2 ];
+    license = 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 e9d506f58fe..340f4558f81 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, zlib, perl }:
 
-let version = "5.1.2";
+let version = "5.1.3";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "1zbvhrp0zjzbi6q2bnbxbg6399r47pq5gw3kspzph81j19fqvpg9";
+    sha256 = "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm";
   };
 
   nativeBuildInputs = [ perl ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://qpdf.sourceforge.net/; 
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.artistic2;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 465ec7eebb2..aaa9ab8a61a 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,29 +1,34 @@
 { stdenv
 , fetchurl
 , gfortran
-, liblapack
+, openblas
 }:
 stdenv.mkDerivation {
   name = "qrupdate-1.1.2";
   src = fetchurl {
     url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
-    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";  			
+    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
   };
-  
-  configurePhase = ''
-    export PREFIX=$out
-    sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
-      -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
-      Makeconf
-  '';
+
+  configurePhase =
+    ''
+      export PREFIX=$out
+      sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \
+          -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \
+          Makeconf
+    ''
+    + stdenv.lib.optionalString openblas.blas64
+    ''
+      sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
+    '';
 
   doCheck = true;
 
   checkTarget = "test";
 
-  buildTarget = "lib";
+  buildFlags = [ "lib" "solib" ];
+
+  installTargets = "install";
 
-  installTarget = "install-staticlib";
-  
-  buildInputs = [ gfortran liblapack ];
+  buildInputs = [ gfortran openblas ];
 }
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 8c7301e3c40..26d412e5a8c 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     qmake qscintilla.pro
   '';
 
-  # TODO PyQt Support.
-
   meta = {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index ffad4418815..08d8f141deb 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,7 +7,7 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng, which
+, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which
 }:
 
 assert xftSupport -> libXft != null;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ which ];
-  propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];
+  propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg];
 
   configureFlags = "
     -v
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 a65cbeed3fd..e4d1bae636c 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   v_maj = "4.8";
-  v_min = "6";
+  v_min = "7";
   vers = "${v_maj}.${v_min}";
 in
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qt/"
       + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz";
-    sha256 = "0b036iqgmbbv37dgwwfihw3mihjbnw3kb5kaisdy0qi8nn8xs54b";
+    sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272";
   };
 
   # The version property must be kept because it will be included into the QtSDK package name
@@ -126,8 +126,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
-  # occasional build problems if one has too many cores (like on Hydra)
-  # @vcunat has been unable to find a *reliable* fix
   enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
diff --git a/pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch
deleted file mode 100644
index 4abb69da4d8..00000000000
--- a/pkgs/development/libraries/qt-5/5.3/0003-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:22:39 -0600
-Subject: [PATCH] glib-2.32
-
----
- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include <pthread.h>
- #elif PLATFORM(GTK)
- #include <wtf/gtk/GOwnPtr.h>
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
- 
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch
deleted file mode 100644
index d112427bdd6..00000000000
--- a/pkgs/development/libraries/qt-5/5.3/0005-dlopen-gl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:23:08 -0600
-Subject: [PATCH] dlopen-gl
-
----
- qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-index 67235e0..2220a2e 100644
---- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) ()
-             {
-                 extern const QString qt_gl_library_name();
- //                QLibrary lib(qt_gl_library_name());
--                QLibrary lib(QLatin1String("GL"));
-+                QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
-                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
-             }
-         }
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch
deleted file mode 100644
index f32386e114b..00000000000
--- a/pkgs/development/libraries/qt-5/5.3/0012-dlopen-dbus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:38:04 -0600
-Subject: [PATCH] dlopen-dbus
-
----
- qtbase/src/dbus/qdbus_symbols.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp
-index a7a1b67..661baf1 100644
---- a/qtbase/src/dbus/qdbus_symbols.cpp
-+++ b/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus()
- 
-     static int majorversions[] = { 3, 2, -1 };
-     lib->unload();
--    lib->setFileName(QLatin1String("dbus-1"));
-+    lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1"));
-     for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
-         lib->setFileNameAndVersion(lib->fileName(), majorversions[i]);
-         if (lib->load() && lib->resolve("dbus_connection_open_private"))
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
deleted file mode 100644
index d7ae685af6d..00000000000
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-{ stdenv, fetchurl, substituteAll, libXrender, libXext
-, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng
-, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
-, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage
-, xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon
-, alsaLib, gstreamer, gst_plugins_base
-, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
-, flashplayerFix ? false
-, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
-, buildDocs ? false
-, buildExamples ? false
-, buildTests ? false
-, developerBuild ? false
-}:
-
-with stdenv.lib;
-
-let
-  v_maj = "5.3";
-  v_min = "2";
-  ver = "${v_maj}.${v_min}";
-in
-
-stdenv.mkDerivation rec {
-  name = "qt-${ver}";
-
-  src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/qt/"
-      + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz";
-    sha256 = "0b98n2jl62dyqxwn1gdj9xmk8wrrdxnazr65fdk5qw1hmlpgvly8";
-  };
-
-  # The version property must be kept because it will be included into the QtSDK package name
-  version = ver;
-
-  prePatch = ''
-    substituteInPlace configure --replace /bin/pwd pwd
-    substituteInPlace qtbase/configure --replace /bin/pwd pwd
-    substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-    substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace /usr/share/X11/locale ${libX11}/share/X11/locale \
-        --replace /usr/lib/X11/locale ${libX11}/share/X11/locale
-    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-  '';
-
-  patches =
-    optional gtkStyle
-      (substituteAll {
-        src = ./0001-dlopen-gtkstyle.patch;
-        # substituteAll ignores env vars starting with capital letter
-        gconf = GConf;
-        inherit gnome_vfs libgnomeui gtk;
-      })
-    ++ optional flashplayerFix
-      (substituteAll {
-        src = ./0002-dlopen-webkit-nsplugin.patch;
-        inherit gtk gdk_pixbuf;
-      })
-    ++ optional flashplayerFix
-      (substituteAll {
-        src = ./0007-dlopen-webkit-gtk.patch;
-        inherit gtk;
-      })
-    ++ [
-      ./0003-glib-2.32.patch
-      (substituteAll {
-        src = ./0004-dlopen-resolv.patch;
-        glibc = stdenv.cc.libc;
-      })
-      (substituteAll {
-        src = ./0005-dlopen-gl.patch;
-        openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
-      })
-      ./0006-tzdir.patch
-      (substituteAll { src = ./0008-dlopen-webkit-udev.patch; inherit udev; })
-      (substituteAll { src = ./0009-dlopen-serialport-udev.patch; inherit udev; })
-      (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; })
-    ];
-
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-  '';
-
-  prefixKey = "-prefix ";
-
-  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
-  # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
-
-    -release
-    -shared
-    -c++11
-    ${optionalString developerBuild "-developer-build"}
-    -largefile
-    -accessibility
-    -rpath
-    -optimized-qmake
-    -strip
-    -reduce-relocations
-    -system-proxies
-
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -nis
-    -iconv
-    -icu
-    -pch
-    -glib
-    -xcb
-    -qpa xcb
-    -${optionalString (cups == null) "no-"}cups
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
-
-    -system-zlib
-    -system-libpng
-    -system-libjpeg
-    -system-xcb
-    -system-xkbcommon
-    -openssl-linked
-    -dbus-linked
-
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
-
-    -make libs
-    -make tools
-    -${optionalString (buildExamples == false) "no"}make examples
-    -${optionalString (buildTests == false) "no"}make tests
-  '';
-
-  propagatedBuildInputs = [
-    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
-    zlib libjpeg libpng libtiff sqlite icu
-    libwebp alsaLib gstreamer gst_plugins_base pulseaudio
-    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
-  ]
-  # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
-  # doesn't remain a runtime-dep if not used
-  ++ optionals mesaSupported [ mesa mesa_glu ]
-  ++ optional (cups != null) cups
-  ++ optional (mysql != null) mysql.lib
-  ++ optional (postgresql != null) postgresql;
-
-  buildInputs = [ gdb bison flex gperf ruby ];
-
-  nativeBuildInputs = [ python perl pkgconfig ];
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
-  postInstall =
-    ''
-      ${optionalString buildDocs ''
-        make docs && make install_docs
-      ''}
-
-      # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    '';
-
-  enableParallelBuilding = true; # often fails on Hydra, as well as qt4
-
-  meta = {
-    homepage = http://qt-project.org;
-    description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
new file mode 100644
index 00000000000..1fc4bbd6076
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
@@ -0,0 +1,17 @@
+Ensure Qt knows where libGL is.
+
+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
+diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
+--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf	2014-09-11 12:48:07.000000000 +0200
++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf	2015-08-23 13:03:30.617473019 +0200
+@@ -12,8 +12,8 @@
+ QMAKE_LIBDIR            =
+ QMAKE_INCDIR_X11        =
+ QMAKE_LIBDIR_X11        =
+-QMAKE_INCDIR_OPENGL     =
+-QMAKE_LIBDIR_OPENGL     =
++QMAKE_INCDIR_OPENGL     = @mesa@/include
++QMAKE_LIBDIR_OPENGL     = @mesa@/lib
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
new file mode 100644
index 00000000000..4607274de74
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
@@ -0,0 +1,13 @@
+diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+index 8833e3f..c56d381 100644
+--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp
++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+@@ -47,7 +47,7 @@
+ ****************************************************************************/
+ 
+ //#define QSSLSOCKET_DEBUG
+-//#define QT_DECRYPT_SSL_TRAFFIC
++#define QT_DECRYPT_SSL_TRAFFIC
+ 
+ #include "qssl_p.h"
+ #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index fe7e024ba4b..136c352d1aa 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -20,17 +20,23 @@
 
 # options
 , developerBuild ? false
+, decryptSslTraffic ? false
 }:
 
 with autonix;
 with stdenv.lib;
 
 let
-  manifest =
-    importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
-  srcs = mapAttrs (name: manifest: manifest.src) manifest;
+  srcs =
+    let
+      manifest = builtins.fromJSON (builtins.readFile ./manifest.json);
+      mirror = "http://download.qt.io";
+      fetch = src: fetchurl (src // { url = "${mirror}/${src.url}"; });
+      mkPair = pkg: nameValuePair (builtins.parseDrvName pkg.name).name (fetch pkg.src);
+      pairs = map mkPair manifest;
+    in listToAttrs pairs;
 
-  version = "5.4.1";
+  version = "5.4.2";
 
   callPackage = newScope (self // { inherit qtSubmodule; });
 
@@ -61,7 +67,7 @@ let
         # GNOME dependencies are not used unless gtkStyle == true
         inherit (gnome) libgnomeui GConf gnome_vfs;
         bison = bison2; # error: too few arguments to function 'int yylex(...
-        inherit developerBuild srcs version;
+        inherit developerBuild srcs version decryptSslTraffic;
       };
 
       connectivity = callPackage
@@ -146,15 +152,15 @@ let
 
       multimedia = callPackage
         (
-          { qtSubmodule, base, declarative
-          , alsaLib, gstreamer, gst_plugins_base, pulseaudio
+          { qtSubmodule, base, declarative, pkgconfig
+          , alsaLib, gstreamer, gst_plugins_base, libpulseaudio
           }:
 
           qtSubmodule {
             name = "qtmultimedia";
             qtInputs = [ base declarative ];
             buildInputs = [
-              alsaLib gstreamer gst_plugins_base pulseaudio
+              pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio
             ];
           }
         )
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.json b/pkgs/development/libraries/qt-5/5.4/manifest.json
new file mode 100644
index 00000000000..83dedb41706
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.json
@@ -0,0 +1,301 @@
+[
+  {
+    "name": "qtbase-opensource-src-5.4.2",
+    "store": "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz",
+      "sha256": "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z",
+      "name": "qtbase-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtenginio-opensource-src-5.4.2",
+    "store": "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz",
+      "sha256": "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn",
+      "name": "qtenginio-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtserialport-opensource-src-5.4.2",
+    "store": "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz",
+      "sha256": "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck",
+      "name": "qtserialport-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtscript-opensource-src-5.4.2",
+    "store": "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz",
+      "sha256": "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0",
+      "name": "qtscript-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebchannel-opensource-src-5.4.2",
+    "store": "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn",
+      "name": "qtwebchannel-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwinextras-opensource-src-5.4.2",
+    "store": "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0",
+      "name": "qtwinextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebsockets-opensource-src-5.4.2",
+    "store": "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz",
+      "sha256": "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4",
+      "name": "qtwebsockets-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmultimedia-opensource-src-5.4.2",
+    "store": "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj",
+      "name": "qtmultimedia-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtgraphicaleffects-opensource-src-5.4.2",
+    "store": "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+      "sha256": "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs",
+      "name": "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtxmlpatterns-opensource-src-5.4.2",
+    "store": "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+      "sha256": "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa",
+      "name": "qtxmlpatterns-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttranslations-opensource-src-5.4.2",
+    "store": "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz",
+      "sha256": "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls",
+      "name": "qttranslations-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdeclarative-opensource-src-5.4.2",
+    "store": "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz",
+      "sha256": "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p",
+      "name": "qtdeclarative-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-opensource-src-5.4.2",
+    "store": "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy",
+      "name": "qtwebkit-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquick1-opensource-src-5.4.2",
+    "store": "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz",
+      "sha256": "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp",
+      "name": "qtquick1-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquickcontrols-opensource-src-5.4.2",
+    "store": "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz",
+      "sha256": "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877",
+      "name": "qtquickcontrols-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtimageformats-opensource-src-5.4.2",
+    "store": "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb",
+      "name": "qtimageformats-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdoc-opensource-src-5.4.2",
+    "store": "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz",
+      "sha256": "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8",
+      "name": "qtdoc-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwayland-opensource-src-5.4.2",
+    "store": "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz",
+      "sha256": "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0",
+      "name": "qtwayland-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmacextras-opensource-src-5.4.2",
+    "store": "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80",
+      "name": "qtmacextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtactiveqt-opensource-src-5.4.2",
+    "store": "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz",
+      "sha256": "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla",
+      "name": "qtactiveqt-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtlocation-opensource-src-5.4.2",
+    "store": "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz",
+      "sha256": "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw",
+      "name": "qtlocation-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtconnectivity-opensource-src-5.4.2",
+    "store": "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs",
+      "name": "qtconnectivity-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtx11extras-opensource-src-5.4.2",
+    "store": "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn",
+      "name": "qtx11extras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttools-opensource-src-5.4.2",
+    "store": "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz",
+      "sha256": "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd",
+      "name": "qttools-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsensors-opensource-src-5.4.2",
+    "store": "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz",
+      "sha256": "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf",
+      "name": "qtsensors-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebengine-opensource-src-5.4.2",
+    "store": "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz",
+      "sha256": "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8",
+      "name": "qtwebengine-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsvg-opensource-src-5.4.2",
+    "store": "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz",
+      "sha256": "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz",
+      "name": "qtsvg-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qt5-opensource-src-5.4.2",
+    "store": "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz",
+      "sha256": "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44",
+      "name": "qt5-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-examples-opensource-src-5.4.2",
+    "store": "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+      "sha256": "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8",
+      "name": "qtwebkit-examples-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtandroidextras-opensource-src-5.4.2",
+    "store": "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx",
+      "name": "qtandroidextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix
deleted file mode 100644
index 4647c0eef88..00000000000
--- a/pkgs/development/libraries/qt-5/5.4/manifest.nix
+++ /dev/null
@@ -1,274 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/32jn5sn8im7andkd6m15s95n48ald7pw-qtwayland-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz";
-      sha256 = "14npf3lclkb83s8ywla67a1129ia1mbib145s1sk5gqw1dh5wfv5";
-      name = "qtwayland-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/604ifwwrzpm96rffszyl11xjirm0w65j-qtandroidextras-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtandroidextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0s12hmn2lnlbp7y47v344lyli6wh670dwazl3kkzv9vdv52df4wp";
-      name = "qtandroidextras-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/wcwaylvnlrfy6d6pc0ka7mkcam846cqb-qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
-      sha256 = "071mz2w25g5svknb97y6yw55sq9171qqd92n3dp4w2qg2blg1qms";
-      name = "qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/k7gayy35qqwbaf2yyr1lfydmsp6p9k3i-qtenginio-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz";
-      sha256 = "0yjpx43qy6yc6hblcrkp6g9jv2ipg2hdd27q86y7s30q54f17nxf";
-      name = "qtenginio-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0y1p0ssxbd8wp4vyq5ad2f77inh07p1b-qtwebengine-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebengine-opensource-src-5.4.1.tar.xz";
-      sha256 = "1c5akxh6wxgc72md6802fbvd601n03assv6i542siwmmnp5anhij";
-      name = "qtwebengine-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0mdhndcp51g2160559kgd5a93c0c3317-qtmacextras-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmacextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0hivjn3yfidzj4la3rlrqzjawrakxyhc886w2jcf0bjz3vzl9xp2";
-      name = "qtmacextras-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hhana1500hq2h2l8815wq8rfrp7nizpb-qttranslations-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz";
-      sha256 = "0hchmz7hjdjx0wn2v9sbgilvi0pigiriklw5pdvfxjabjxgh8k9w";
-      name = "qttranslations-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/qfa1hycl1lh8pm2x65frxlms3waqbsfg-qtwebchannel-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebchannel-opensource-src-5.4.1.tar.xz";
-      sha256 = "0ldjyyp0ym3hndd0bq5mwjry2yilf1cv9iddqb8adz46k3nbkb64";
-      name = "qtwebchannel-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hif7dg37sz0yjj09844f0gyqqsf9cpxx-qtdoc-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdoc-opensource-src-5.4.1.tar.xz";
-      sha256 = "1afg2lxyxgqhq02a58c9yshvkinlk5mw19yff1421fma6j925c8q";
-      name = "qtdoc-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/shz5132xvpp2hvmsyl1mhps0qanrgw43-qtwebkit-examples-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz";
-      sha256 = "02kj4rw40s7xhdz1ixfy5fc7n5pr2ipqkpwj1kwng71l3jrpn60r";
-      name = "qtwebkit-examples-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/nl8rm1q2sqyq5y91h6d9dbks82krykn1-qtbase-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz";
-      sha256 = "1dxigzgv6xj5lybs654y57ssfbl38dxff3s3wpvw0n89hf9sax45";
-      name = "qtbase-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/f9cbf92nhmfkz1q2n4nidh432s5d3pls-qttools-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz";
-      sha256 = "0whzcwgzwh1m6fqb7h2gvkx9hi2ijjaz8ap36jqr8cc4ff2hzphi";
-      name = "qttools-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hl5gzwaq43afs2z7ga10161myzz3xrwb-qt5-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qt5-opensource-src-5.4.1.tar.xz";
-      sha256 = "01xgf3531q60vrkg1pp07q4p0ildj42zgnw63v8fnwjg7c5m59rd";
-      name = "qt5-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/9y9qhciiqys5sm502bbflqzrjmvxpqh6-qtquick1-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz";
-      sha256 = "0ba3r89j75vrjgh8h3ik64x84bhgbckc4bvy1wympwgfhk3j8lzb";
-      name = "qtquick1-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/cmvv503q10qnmmbb8yxvvjlxpqqaswyb-qtwebsockets-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz";
-      sha256 = "0i5bcxlwxbzq9k0kq1m90cbslby05x3j3r6js8xjarz2qnc6zxfs";
-      name = "qtwebsockets-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/9c4zpbngylc7cqqyai2ysglajapphxp7-qtsensors-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz";
-      sha256 = "1y6vbvvcgph466whcc896lkyk2lx8lyyqj1qnm76f3jjywp8wjxc";
-      name = "qtsensors-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/njkpa0ahd4l5307b4qmqlqiv4nw1by7z-qtx11extras-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0blcdqccxhdqj4v5zp6m34b74nw5n6pfgldyb6wrlpljkzdir9i0";
-      name = "qtx11extras-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/q2ji7ilipdvx0p6iyrwhhfczzw1j11ws-qtmultimedia-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz";
-      sha256 = "0kjk3q7y2lr8a62rdidhn783jrq1rpj11p1jmfiw8z3j255dsc1q";
-      name = "qtmultimedia-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/ikxpk38h1arms4x0qlnd7g5g3fg26fg4-qtactiveqt-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtactiveqt-opensource-src-5.4.1.tar.xz";
-      sha256 = "14984cvh9cfnrgls40i28fjdhs015izzlvwck9va4167y3ix4zbx";
-      name = "qtactiveqt-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0a30a874s507fmrsd1jlggbh9j953jb9-qtxmlpatterns-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz";
-      sha256 = "062kqs8m9js8mlld1lsm01prq57zs88g7p8fad84a5gisgs2y57m";
-      name = "qtxmlpatterns-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/cbb46kpmk6radk9v8cyngxcxr11g06f6-qtscript-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz";
-      sha256 = "1bybzcp9smasw0syvb7vrz85jq124r7gywz2msgjg1kb6z4aqcpl";
-      name = "qtscript-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/h5hg9z346lh2w8whf0zgq5kbwffpmnkk-qtquickcontrols-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz";
-      sha256 = "1hpvbjr76q9i2idgmblr80khhjgkn78q0s0d648r3axp232m427y";
-      name = "qtquickcontrols-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/7vxgal1cag6cakigc7h3rjvvr64b7sd3-qtimageformats-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz";
-      sha256 = "0vw4bg68kwp48v49ds2vxvgjc82i5q5scff4013y5gpbd2smnv1z";
-      name = "qtimageformats-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/pgcv75a5x56s88qclqvbw04dzywcxm73-qtserialport-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz";
-      sha256 = "1zyhlpmh7yisk9qpk8map0myam4bkm4jvp0wcnd4d7pldf19xnbr";
-      name = "qtserialport-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/p8jka7s4la8f83xqnl1a4ivdw95dajb8-qtwebkit-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz";
-      sha256 = "1gqrf5g07q5bgr3vnfnsw5qwqd0fjyh4pgqphrvxq4x9z0g221v6";
-      name = "qtwebkit-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/ggn5pkvp89qh12vzhhk572s38vg3zn72-qtconnectivity-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz";
-      sha256 = "0q13gg7fmfb7cfq403ql8s5qi6s9a4fd86i7v9r6cwgnj2szzi42";
-      name = "qtconnectivity-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/pnblj6ncfvz4id84asjlnrxb2papsn1v-qtlocation-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz";
-      sha256 = "113rx43349f7yn4crhgg6ciz6lyvfvfnc0vkdaz09a2r461hr7w8";
-      name = "qtlocation-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0bz5yxqc9yg94jyjkvsgn7h7lph99a5v-qtdeclarative-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz";
-      sha256 = "05s4imk7whm2qir9byb35dn2ndqb7c5r2cnxpv2qyjla58j4w4hm";
-      name = "qtdeclarative-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/xdbwakyhif8cjwyii7v32zkxlrbrksmc-qtwinextras-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwinextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "01ddgvq8wny162njlzqnbphiiw565xsqy6h3s39cipa05c6mxblv";
-      name = "qtwinextras-opensource-src-5.4.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/m3wk5r1ihbrjz9zpi57nllzqzha06c8j-qtsvg-opensource-src-5.4.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz";
-      sha256 = "0b71kngnq7c5ry8bkb0rjlr6xx49h1sd25m4i4s3v1rfrv6912my";
-      name = "qtsvg-opensource-src-5.4.1.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh
index 0da13f204ba..780269a6417 100755
--- a/pkgs/development/libraries/qt-5/5.4/manifest.sh
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh
@@ -1,15 +1,9 @@
 #!/bin/sh
 
-if [ $# -eq 0 ]; then
+set -x
 
-  # 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.qt.io/official_releases/qt/5.4/5.4.1/submodules/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
+# 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 ../../../../.. --no-out-link -A autonix.manifest) \
+  http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
+    -A '*.tar.xz'
diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
index b242661270d..4012b637e28 100644
--- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
@@ -20,12 +20,6 @@ mkDerivation (args // {
   dontFixLibtool = args.dontFixLibtool or true;
   configureScript = args.configureScript or "qmake";
 
-  /*
-  preConfigure = ''
-    export PATH="$out/bin:$PATH"
-  '';
-  */
-
   postInstall = ''
     rm "$out/bin/qmake" "$out/bin/qt.conf"
 
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 746889f279d..30d53eb874b 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll
 , srcs, version
 
-, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
+, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi
 , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
 , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
@@ -20,10 +20,13 @@
 , buildTests ? false
 , developerBuild ? false
 , gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, decryptSslTraffic ? false
 }:
 
 with stdenv.lib;
 
+let system-x86_64 = elem stdenv.system platforms.x86_64; in
+
 stdenv.mkDerivation {
 
   name = "qtbase-${version}";
@@ -68,7 +71,9 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
       ./0013-xdg_config_dirs.patch
-    ];
+    ] ++ optional mesaSupported
+      (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; })
+    ++ (optional decryptSslTraffic ./0100-ssl.patch);
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
@@ -80,6 +85,7 @@ stdenv.mkDerivation {
     sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
     export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
+    export configureFlags+=" -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
@@ -102,6 +108,7 @@ stdenv.mkDerivation {
     -strip
     -reduce-relocations
     -system-proxies
+    -pkg-config
 
     -gui
     -widgets
@@ -115,12 +122,23 @@ stdenv.mkDerivation {
     -xcb
     -qpa xcb
     -${optionalString (cups == null) "no-"}cups
+    -${optionalString (!gtkStyle) "no-"}gtkstyle
 
     -no-eglfs
     -no-directfb
     -no-linuxfb
     -no-kms
 
+    ${optionalString (!system-x86_64) "-no-sse2"}
+    -no-sse3
+    -no-ssse3
+    -no-sse4.1
+    -no-sse4.2
+    -no-avx
+    -no-avx2
+    -no-mips_dsp
+    -no-mips_dspr2
+
     -system-zlib
     -system-libpng
     -system-libjpeg
@@ -139,8 +157,13 @@ stdenv.mkDerivation {
     -${optionalString (buildTests == false) "no"}make tests
   '';
 
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
   propagatedBuildInputs = [
-    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
+    xorg.libXcomposite libX11 libxcb libXext libXrender libXi
     fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
@@ -150,9 +173,12 @@ stdenv.mkDerivation {
   ++ optionals mesaSupported [ mesa mesa_glu ]
   ++ optional (cups != null) cups
   ++ optional (mysql != null) mysql.lib
-  ++ optional (postgresql != null) postgresql;
+  ++ optional (postgresql != null) postgresql
+  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
@@ -167,12 +193,11 @@ stdenv.mkDerivation {
 
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-
-      mkdir -p "$out/nix-support"
-      substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \
-        --subst-var out --subst-var-by lndir "${lndir}"
     '';
 
+  inherit lndir;
+  setupHook = ./setup-hook.sh;
+
   enableParallelBuilding = true; # often fails on Hydra, as well as qt4
 
   meta = {
diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 8ab4071becf..3bc4890f3bb 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -20,16 +20,31 @@ addQtModule() {
             fi
         fi
 
-        if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then
+        if [[ -d "$1/lib" ]]; then
             @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
-            find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
-        fi
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
 
-        propagatedBuildInputs+=" $1"
-    fi
+            if [[ -d "$1/lib/qt5/plugins" ]]; then
+                QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$1/lib/qt5/plugins";
+            fi
+
+            if [[ -d "$1/lib/qt5/imports" ]]; then
+                QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$1/lib/qt5/imports";
+            fi
 
-    if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
-        propagatedUserEnvPkgs+=" $1"
+            if [[ -d "$1/lib/qt5/qml" ]]; then
+                QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml";
+            fi
+        fi
+
+        if [[ -d "$1/share" ]]; then
+            @lndir@/bin/lndir -silent "$1/share" "$qtOut/share"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/share" -printf 'share/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
+        fi
     fi
 }
 
@@ -44,16 +59,19 @@ else
     qtOut=$out
 fi
 
-mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib"
+mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" \
+         "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
 cp "@out@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
-Plugins = $qtOut/lib/qt5/plugins
-Imports = $qtOut/lib/qt5/imports
-Qml2Imports = $qtOut/lib/qt5/qml
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
 EOF
+export QMAKE="$qtOut/bin/qmake"
 
 envHooks+=(addQtModule)
 preConfigurePhases+=" setQMakePath"
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
new file mode 100644
index 00000000000..418ab88cd9f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -0,0 +1,104 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL.
+#  2. Run ./manifest.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. Be sure to check if
+#  any new components have been added and package them as necessary.
+
+{ pkgs
+
+# options
+, developerBuild ? false
+, decryptSslTraffic ? false
+}:
+
+let inherit (pkgs) stdenv; in
+
+with stdenv.lib;
+
+let
+
+  mirror = "http://download.qt.io";
+  srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; };
+
+  qtSubmodule = args:
+    let
+      inherit (args) name;
+      inherit (srcs."${args.name}") version src;
+      inherit (pkgs.stdenv) mkDerivation;
+    in mkDerivation (args // {
+      name = "${name}-${version}";
+      inherit src;
+
+      propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+
+      NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
+      dontAddPrefix = args.dontAddPrefix or true;
+      dontFixLibtool = args.dontFixLibtool or true;
+      configureScript = args.configureScript or "qmake";
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+      meta = {
+        homepage = http://qt-project.org;
+        description = "A cross-platform application framework for C++";
+        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+        maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+        platforms = platforms.linux;
+      } // (args.meta or {});
+    });
+
+  addPackages = self: with self;
+    let
+      callPackage = self.newScope { inherit qtSubmodule srcs; };
+    in {
+
+      qtbase = callPackage ./qtbase {
+        mesa = pkgs.mesa_noglu;
+        cups = if stdenv.isLinux then pkgs.cups else null;
+        # GNOME dependencies are not used unless gtkStyle == true
+        inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
+        inherit developerBuild decryptSslTraffic;
+      };
+
+      /* qt3d = not packaged */
+      /* qtactiveqt = not packaged */
+      /* qtandroidextras = not packaged */
+      /* qtcanvas3d = not packaged */
+      qtconnectivity = callPackage ./qtconnectivity.nix {};
+      qtdeclarative = callPackage ./qtdeclarative.nix {};
+      qtdoc = callPackage ./qtdoc.nix {};
+      qtenginio = callPackage ./qtenginio.nix {};
+      qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
+      qtimageformats = callPackage ./qtimageformats.nix {};
+      qtlocation = callPackage ./qtlocation.nix {};
+      /* qtmacextras = not packaged */
+      qtmultimedia = callPackage ./qtmultimedia.nix {};
+      qtquick1 = callPackage ./qtquick1.nix {};
+      qtquickcontrols = callPackage ./qtquickcontrols.nix {};
+      qtscript = callPackage ./qtscript {};
+      qtsensors = callPackage ./qtsensors.nix {};
+      qtserialport = callPackage ./qtserialport {};
+      qtsvg = callPackage ./qtsvg.nix {};
+      qttools = callPackage ./qttools.nix {};
+      qttranslations = callPackage ./qttranslations.nix {};
+      /* qtwayland = not packaged */
+      /* qtwebchannel = not packaged */
+      /* qtwebengine = not packaged */
+      qtwebkit = callPackage ./qtwebkit {};
+      qtwebkit-examples = callPackage ./qtwebkit-examples.nix {};
+      qtwebsockets = callPackage ./qtwebsockets.nix {};
+      /* qtwinextras = not packaged */
+      qtx11extras = callPackage ./qtx11extras.nix {};
+      qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
+
+    };
+
+in makeScope pkgs.newScope addPackages
diff --git a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh
new file mode 100755
index 00000000000..8d48cd38ee4
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+workdir=$(pwd)
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        url="${src:2}"
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameversion="${filename%.tar.*}"
+        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+        cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$version";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+    fi
+done
+
+echo "}" >>../srcs.nix
+
+cd ..
diff --git a/pkgs/development/libraries/qt-5/5.3/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
index 3f411139f5b..b86dfaf628b 100644
--- a/pkgs/development/libraries/qt-5/5.3/0001-dlopen-gtkstyle.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
@@ -1,7 +1,7 @@
-From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001
+From d3224286c647f1d1e7dac485bbeee5bc8286e6c6 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Mon, 1 Dec 2014 17:21:58 -0600
-Subject: [PATCH] dlopen-gtkstyle
+Subject: [PATCH 1/9] dlopen-gtkstyle
 
 ---
  qtbase/src/widgets/styles/qgtk2painter.cpp |  2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH] dlopen-gtkstyle
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp
-index 7b9bd97..075947a 100644
+index 489d456..c38e986 100644
 --- a/qtbase/src/widgets/styles/qgtk2painter.cpp
 +++ b/qtbase/src/widgets/styles/qgtk2painter.cpp
-@@ -104,7 +104,7 @@ static void initGtk()
+@@ -96,7 +96,7 @@ static void initGtk()
      static bool initialized = false;
      if (!initialized) {
          // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
@@ -22,10 +22,10 @@ index 7b9bd97..075947a 100644
          QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
          QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
 diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-index 2c64225..3343d32 100644
+index 0e119a1..ad6caa1 100644
 --- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp
 +++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus)
+@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus)
  void QGtkStylePrivate::resolveGtk() const
  {
      // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
@@ -34,7 +34,7 @@ index 2c64225..3343d32 100644
  
      gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
      gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const
+@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() const
      pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
      pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
  
@@ -45,7 +45,7 @@ index 2c64225..3343d32 100644
  }
  
  /* \internal
-@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
+@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
  static bool resolveGConf()
  {
      if (!QGtkStylePrivate::gconf_client_get_default) {
@@ -59,5 +59,5 @@ index 2c64225..3343d32 100644
      return (QGtkStylePrivate::gconf_client_get_default !=0);
  }
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.3/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
index e6b921b771d..90afce32dc1 100644
--- a/pkgs/development/libraries/qt-5/5.3/0004-dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
@@ -1,7 +1,7 @@
-From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001
+From af315c076c8626292075592fab1726fcd62c3169 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Mon, 1 Dec 2014 17:22:55 -0600
-Subject: [PATCH] dlopen-resolv
+Subject: [PATCH 2/9] dlopen-resolv
 
 ---
  qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH] dlopen-resolv
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp
-index 8c5a0eb..27ebf16 100644
+index fa782da..912ecc7 100644
 --- a/qtbase/src/network/kernel/qdnslookup_unix.cpp
 +++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp
-@@ -87,7 +87,7 @@ static void resolveLibrary()
+@@ -79,7 +79,7 @@ static void resolveLibrary()
      if (!lib.load())
  #endif
      {
@@ -22,10 +22,10 @@ index 8c5a0eb..27ebf16 100644
              return;
      }
 diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
-index df8c8b1..613d0e0 100644
+index 90a6f76..758407a 100644
 --- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
 +++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
-@@ -103,7 +103,7 @@ static void resolveLibrary()
+@@ -95,7 +95,7 @@ static void resolveLibrary()
      if (!lib.load())
  #endif
      {
@@ -35,5 +35,5 @@ index df8c8b1..613d0e0 100644
              return;
      }
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
new file mode 100644
index 00000000000..a8a0bdf4410
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
@@ -0,0 +1,25 @@
+From fc9f34b6e8a290615868e27bfcd31c355d11487c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 1 Dec 2014 17:23:08 -0600
+Subject: [PATCH 3/9] dlopen-gl
+
+---
+ .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+index 5166372..bdeb69a 100644
+--- a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -560,7 +560,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) ()
+             {
+                 extern const QString qt_gl_library_name();
+ //                QLibrary lib(qt_gl_library_name());
+-                QLibrary lib(QLatin1String("GL"));
++                QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
+                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+             }
+         }
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.3/0006-tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
index d5a74b25fb3..a4e9cd986a2 100644
--- a/pkgs/development/libraries/qt-5/5.3/0006-tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
@@ -1,17 +1,17 @@
-From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001
+From b1a0771652ddf91058f67fa92260a89c43f5c530 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Mon, 1 Dec 2014 17:23:22 -0600
-Subject: [PATCH] tzdir
+Subject: [PATCH 4/9] tzdir
 
 ---
  qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-index b4ea91e..a56a245 100644
+index 29f0e17..3878974 100644
 --- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
 +++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
+@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
@@ -23,7 +23,7 @@ index b4ea91e..a56a245 100644
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
+@@ -553,12 +556,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
@@ -48,5 +48,5 @@ index b4ea91e..a56a245 100644
      }
  
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.3/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
index 49ade86fae3..fe53e0e7c48 100644
--- a/pkgs/development/libraries/qt-5/5.3/0010-dlopen-libXcursor.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
@@ -1,17 +1,17 @@
-From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001
+From 5fbe717120864d490fa4d60bc7f7676ac19bd69d Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Mon, 1 Dec 2014 17:33:51 -0600
-Subject: [PATCH] dlopen-libXcursor
+Subject: [PATCH 5/9] dlopen-libXcursor
 
 ---
  qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 6dbac90..4b23fc2 100644
+index e51ab85..7ec4b0b 100644
 --- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
 +++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
  #ifdef XCB_USE_XLIB
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
@@ -25,5 +25,5 @@ index 6dbac90..4b23fc2 100644
          }
          if (xcursorFound) {
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.3/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
index d08061dd5dd..718ff08ca43 100644
--- a/pkgs/development/libraries/qt-5/5.3/0011-dlopen-openssl.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
@@ -1,17 +1,17 @@
-From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001
+From 4c4b1f2a35644014da79d089d3860e518fa9a27d Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:35:21 -0600
-Subject: [PATCH] dlopen-openssl
+Date: Sun, 23 Aug 2015 08:52:04 -0500
+Subject: [PATCH 6/9] dlopen openssl
 
 ---
  qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 4e6200f..d9c3e7d 100644
+index e2700df..a7ccf88 100644
 --- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
 +++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -585,8 +585,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+@@ -640,8 +640,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -22,10 +22,10 @@ index 4e6200f..d9c3e7d 100644
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
-@@ -597,8 +597,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
- #endif
- 
-     // second attempt: find the development files libssl.so and libcrypto.so
+@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
+     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
+     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
+     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
 -    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
 -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
 +    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
@@ -34,5 +34,5 @@ index 4e6200f..d9c3e7d 100644
          // libssl.so.0 and libcrypto.so.0 found
          return pair;
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
new file mode 100644
index 00000000000..96d268c358b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
@@ -0,0 +1,25 @@
+From a23141d76cdde068ba1cefdad4a6352c921ce7c9 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 08:52:27 -0500
+Subject: [PATCH 7/9] dlopen dbus
+
+---
+ qtbase/src/dbus/qdbus_symbols.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp
+index b82d92b..f72c9cb 100644
+--- a/qtbase/src/dbus/qdbus_symbols.cpp
++++ b/qtbase/src/dbus/qdbus_symbols.cpp
+@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
+ #ifdef Q_OS_WIN
+         QLatin1String("dbus-1"),
+ #endif
+-        QLatin1String("libdbus-1")
++        QLatin1String("@dbus_libs@/lib/libdbus-1")
+     };
+ 
+     lib->unload();
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
new file mode 100644
index 00000000000..4d23d640df0
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
@@ -0,0 +1,55 @@
+From a7dc6209542ef8aa54191c0e17fbb9b41cbad67f Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 08:52:57 -0500
+Subject: [PATCH 8/9] xdg config dirs
+
+---
+ qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++
+ qtbase/src/corelib/io/qsettings_p.h |  2 +-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/qtbase/src/corelib/io/qsettings.cpp b/qtbase/src/corelib/io/qsettings.cpp
+index 413f569..8ff4974 100644
+--- a/qtbase/src/corelib/io/qsettings.cpp
++++ b/qtbase/src/corelib/io/qsettings.cpp
+@@ -1131,6 +1131,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/qtbase/src/corelib/io/qsettings_p.h b/qtbase/src/corelib/io/qsettings_p.h
+index 93d63fd..160b197 100644
+--- a/qtbase/src/corelib/io/qsettings_p.h
++++ b/qtbase/src/corelib/io/qsettings_p.h
+@@ -240,7 +240,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
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
new file mode 100644
index 00000000000..8c8ec697458
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
@@ -0,0 +1,25 @@
+From 64bc88615a4cb58d461fe600b46611415d74b7b2 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 08:53:42 -0500
+Subject: [PATCH 9/9] decrypt ssl traffic
+
+---
+ qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+index 049666b..e8342ab 100644
+--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp
++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+@@ -48,7 +48,7 @@
+ ****************************************************************************/
+ 
+ //#define QSSLSOCKET_DEBUG
+-//#define QT_DECRYPT_SSL_TRAFFIC
++#define QT_DECRYPT_SSL_TRAFFIC
+ 
+ #include "qssl_p.h"
+ #include "qsslsocket_openssl_p.h"
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch
new file mode 100644
index 00000000000..1fc4bbd6076
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch
@@ -0,0 +1,17 @@
+Ensure Qt knows where libGL is.
+
+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
+diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
+--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf	2014-09-11 12:48:07.000000000 +0200
++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf	2015-08-23 13:03:30.617473019 +0200
+@@ -12,8 +12,8 @@
+ QMAKE_LIBDIR            =
+ QMAKE_INCDIR_X11        =
+ QMAKE_LIBDIR_X11        =
+-QMAKE_INCDIR_OPENGL     =
+-QMAKE_LIBDIR_OPENGL     =
++QMAKE_INCDIR_OPENGL     = @mesa@/include
++QMAKE_LIBDIR_OPENGL     = @mesa@/lib
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
new file mode 100644
index 00000000000..a80810353ad
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -0,0 +1,233 @@
+{ stdenv, fetchurl, substituteAll, makeWrapper
+, srcs
+
+, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
+, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
+, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
+, zlib, libjpeg, libpng, libtiff, sqlite, icu
+
+, coreutils, bison, flex, gdb, gperf, lndir, ruby
+, python, perl, pkgconfig
+
+# optional dependencies
+, cups ? null
+, mysql ? null, postgresql ? null
+
+# options
+, mesaSupported, mesa, mesa_glu
+, buildDocs ? false
+, buildExamples ? false
+, buildTests ? false
+, developerBuild ? false
+, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, decryptSslTraffic ? false
+}:
+
+with stdenv.lib;
+
+let
+  inherit (srcs.qt5) version;
+  system-x86_64 = elem stdenv.system platforms.x86_64;
+in
+
+stdenv.mkDerivation {
+
+  name = "qtbase-${version}";
+  inherit version;
+
+  srcs = with srcs; [ qt5.src qtbase.src ];
+
+  sourceRoot = "qt-everywhere-opensource-src-${version}";
+
+  postUnpack = ''
+    mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
+  '';
+
+  prePatch = ''
+    substituteInPlace configure --replace /bin/pwd pwd
+    substituteInPlace qtbase/configure --replace /bin/pwd pwd
+    substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+    substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
+        --replace /usr/share/X11/locale ${libX11}/share/X11/locale \
+        --replace /usr/lib/X11/locale ${libX11}/share/X11/locale
+    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
+  '';
+
+  patches =
+    let dlopen-gtkstyle = substituteAll {
+          src = ./0001-dlopen-gtkstyle.patch;
+          # substituteAll ignores env vars starting with capital letter
+          gconf = GConf;
+          inherit gnome_vfs libgnomeui gtk;
+        };
+        dlopen-resolv = substituteAll {
+          src = ./0002-dlopen-resolv.patch;
+          glibc = stdenv.cc.libc;
+        };
+        dlopen-gl = substituteAll {
+          src = ./0003-dlopen-gl.patch;
+          openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
+        };
+        tzdir = ./0004-tzdir.patch;
+        dlopen-libXcursor = substituteAll {
+          src = ./0005-dlopen-libXcursor.patch;
+          inherit libXcursor;
+        };
+        dlopen-openssl = substituteAll {
+          src = ./0006-dlopen-openssl.patch;
+          inherit openssl;
+        };
+        dlopen-dbus = substituteAll {
+          src = ./0007-dlopen-dbus.patch;
+          dbus_libs = dbus;
+        };
+        xdg-config-dirs = ./0008-xdg-config-dirs.patch;
+        decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch;
+        mkspecs-libgl = substituteAll {
+          src = ./0014-mkspecs-libgl.patch;
+          inherit mesa;
+        };
+    in [
+      dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl
+      dlopen-dbus xdg-config-dirs
+    ]
+    ++ optional gtkStyle dlopen-gtkstyle
+    ++ optional decryptSslTraffic decrypt-ssl-traffic
+    ++ optional mesaSupported mkspecs-libgl;
+
+  preConfigure = ''
+    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
+    sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
+
+    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
+    export configureFlags+=" -docdir $out/share/doc/qt5"
+  '';
+
+  prefixKey = "-prefix ";
+
+  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
+  # TODO Remove obsolete and useless flags once the build will be totally mastered
+  configureFlags = ''
+    -verbose
+    -confirm-license
+    -opensource
+
+    -release
+    -shared
+    -c++11
+    ${optionalString developerBuild "-developer-build"}
+    -largefile
+    -accessibility
+    -rpath
+    -optimized-qmake
+    -strip
+    -reduce-relocations
+    -system-proxies
+    -pkg-config
+
+    -gui
+    -widgets
+    -opengl desktop
+    -qml-debug
+    -nis
+    -iconv
+    -icu
+    -pch
+    -glib
+    -xcb
+    -qpa xcb
+    -${optionalString (cups == null) "no-"}cups
+    -${optionalString (!gtkStyle) "no-"}gtkstyle
+
+    -no-eglfs
+    -no-directfb
+    -no-linuxfb
+    -no-kms
+
+    ${optionalString (!system-x86_64) "-no-sse2"}
+    -no-sse3
+    -no-ssse3
+    -no-sse4.1
+    -no-sse4.2
+    -no-avx
+    -no-avx2
+    -no-mips_dsp
+    -no-mips_dspr2
+
+    -system-zlib
+    -system-libpng
+    -system-libjpeg
+    -system-xcb
+    -system-xkbcommon
+    -openssl-linked
+    -dbus-linked
+
+    -system-sqlite
+    -${if mysql != null then "plugin" else "no"}-sql-mysql
+    -${if postgresql != null then "plugin" else "no"}-sql-psql
+
+    -make libs
+    -make tools
+    -${optionalString (buildExamples == false) "no"}make examples
+    -${optionalString (buildTests == false) "no"}make tests
+  '';
+
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
+  propagatedBuildInputs = [
+    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
+    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
+    zlib libjpeg libpng libtiff sqlite icu
+    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
+  ]
+  # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
+  # doesn't remain a runtime-dep if not used
+  ++ optionals mesaSupported [ mesa mesa_glu ]
+  ++ optional (cups != null) cups
+  ++ optional (mysql != null) mysql.lib
+  ++ optional (postgresql != null) postgresql
+  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
+
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
+
+  nativeBuildInputs = [ python perl pkgconfig ];
+
+  propagatedNativeBuildInputs = [ makeWrapper ];
+
+  # freetype-2.5.4 changed signedness of some struct fields
+  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+
+  postInstall =
+    ''
+      ${optionalString buildDocs ''
+        make docs && make install_docs
+      ''}
+
+      # Don't retain build-time dependencies like gdb and ruby.
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+    '';
+
+  inherit lndir;
+  setupHook = ./setup-hook.sh;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://qt-project.org;
+    description = "A cross-platform application framework for C++";
+    license = "GPL/LGPL";
+    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
new file mode 100644
index 00000000000..d9690559b42
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
@@ -0,0 +1,109 @@
+if [[ -z "$QMAKE" ]]; then
+
+linkDependencyDir() {
+    @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"
+    if [[ -n "$NIX_QT_SUBMODULE" ]]; then
+        find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"
+    fi
+}
+
+addQtModule() {
+    if [[ -d "$1/mkspecs" ]]; then
+        # $1 is a Qt module
+        linkDependencyDir "$1" mkspecs
+
+        for dir in bin include lib share; do
+            if [[ -d "$1/$dir" ]]; then
+                linkDependencyDir "$1" "$dir"
+            fi
+        done
+    fi
+
+    if [[ -d "$1/lib/qt5/plugins" ]]; then
+        addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    fi
+
+    if [[ -d "$1/lib/qt5/imports" ]]; then
+        addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
+    fi
+
+    if [[ -d "$1/lib/qt5/qml" ]]; then
+        addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    fi
+
+    if [[ -d "$1/share" ]]; then
+        addToSearchPath XDG_DATA_DIRS "$1/share"
+    fi
+}
+
+rmQtModules() {
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [[ -h "$out/$file" ]]; then
+        rm "$out/$file"
+      fi
+    done
+
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [[ -d "$out/$file" ]]; then
+        rmdir --ignore-fail-on-non-empty -p "$out/$file"
+      fi
+    done
+
+    rm "$out/nix-support/qt-inputs"
+}
+
+rmQMake() {
+    rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
+}
+
+setQMakePath() {
+    export PATH="$qtOut/bin${PATH:+:}$PATH"
+}
+
+wrapQtProgram() {
+    wrapProgram "$1" \
+        --set QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+        --set QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+        --set QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
+        "$@"
+}
+
+qtOut=""
+if [[ -z "$NIX_QT_SUBMODULE" ]]; then
+    qtOut="$PWD/qmake-$name"
+else
+    qtOut=$out
+fi
+
+mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
+
+cp "@out@/bin/qmake" "$qtOut/bin"
+cat >"$qtOut/bin/qt.conf" <<EOF
+[Paths]
+Prefix = $qtOut
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
+EOF
+
+export QMAKE="$qtOut/bin/qmake"
+addToSearchPath QT_PLUGIN_PATH "$out/lib/qt5/plugins"
+addToSearchPath QML_IMPORT_PATH "$out/lib/qt5/imports"
+addToSearchPath QML2_IMPORT_PATH "$out/lib/qt5/qml"
+addToSearchPath XDG_DATA_DIRS "$out/share"
+
+envHooks+=(addQtModule)
+preConfigurePhases+=(setQMakePath)
+
+if [[ -n "$NIX_QT_SUBMODULE" ]]; then
+    preFixupPhases+=(rmQtModules)
+    postPhases+=(rmQMake)
+fi
+
+fi
+
+if [[ -z "$NIX_QT_PIC" ]]; then
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    export NIX_QT_PIC=1
+fi
diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
new file mode 100644
index 00000000000..95cd6fea79b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtconnectivity";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix
new file mode 100644
index 00000000000..a71f11b7d40
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix
@@ -0,0 +1,7 @@
+{ qtSubmodule, python, qtbase, qtsvg, qtxmlpatterns }:
+
+qtSubmodule {
+  name = "qtdeclarative";
+  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
+  nativeBuildInputs = [ python ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
new file mode 100644
index 00000000000..578ea6ba0b2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtdoc";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
new file mode 100644
index 00000000000..b860a73ef89
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtenginio";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
new file mode 100644
index 00000000000..3273f12eb83
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtgraphicaleffects";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
new file mode 100644
index 00000000000..03d0fffbe80
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtimageformats";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
new file mode 100644
index 00000000000..1e134057c4b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtmultimedia }:
+
+qtSubmodule {
+  name = "qtlocation";
+  qtInputs = [ qtbase qtmultimedia ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
new file mode 100644
index 00000000000..7d70cf0e371
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
@@ -0,0 +1,11 @@
+{ qtSubmodule, qtbase, qtdeclarative
+, alsaLib, gstreamer, gst_plugins_base, libpulseaudio
+}:
+
+qtSubmodule {
+  name = "qtmultimedia";
+  qtInputs = [ qtbase qtdeclarative ];
+  buildInputs = [
+    alsaLib gstreamer gst_plugins_base libpulseaudio
+  ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1.nix
new file mode 100644
index 00000000000..23282e02906
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtquick1.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtscript, qtsvg, qtwebkit, qtxmlpatterns }:
+
+qtSubmodule {
+  name = "qtquick1";
+  qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
new file mode 100644
index 00000000000..93a864621b8
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
new file mode 100644
index 00000000000..887e107b6c1
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
@@ -0,0 +1,25 @@
+From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 09:13:34 -0500
+Subject: [PATCH] glib-2.32
+
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+index 1f6d25e..087c3fb 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+@@ -81,7 +81,7 @@
+ #include <pthread.h>
+ #elif PLATFORM(GTK)
+ #include <wtf/gtk/GOwnPtr.h>
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GCond GCond;
+ #endif
+ 
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
new file mode 100644
index 00000000000..127766e2ebd
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
@@ -0,0 +1,7 @@
+{ qtSubmodule, qtbase, qttools }:
+
+qtSubmodule {
+  name = "qtscript";
+  qtInputs = [ qtbase qttools ];
+  patches = [ ./0001-glib-2.32.patch ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
new file mode 100644
index 00000000000..61e64dc47e4
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtsensors";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.3/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
index e1e66a3ce95..6636cc9265a 100644
--- a/pkgs/development/libraries/qt-5/5.3/0009-dlopen-serialport-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
@@ -1,17 +1,17 @@
-From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001
+From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:31:03 -0600
-Subject: [PATCH] dlopen-serialport-udev
+Date: Sun, 23 Aug 2015 09:16:02 -0500
+Subject: [PATCH] dlopen serialport udev
 
 ---
- qtserialport/src/serialport/qtudev_p.h | 4 ++--
+ src/serialport/qtudev_p.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h
-index 09940ab..45460f9 100644
---- a/qtserialport/src/serialport/qtudev_p.h
-+++ b/qtserialport/src/serialport/qtudev_p.h
-@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName)
+diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
+index 6f2cabd..81b9849 100644
+--- a/src/serialport/qtudev_p.h
++++ b/src/serialport/qtudev_p.h
+@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
  inline bool resolveSymbols(QLibrary *udevLibrary)
  {
      if (!udevLibrary->isLoaded()) {
@@ -24,5 +24,5 @@ index 09940ab..45460f9 100644
                  qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
                  return false;
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
new file mode 100644
index 00000000000..fa7383fc1e7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -0,0 +1,7 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtserialport";
+  qtInputs = [ qtbase ];
+  patches = [ ./0001-dlopen-serialport-udev.patch ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
new file mode 100644
index 00000000000..b9ccac7cf93
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtsvg";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
new file mode 100644
index 00000000000..65edc450812
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qttools";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
new file mode 100644
index 00000000000..50fc8cf6826
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qttools }:
+
+qtSubmodule {
+  name = "qttranslations";
+  qtInputs = [ qttools ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
new file mode 100644
index 00000000000..64f85c42d19
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qttools, qtwebkit }:
+
+qtSubmodule {
+  name = "qtwebkit-examples";
+  qtInputs = [ qttools qtwebkit ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.3/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
index 0752cdcf479..0eeacce1bc0 100644
--- a/pkgs/development/libraries/qt-5/5.3/0002-dlopen-webkit-nsplugin.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
@@ -1,19 +1,19 @@
-From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001
+From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:22:23 -0600
-Subject: [PATCH] dlopen-webkit-nsplugin
+Date: Sun, 23 Aug 2015 09:18:54 -0500
+Subject: [PATCH 1/3] dlopen webkit nsplugin
 
 ---
- qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp                  | 2 +-
- qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp                     | 2 +-
- .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp       | 2 +-
+ Source/WebCore/plugins/qt/PluginPackageQt.cpp                        | 2 +-
+ Source/WebCore/plugins/qt/PluginViewQt.cpp                           | 2 +-
+ Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index 679480b..2c373cc 100644
---- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0)
+diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+index a923d49..2731d05 100644
+--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
          }
      }
  
@@ -22,10 +22,10 @@ index 679480b..2c373cc 100644
      if (library.load()) {
          typedef void *(*gtk_init_check_ptr)(int*, char***);
          gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
+diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
 index de06a2f..363bde5 100644
---- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
+--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
 @@ -697,7 +697,7 @@ static Display *getPluginDisplay()
      // support gdk based plugins (like flash) that use a different X connection.
      // The code below has the same effect as this one:
@@ -35,10 +35,10 @@ index de06a2f..363bde5 100644
      if (!library.load())
          return 0;
  
-diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
 index d734ff6..62a2197 100644
---- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
 @@ -64,7 +64,7 @@ static Display* getPluginDisplay()
      // The code below has the same effect as this one:
      // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
@@ -49,5 +49,5 @@ index d734ff6..62a2197 100644
          return 0;
  
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.3/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
index 9582b714c90..bb5d1f74364 100644
--- a/pkgs/development/libraries/qt-5/5.3/0007-dlopen-webkit-gtk.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
@@ -1,16 +1,16 @@
-From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001
+From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:26:39 -0600
-Subject: [PATCH] dlopen-webkit-gtk
+Date: Sun, 23 Aug 2015 09:19:16 -0500
+Subject: [PATCH 2/3] dlopen webkit gtk
 
 ---
- qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
+ Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
 index 8de6521..0b25748 100644
---- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
 @@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
  
  static bool initializeGtk()
@@ -21,5 +21,5 @@ index 8de6521..0b25748 100644
          return false;
      typedef void* (*gtk_init_ptr)(void*, void*);
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.3/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
index e8a4ba6a215..f3b9d407bd7 100644
--- a/pkgs/development/libraries/qt-5/5.3/0008-dlopen-webkit-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
@@ -1,16 +1,16 @@
-From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001
+From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:30:41 -0600
-Subject: [PATCH] dlopen-webkit-udev
+Date: Sun, 23 Aug 2015 09:19:29 -0500
+Subject: [PATCH 3/3] dlopen webkit udev
 
 ---
- qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
+ Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
+diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
 index 60ff317..da8ac69 100644
---- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
+--- a/Source/WebCore/platform/qt/GamepadsQt.cpp
++++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
 @@ -111,12 +111,12 @@ private:
      bool load()
      {
@@ -27,5 +27,5 @@ index 60ff317..da8ac69 100644
          return resolveMethods();
      }
 -- 
-2.1.3
+2.5.0
 
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
new file mode 100644
index 00000000000..596c02d39af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -0,0 +1,33 @@
+{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors
+, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt
+, sqlite, udev
+, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
+, substituteAll
+, flashplayerFix ? false
+}:
+
+with stdenv.lib;
+
+qtSubmodule {
+  name = "qtwebkit";
+  qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ];
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ];
+  nativeBuildInputs = [
+    bison2 flex gdb gperf perl pkgconfig python ruby
+  ];
+  patches =
+    let dlopen-webkit-nsplugin = substituteAll {
+          src = ./0001-dlopen-webkit-nsplugin.patch;
+          inherit gtk gdk_pixbuf;
+        };
+        dlopen-webkit-gtk = substituteAll {
+          src = ./0002-dlopen-webkit-gtk.patch;
+          inherit gtk;
+        };
+        dlopen-webkit-udev = substituteAll {
+          src = ./0003-dlopen-webkit-udev.patch;
+          inherit udev;
+        };
+    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
+    ++ [ dlopen-webkit-udev ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
new file mode 100644
index 00000000000..fbdfbbcf0db
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtwebsockets";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
new file mode 100644
index 00000000000..a765161e2d7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtx11extras";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
new file mode 100644
index 00000000000..9a8ddbba2bd
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtxmlpatterns";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix
new file mode 100644
index 00000000000..f1b148629d3
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/srcs.nix
@@ -0,0 +1,261 @@
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+  qtbase = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz";
+      sha256 = "0r89axg4vnli0i5s9zxwpcpsdiz12kyx7y2vz0zx204wff8hcgw9";
+      name = "qtbase-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz";
+      sha256 = "0jyiby8q3gyly5sxli4bncs69k1fk0vq9cpkfb4dla2bz6frhnld";
+      name = "qtsensors-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwinextras-opensource-src-5.5.0.tar.xz";
+      sha256 = "17kf8hcgr98agr4c5dy3xaifbwzk06ys0qcc6r8s4a40lxpf5vxm";
+      name = "qtwinextras-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz";
+      sha256 = "0lzg1j7766bfvhdjd7cp0r6lff7xpzd3q5wrq6p5qg61f3384a37";
+      name = "qtxmlpatterns-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwayland-opensource-src-5.5.0.tar.xz";
+      sha256 = "0sf8s6vficn7njmrlqcwad1hd3gfhzz84r75h9c53lyys7zkyypa";
+      name = "qtwayland-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebchannel-opensource-src-5.5.0.tar.xz";
+      sha256 = "139dxdm5kqdf0nbqchvcm70gb6nf9cfn04qv387s6a8bzw28dy4l";
+      name = "qtwebchannel-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz";
+      sha256 = "1s4axvvqs1ajmb62hg4hyq4c9cckkpvgjfj0vkdxvrninaqnbm0s";
+      name = "qtwebsockets-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz";
+      sha256 = "0wv7dzlll1k8070kkdriz668hxxg8ka4xv7dh67xlr3pck2i52l5";
+      name = "qtdeclarative-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtcanvas3d-opensource-src-5.5.0.tar.xz";
+      sha256 = "1is5yikkmps0l03i75r3djgr93nmlbhs6nhawvd4mxrvkwscggj6";
+      name = "qtcanvas3d-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qttools-opensource-src-5.5.0.tar.xz";
+      sha256 = "0zf0z8r83255m5qximipywldf29p17qn7whfq9b48zzvhxqi8rav";
+      name = "qttools-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz";
+      sha256 = "17z149inv8b83530s0vaas8rj5q7sv011i8pvznsnkfkcvndxvq0";
+      name = "qtsvg-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qt5 = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qt5-opensource-src-5.5.0.tar.xz";
+      sha256 = "1rbjrg73lr3782nic5rjpmkx9wacnbw7ql7wxwmsz9fpmpafs267";
+      name = "qt5-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz";
+      sha256 = "12vyhs6y7c869gg0hmh56hjz5wkmg5dbb7dlv71idjrfigm34f9l";
+      name = "qtscript-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qt3d = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qt3d-opensource-src-5.5.0.tar.xz";
+      sha256 = "13jnqg4asik3jkw5csm0p9rl5b31ism7yzyndyyyjygjnvxm8v5z";
+      name = "qt3d-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz";
+      sha256 = "1vj7l7qfqprmdd5ay9p32dfy3cqxbrilhqza9wk7yy8lfi752hzi";
+      name = "qtgraphicaleffects-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtmacextras-opensource-src-5.5.0.tar.xz";
+      sha256 = "1r4pjcw07j4n110vf3amwbj1x31ncl3h9c5kfampn4fb3b0vjx6j";
+      name = "qtmacextras-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz";
+      sha256 = "0ydrs0vdcapbdf2d8sj6pvxj11p0id684c6ywbq53dghr72wxcxw";
+      name = "qtx11extras-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qttranslations-opensource-src-5.5.0.tar.xz";
+      sha256 = "11mzc3403r81krldlmnr9ap07lgqnz67bmvblp6gxjq1w4q1gkjs";
+      name = "qttranslations-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz";
+      sha256 = "1sn2g3sazd3l3zi8m8a9qdakm9fic44m259iyf97yychnfk6lqfz";
+      name = "qtquickcontrols-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwebkit = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz";
+      sha256 = "1v7fv4188rppd1l1nmhdkhlg2x1q9d5shy63n1l0l13x6jb4k5hp";
+      name = "qtwebkit-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz";
+      sha256 = "0rm8xwq7fr6q9gwhqqp3b4y9n7mqhcgr40f9f5dqkhy12chjs3m6";
+      name = "qtserialport-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz";
+      sha256 = "0nrmhmgwxc1flzg9qnjzpa6qq06gl7x8cskfj2ibnx5dkgaipgx8";
+      name = "qtmultimedia-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwebkit-examples = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz";
+      sha256 = "04mxshf730jkmp3cma65vb0m43y8y9y7l31rhbbnmq78avxn8mfj";
+      name = "qtwebkit-examples-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtquick1 = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz";
+      sha256 = "0b7s1pdlbf1a7mz3pkdg7y81nl5s5670lg6majich2v7w4rknmnv";
+      name = "qtquick1-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebengine-opensource-src-5.5.0.tar.xz";
+      sha256 = "0nnnrcrj0d0ksynsl60zv0z1vq7j123xv6s1lgwq6hkl704fc0yp";
+      name = "qtwebengine-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtactiveqt-opensource-src-5.5.0.tar.xz";
+      sha256 = "17nh4gi562cs8rpypvnzld87g407qhxi9gpdcvkjzm4mbhqwa9ql";
+      name = "qtactiveqt-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz";
+      sha256 = "0mc9mxrggnhvvgkl7gf8sp6cn9g5ffhi77krcraxhzavmk9d2yb4";
+      name = "qtimageformats-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtlocation-opensource-src-5.5.0.tar.xz";
+      sha256 = "036bxsjscvwnpy72cvlzv8dday9r76mvpbj9r8fhwhgxakspyb8a";
+      name = "qtlocation-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtandroidextras-opensource-src-5.5.0.tar.xz";
+      sha256 = "1dnmacpvxrz11nc4hm702p88f1hy5prabvdjx1zwrf55724lc8q2";
+      name = "qtandroidextras-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz";
+      sha256 = "080m3zr5av5bc2gxqyb648hy07jj3rdybkfgh5gcn2sm4qm4n77n";
+      name = "qtenginio-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz";
+      sha256 = "00j3abhvq9bg4v5z25b7jsr5c2w7hdmnljn875013p0i9s9xvkzi";
+      name = "qtconnectivity-opensource-src-5.5.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.5.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtdoc-opensource-src-5.5.0.tar.xz";
+      sha256 = "19vgx1h45g7plj23sckd52npsl8i14fknl5gg103p9xpbq8lw5vz";
+      name = "qtdoc-opensource-src-5.5.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
new file mode 100644
index 00000000000..e6973015aca
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -0,0 +1,30 @@
+{ runCommand, lndir }:
+
+{ paths, qtbase }:
+
+runCommand "qt-env" { inherit paths qtbase; } ''
+
+mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"
+
+cp "$qtbase/bin/qmake" "$out/bin"
+cat >"$out/bin/qt.conf" <<EOF
+[Paths]
+Prefix = $out
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
+EOF
+
+for pkg in $paths $qtbase; do
+    if [[ -d "$pkg/mkspecs" ]]; then
+        ${lndir}/bin/lndir -silent "$pkg/mkspecs" "$out/mkspecs"
+
+        for dir in bin include lib share; do
+            if [[ -d "$pkg/$dir" ]]; then
+                ${lndir}/bin/lndir -silent "$pkg/$dir" "$out/$dir"
+            fi
+        done
+    fi
+done
+''
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 9364b94e355..119fda9eb80 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib qt.base ];
+  buildInputs = [ zlib (qt.base or qt) ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 3d2f098267d..46df5459dca 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ];
   # FIXME: Configure fails to use system glew.
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = http://quesoglc.sourceforge.net/;
-    license = [ "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index 3660ff88981..822b888843e 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchurl, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "qwt-6.1.0";
+  name = "qwt-6.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/qwt/${name}.tar.bz2";
-    sha256 = "00klw6jsn8z3dnhxg52pqg3hg5mw2sih8prwjxm1hzcivgqxkqx7";
+    sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
   };
 
-  propagatedBuildInputs = [ qt4 ];
+  propagatedBuildInputs = [ qt5.base qt5.svg qt5.tools ];
 
   postPatch = ''
     sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix
index 84a7a9b4ccf..2c92ba5618c 100644
--- a/pkgs/development/libraries/rabbitmq-c/0.4.nix
+++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RabbitMQ C AMQP client library";
     homepage = https://github.com/alanxz/rabbitmq-c;
-    license = with stdenv.lib.licenses; mit;
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index b9962c2a2d7..639c8fb1ead 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-c-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "alanxz";
     repo = "rabbitmq-c";
     rev = "v${version}";
-    sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5";
+    sha256 = "1nfb82lbccr46wr4a2fsrkvpvdvmnyx8kn275hvdfz7mxpkd5qy6";
   };
 
   buildInputs = [ cmake openssl popt xmlto ];
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index 2183aa83e20..a1708ba59c3 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
     homepage = http://www.rabbitmq.com/java-client.html;
-    license = [ "MPLv1.1" "GPLv2" ];
+    license = with licenses; [ mpl11 gpl2 ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 301fcc84b9f..b2dfa8884e9 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://code.google.com/p/re2/;
     description = "An efficient, principled regular expression library";
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 93e24ed0c03..f770fabb35d 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = stdenv ? cross;
+  bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
 
   meta = with stdenv.lib; {
     description = "Library for interactive line editing";
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix
new file mode 100644
index 00000000000..c39314843c0
--- /dev/null
+++ b/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "resolv_wrapper-1.1.3";
+
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "1h76155pnmd3pqxfyi00q0fg6v45ad9dhnjsqcsbzg18s626wyad";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "a wrapper for the user, group and hosts NSS API";
+    homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 88d94ec0f2c..1ea90340021 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "3.10";
+  version = "3.13.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
-    rev = "v${version}";
-    sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0";
+    rev = "rocksdb-${version}";
+    sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   # Environment vars used for building certain configurations
   PORTABLE = "1";
   USE_SSE = "1";
+  CMAKE_CXX_FLAGS = "-std=gnu++11";
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
   buildFlags = [
@@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
     homepage = http://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
-    platforms = platforms.all;
+    platforms = platforms.allBut [ "i686-linux" ];
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
new file mode 100644
index 00000000000..b87d4ed4ee4
--- /dev/null
+++ b/pkgs/development/libraries/rote/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ncurses }:
+
+let version = "0.2.8"; in
+stdenv.mkDerivation rec {
+  name = "rote-${version}";
+
+  src = fetchurl {
+    sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
+    url = "mirror://sourceforge/rote/${name}.tar.gz";
+  };
+
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Our Own Terminal Emulation Library";
+    longDescription = ''
+      ROTE is a simple C library for VT102 terminal emulation. It allows the
+      programmer to set up virtual 'screens' and send them data. The virtual
+      screens will emulate the behavior of a VT102 terminal, interpreting
+      escape sequences, control characters and such. The library supports
+      ncurses as well so that you may render the virtual screen to the real
+      screen when you need to.
+    '';
+    homepage = http://rote.sourceforge.net/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix
deleted file mode 100644
index c5f2366bfa1..00000000000
--- a/pkgs/development/libraries/ruby_gpgme/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }:
-
-stdenv.mkDerivation {
-  name = "ruby-gpgme-1.0.8";
-
-  src = fetchurl {
-    url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz";
-    sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb";
-  };
-
-  meta = {
-    description = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made
-      Easy)
-    '';
-    homepage = "http://rubyforge.org/projects/ruby-gpgme/";
-    longDescription = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy).
-
-      GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
-      easier for applications. It provides a High-Level Crypto API for
-      encryption, decryption, signing, signature verification and key
-      management.
-    '';
-  };
-
-  buildInputs = [ gpgme rubygems hoe ruby ];
-
-  buildPhase = ''
-    ${ruby}/bin/ruby extconf.rb
-    rake gem
-  '';
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true
-
-    # Create a bare-bones gemspec file so that ruby will recognise the gem
-    cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec"
-    Gem::Specification.new do |s|
-      s.name              = 'gpgme'
-      s.version           = '1.0.8'
-      s.files             = Dir['{lib,examples}/**/*']
-      s.rubyforge_project = 'ruby-gpgme'
-      s.require_paths     = ['lib']
-    end
-    EOF
-
-    cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-
-    mv lib lib.bak
-    mv src/lib lib
-    rmdir src
-  '';
-}
-
diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
deleted file mode 100644
index 8d55bafeb20..00000000000
--- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, ncurses, ruby, rubygems }:
-
-stdenv.mkDerivation rec {
-  name = "ncursesw-sup-${version}";
-  version = "1.4.6";
-
-  src = fetchurl {
-    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz";
-    sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7";
-  };
-
-  meta = {
-    description = ''
-      Hacked up version of ncurses gem that supports wide characters for
-      supmua.org
-    '';
-    homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby'';
-    longDescription = ''
-      This wrapper provides access to the functions, macros, global variables
-      and constants of the ncurses library.  These are mapped to a Ruby Module
-      named "Ncurses":  Functions and external variables are implemented as
-      singleton functions of the Module Ncurses.
-    '';
-  };
-
-  buildInputs = [ ncurses rubygems ];
-
-  buildPhase = "gem build ncursesw.gemspec";
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true
-
-    # Needed for ruby to recognise the gem
-    cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
-
-    cd "$out/${ruby.gemPath}/gems/ncursesw-${version}"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-  '';
-}
-
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
new file mode 100644
index 00000000000..9ec7afabab1
--- /dev/null
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, stdenv, autoconf, automake, libtool, curl }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.9";
+  name = "sblim-sfcc-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/kkaempf/sblim-sfcc.git";
+    rev = "f70fecb410a53531e4fe99d39cf81b581819cac9";
+    sha256 = "1dlhjvi888kz3bq56n0f86f25ny48a18rm4rgb4rx04aimas3dvj";
+  };
+
+  preConfigure = "./autoconfiscate.sh";
+
+  buildInputs = [ autoconf automake libtool curl ];
+
+  meta = {
+    description = "Small Footprint CIM Client Library";
+
+    homepage = http://sourceforge.net/projects/sblim/;
+
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+
+    license = stdenv.lib.licenses.cpl10;
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    inherit version;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 01bb3371f5e..58326a6fa50 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gfortran, atlasWithLapack }:
+{ stdenv, fetchurl, gfortran, openblas }:
+
+with stdenv.lib;
 
 let
   version = "3.2.0";
@@ -10,16 +12,21 @@ stdenv.mkDerivation {
     sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff";
   };
 
-  buildInputs = [ gfortran atlasWithLapack ];
+  buildInputs = [ gfortran openblas ];
 
   # Auto-detection fails because gfortran brings in BLAS by default
-  configureFlags="--with-blas=-latlas --with-lapack=-latlas";
+  configureFlags = [
+    "--with-blas=-lopenblas"
+    "--with-lapack=-lopenblas"
+  ];
+
+  FFLAGS = optional openblas.blas64 "-fdefault-integer-8";
 
   meta = {
-    homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
+    homepage = "http://github.com/opencollab/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/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 544ab215345..89d2a242f96 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
+{ stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
-  version = "3.12.1";
+  version = "3.12.3";
   name = "ipopt-${version}";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy";
+    sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr";
   };
 
   preConfigure = ''
      export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO"
   '';
 
+  configureFlags = [
+    "--with-blas-lib=-lopenblas"
+    "--with-lapack-lib=-lopenblas"
+  ];
+
   nativeBuildInputs = [ unzip ];
 
-  buildInputs = [ gfortran blas liblapack ];
+  buildInputs = [ gfortran openblas ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index 0b4badf26e7..ef89c0bfee2 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -1,10 +1,22 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
+{
+  stdenv,
+  fetchurl,
+  gfortran,
+  cmake,
+  python,
+  atlas ? null,
+  shared ? false
+}:
 let
-  atlasMaybeShared = atlas.override { inherit shared; };
+  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
+                     else null;
   usedLibExtension = if shared then ".so" else ".a";
+  inherit (stdenv.lib) optional optionals concatStringsSep;
+  inherit (builtins) hasAttr attrNames;
+  version = "3.5.0";
 in
+
 stdenv.mkDerivation rec {
-  version = "3.5.0";
   name = "liblapack-${version}";
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
@@ -17,11 +29,16 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ]
-  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
+  ++ (optionals (atlas != null) [
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
+  ])
+  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
+  # If we're on darwin, CMake will automatically detect impure paths. This switch
+  # prevents that.
+  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
   ;
 
   doCheck = ! shared;
@@ -37,13 +54,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = licenses.bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 9f4f43311a4..f3832ba0a20 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,9 +1,21 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
+{
+  stdenv,
+  fetchurl,
+  gfortran,
+  cmake,
+  python,
+  atlas ? null,
+  shared ? false
+}:
 let
-  atlasMaybeShared = atlas.override { inherit shared; };
+  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
+                     else null;
   usedLibExtension = if shared then ".so" else ".a";
+  inherit (stdenv.lib) optional optionals concatStringsSep;
+  inherit (builtins) hasAttr attrNames;
   version = "3.4.1";
 in
+
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
   src = fetchurl {
@@ -17,11 +29,16 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ]
-  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
+  ++ (optionals (atlas != null) [
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
+  ])
+  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
+  # If we're on darwin, CMake will automatically detect impure paths. This switch
+  # prevents that.
+  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
   ;
 
   doCheck = ! shared;
@@ -37,13 +54,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = licenses.bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix
new file mode 100644
index 00000000000..3ce94f28ac2
--- /dev/null
+++ b/pkgs/development/libraries/science/math/metis/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, unzip, cmake }:
+
+stdenv.mkDerivation {
+  name = "metis-5.1.0";
+
+  src = fetchurl {
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz";
+    sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn";
+  };
+
+  cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ];
+  buildInputs = [ unzip cmake ];
+
+  meta = {
+    description = "Serial graph partitioning and fill-reducing matrix ordering";
+    homepage = http://glaros.dtc.umn.edu/gkhome/metis/metis/overview;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
deleted file mode 100644
index ec4422ce895..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.10";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
-    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 "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
deleted file mode 100644
index c476dac955a..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.2";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr";
-    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 "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e779957a6fb..a4bf1efbb73 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils
+# Most packages depending on openblas expect integer width to match pointer width,
+# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+, blas64 ? null
+}:
 
 with stdenv.lib;
 
 let local = config.openblas.preferLocalBuild or false;
     binary =
-      {
-        i686-linux = "32";
+      { i686-linux = "32";
         x86_64-linux = "64";
+        x86_64-darwin = "64";
       }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     genericFlags =
-      [
-        "DYNAMIC_ARCH=1"
+      [ "DYNAMIC_ARCH=1"
         "NUM_THREADS=64"
-        "BINARY=${binary}"
       ];
     localFlags = config.openblas.flags or
       optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
+    blas64Orig = blas64;
 in
 stdenv.mkDerivation rec {
   version = "0.2.14";
@@ -29,23 +32,31 @@ stdenv.mkDerivation rec {
 
   preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
 
-  nativeBuildInputs = [gfortran perl];
+  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl];
 
   makeFlags =
     (if local then localFlags else genericFlags)
     ++
+    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
+    ++
     [
       "FC=gfortran"
-      "CC=gcc"
+      # Note that clang is available through the stdenv on OSX and
+      # thus is not an explicit dependency.
+      "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
-      "INTERFACE64=1"
+      "BINARY=${binary}"
+      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
+      "INTERFACE64=${if blas64 then "1" else "0"}"
     ];
 
+  blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system;
+
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
     maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
deleted file mode 100644
index b0f7715f755..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 456b26d0c9101adaa5876954baac0ca0e872dab6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:01 -0600
-Subject: [PATCH 1/3] disable metis
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index ba2da23..e1514bf 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -212,8 +212,8 @@ XERBLA =
- # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
- # You may wish to use an absolute path.  METIS is optional.  Compile
- # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
--METIS_PATH = ../../metis-4.0
--METIS = ../../metis-4.0/libmetis.a
-+# METIS_PATH = ../../metis-4.0
-+# METIS = ../../metis-4.0/libmetis.a
- 
- #------------------------------------------------------------------------------
- # UMFPACK configuration:
-@@ -273,7 +273,7 @@ UMFPACK_CONFIG =
- # -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
- #                   Performance Library
- 
--CHOLMOD_CONFIG = $(GPU_CONFIG)
-+CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
- 
- # uncomment this line to compile CHOLMOD without METIS:
- # CHOLMOD_CONFIG = -DNPARTITION
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch b/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
deleted file mode 100644
index ef861f68091..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e0fee492a315ce1ef8697b056af210beb1465334 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:12 -0600
-Subject: [PATCH 2/3] set install dir
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index e1514bf..f1046a6 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -95,8 +95,8 @@ F77LIB =
- # LIB = -lm
- 
- # For "make install"
--INSTALL_LIB = /usr/local/lib
--INSTALL_INCLUDE = /usr/local/include
-+INSTALL_LIB = @out@/lib
-+INSTALL_INCLUDE = @out@/include
- 
- # Which version of MAKE you are using (default is "make")
- # MAKE = make
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch b/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
deleted file mode 100644
index db0b1c45655..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a99cca30cfd965683564ae024e8ecc615c61697a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:24:08 -0600
-Subject: [PATCH 3/3] blas lapack flags
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index f1046a6..1710162 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -119,8 +119,8 @@ INSTALL_INCLUDE = @out@/include
- # naming the BLAS and LAPACK library (*.a or *.so) files.
- 
- # This is probably slow ... it might connect to the Standard Reference BLAS:
--  BLAS = -lblas -lgfortran
--  LAPACK = -llapack
-+  BLAS = @blasFlags@
-+  LAPACK = @lapackFlags@
- 
- # MKL 
- # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 4d27701b135..16174a80212 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -1,22 +1,44 @@
-{ stdenv, fetchurl, blas, liblapack, gfortran } :
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
+in
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "suitesparse-${version}";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
-    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";  			
+    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
   };
-  buildInputs = [blas liblapack gfortran] ;
-  patches = [./disable-metis.patch];
+
+  nativeBuildInputs = [ gfortran ];
+  buildInputs = [ openblas ];
 
   preConfigure = ''
-    export PREFIX=$out
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
-  makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include'';
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
 
   NIX_CFLAGS = "-fPIC";
 
+  meta = with stdenv.lib; {
+    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+    description = "A suite of sparse matrix algorithms";
+    license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ ttuegel ];
+  };
 }
diff --git a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk b/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
deleted file mode 100644
index 157a20d7b5a..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
+++ /dev/null
@@ -1,452 +0,0 @@
-#===============================================================================
-# SuiteSparse_config.mk:  common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis:
-#
-# Package Version       Description
-# ------- -------       -----------
-# AMD     1.2 or later  approximate minimum degree ordering
-# COLAMD  2.4 or later  column approximate minimum degree ordering
-# CCOLAMD 1.0 or later  constrained column approximate minimum degree ordering
-# CAMD    any           constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later  sparse LU factorization, with the BLAS
-# CHOLMOD any           sparse Cholesky factorization, update/downdate
-# KLU     0.8 or later  sparse LU factorization, BLAS-free
-# BTF     0.8 or later  permutation to block triangular form
-# LDL     1.2 or later  concise sparse LDL'
-# CXSparse any          extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR any     sparse QR factorization
-# RBio    2.0 or later  read/write sparse matrices in Rutherford-Boeing format
-#
-# By design, this file is NOT included in the CSparse makefile.
-# That package is fully stand-alone.  CSparse is primarily for teaching;
-# production code should use CXSparse.
-#
-# The SuiteSparse_config directory and the above packages should all appear in
-# a single directory, in order for the Makefile's within each package to find
-# this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-#
-# The use of METIS 4.0.1 is optional.  To exclude METIS, you must compile with
-# CHOLMOD_CONFIG set to -DNPARTITION.  See below for details.  However, if you
-# do not have a metis-4.0 directory inside the SuiteSparse directory, the
-# */Makefile's that optionally rely on METIS will automatically detect this
-# and compile without METIS.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# Using standard definitions from the make environment, typically:
-#
-#   CC              cc      C compiler
-#   CXX             g++     C++ compiler
-#   CFLAGS          [ ]     flags for C and C++ compiler
-#   CPPFLAGS        [ ]     flags for C and C++ compiler
-#   TARGET_ARCH     [ ]     target architecture
-#   FFLAGS          [ ]     flags for Fortran compiler
-#   RM              rm -f   delete a file
-#   AR              ar      create a static *.a library archive
-#   ARFLAGS         rv      flags for ar
-#   MAKE            make    make itself (sometimes called gmake)
-#
-# You can redefine them here, but by default they are used from the
-# default make environment.
-
-# To use OpenMP add -openmp to the CFLAGS
-# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
-# as the number of cores per socket on the machine being used to maximize
-# memory performance
-  CFLAGS = 
-# CFLAGS = -g
-# for the icc compiler and OpenMP:
-# CFLAGS = -openmp
-
-# C and C++ compiler flags.  The first three are standard for *.c and *.cpp
-# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
-  CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
-# for the MKL BLAS:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
-# with no optimization:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH)     -fexceptions -fPIC
-
-# ranlib, and ar, for generating libraries.  If you don't need ranlib,
-# just change it to RANLAB = echo
-RANLIB = ranlib
-ARCHIVE = $(AR) $(ARFLAGS)
-
-# copy and delete a file
-CP = cp -f
-MV = mv -f
-
-# Fortran compiler (not required for 'make' or 'make library')
-F77 = gfortran
-F77FLAGS = $(FFLAGS) -O
-F77LIB =
-
-# C and Fortran libraries.  Remove -lrt if you don't have it.
-  LIB = -lm -lrt
-# Using the following requires CF = ... -DNTIMER on POSIX C systems.
-# LIB = -lm
-
-# For "make install"
-INSTALL_LIB = @out@/lib
-INSTALL_INCLUDE = @out@/include
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS.  CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ .  You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-  BLAS = -lf77blas -latlas -lcblas -lgfortran
-  LAPACK = -llapack -latlas -lcblas
-
-# MKL 
-# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
-# LAPACK = 
-
-# ACML
-# BLAS = -lacml -lgfortran
-# LAPACK =
-
-# OpenBLAS
-# BLAS = -lopenblas
-# LAPACK = 
-
-# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
-# statement.  Rather, the Goto BLAS is written by Dr. Kazushige Goto.
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin
-# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack_plain
-
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs.  A C version of xerbla
-# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
-# includes a Fortran-callable xerbla routine that prints nothing and does not
-# stop the application program.  This is optional.
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a 
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA = 
-
-# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
-# use this:
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a 
-
-#------------------------------------------------------------------------------
-# GPU configuration for CHOLMOD and SPQR
-#------------------------------------------------------------------------------
-
-# no cuda
-  CUDA_ROOT     =
-  GPU_BLAS_PATH =
-  GPU_CONFIG    =
-  CUDA_PATH     =
-  CUDART_LIB    =
-  CUBLAS_LIB    =
-  CUDA_INC_PATH =
-  NV20          =
-  NV30          =
-  NV35          =
-  NVCC          = echo
-  NVCCFLAGS     =
-
-# with cuda for CHOLMOD
-# CUDA_ROOT     = /usr/local/cuda
-# GPU_BLAS_PATH = $(CUDA_ROOT)
-# with 4 cores (default):
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS
-# with 10 cores:
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
-# CUDA_PATH     = $(CUDA_ROOT)
-# CUDART_LIB    = $(CUDA_ROOT)/lib64/libcudart.so
-# CUBLAS_LIB    = $(CUDA_ROOT)/lib64/libcublas.so
-# CUDA_INC_PATH = $(CUDA_ROOT)/include/
-# NV20          = -arch=sm_20 -Xcompiler -fPIC
-# NV30          = -arch=sm_30 -Xcompiler -fPIC
-# NV35          = -arch=sm_35 -Xcompiler -fPIC
-# NVCC          = $(CUDA_ROOT)/bin/nvcc
-# NVCCFLAGS     = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
-
-# was NVCC      = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path.  METIS is optional.  Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-# METIS_PATH = ../../metis-4.0
-# METIS = ../../metis-4.0/libmetis.a
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK.  See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS       do not use the BLAS.  UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#               LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF    do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNRECIPROCAL do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO   do not divide by zero
-# -DNCHOLMOD    do not use CHOLMOD as a ordering method.  If -DNCHOLMOD is
-#               included in UMFPACK_CONFIG, then UMFPACK  does not rely on
-#               CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
-
-UMFPACK_CONFIG =
-
-# uncomment this line to compile UMFPACK without CHOLMOD:
-# UMFPACK_CONFIG = -DNCHOLMOD
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core          requires: none
-# Check         requires: Core
-# Cholesky      requires: Core, AMD, COLAMD.  optional: Partition, Supernodal
-# MatrixOps     requires: Core
-# Modify        requires: Core
-# Partition     requires: Core, CCOLAMD, METIS.  optional: Cholesky
-# Supernodal    requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov          requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-#               optional: Partition
-# Valgrind      same as Tcov
-# Demo          requires: Core, Check, Cholesky, MatrixOps, Supernodal
-#               optional: Partition
-#
-# Configuration flags:
-# -DNCHECK          do not include the Check module.       License GNU LGPL
-# -DNCHOLESKY       do not include the Cholesky module.    License GNU LGPL
-# -DNPARTITION      do not include the Partition module.   License GNU LGPL
-#                   also do not include METIS.
-# -DNCAMD           do not use CAMD, etc from Partition module.    GNU LGPL
-# -DNGPL            do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS      do not include the MatrixOps module.   License GNU GPL
-# -DNMODIFY         do not include the Modify module.      License GNU GPL
-# -DNSUPERNODAL     do not include the Supernodal module.  License GNU GPL
-#
-# -DNPRINT          do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#                   LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
-#                   Performance Library
-
-CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
-
-# uncomment this line to compile CHOLMOD without METIS:
-# CHOLMOD_CONFIG = -DNPARTITION
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION      do not include the CHOLMOD partition module
-# -DNEXPERT         do not include the functions in SuiteSparseQR_expert.cpp
-# -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG = $(GPU_CONFIG)
-# with TBB:
-# SPQR_CONFIG = -DHAVE_TBB
-
-# This is needed for IBM AIX: (but not for and C codes, just C++)
-# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-#------------------------------------------------------------------------------
-# code formatting
-#------------------------------------------------------------------------------
-
-# Use "grep" only, if you do not have "indent"  
-# PRETTY = grep -v "^\#"
-# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
-  PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-# CF = $(CFLAGS) -O3 -fexceptions
-
-# alternatives:
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
-#       -funit-at-a-time
-# CF = $(CFLAGS) -O3 -fexceptions \
-#       -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CF = $(CFLAGS) -O3
-# CF = $(CFLAGS) -O3 -g -fexceptions
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow \
-#       -Wredundant-decls -Wdisabled-optimization -ansi
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-#   (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CF = $(CFLAGS) -O3 -xN -vec_report=0
-# CF = $(CFLAGS) -g
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CF = $(CFLAGS) -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Mac
-#------------------------------------------------------------------------------
-
-# As recommended by macports, http://suitesparse.darwinports.com/
-# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
-# on my MacBook Air, and they work fine.
-
-# F77 = gfortran
-# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-# LIB = -lm
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CF = $(CFLAGS) -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CF = $(CFLAGS) -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CF = $(CFLAGS) -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index add4ca9a08f..f30db472b0d 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,34 +1,53 @@
-{ stdenv, fetchurl, substituteAll
-, atlasWithLapack, gfortran }:
+{ stdenv, fetchurl, gfortran, openblas }:
 
 let
-  name = "suitesparse-4.4.1";
+  version = "4.4.4";
+  name = "suitesparse-${version}";
+
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.1.tar.gz";
-    sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n";
+    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
+    sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
   };
 
-  patches = [
-    ./0001-disable-metis.patch
-    ./0002-set-install-dir.patch
-    (substituteAll {
-      src = ./0003-blas-lapack-flags.patch;
-      blasFlags = "-lf77blas -latlas -lcblas -lgfortran";
-      lapackFlags= "-llapack -latlas -lcblas";
-    })
-  ];
-
   preConfigure = ''
-    substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
+
+  NIX_CFLAGS = "-fPIC";
+
   postInstall = ''
+    # Build and install shared library
+    (
+        cd "$(mktemp -d)"
+        for i in "$out"/lib/lib*.a; do
+          ar -x $i
+        done
+        gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+    done
+
     # Install documentation
     outdoc=$out/share/doc/${name}
     mkdir -p $outdoc
@@ -47,7 +66,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gfortran ];
-  buildInputs = [ atlasWithLapack ];
+  buildInputs = [ openblas ];
 
   meta = with stdenv.lib; {
     homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
diff --git a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
deleted file mode 100644
index 5b735eb7d3c..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile
-*** SuiteSparse/UMFPACK/Demo/Makefile	2009-11-11 21:09:45.000000000 +0100
---- SuiteSparse-new/UMFPACK/Demo/Makefile	2010-08-02 12:53:16.000000000 +0200
-***************
-*** 40,46 ****
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-- $(METIS):
-- 	( cd $(METIS_PATH) && $(MAKE) )
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
---- 40,44 ----
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index df8749622be..580460d5fc0 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
   };
 
-  buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ];
+  buildInputs = [ apr scons openssl aprutil zlib ]
+    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos
+    ++ [ pkgconfig ];
 
   configurePhase = ''
     ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
         APU="$(echo "${aprutil}"/bin/*-config)" CC="${
           if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${
-          if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\""
+          if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""
         }
   '';
 
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix
new file mode 100644
index 00000000000..5f14a7bb5ee
--- /dev/null
+++ b/pkgs/development/libraries/shhmsg/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "shhmsg-1.4.2";
+
+  src = fetchurl {
+    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
+  };
+
+  installFlags = "INSTBASEDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "A library for displaying messages";
+    homepage = http://shh.thathost.com/pub-unix/;
+    license = licenses.artistic1;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
new file mode 100644
index 00000000000..dbac4c85961
--- /dev/null
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "shhopt-1.1.7";
+
+  src = fetchurl {
+    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
+  };
+
+  installFlags = "INSTBASEDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "A library for parsing command line options";
+    homepage = http://shh.thathost.com/pub-unix/;
+    license = licenses.artistic1;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix
new file mode 100644
index 00000000000..d33edf9726f
--- /dev/null
+++ b/pkgs/development/libraries/signon/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchzip, doxygen, qtbase }:
+
+stdenv.mkDerivation rec {
+  name = "signon-${version}";
+  version = "8.57";
+  src = fetchzip {
+    url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
+    sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
+  };
+
+  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ doxygen ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
+  '';
+
+}
diff --git a/pkgs/development/libraries/signon/old.nix b/pkgs/development/libraries/signon/old.nix
new file mode 100644
index 00000000000..7b3defb8a58
--- /dev/null
+++ b/pkgs/development/libraries/signon/old.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchzip, doxygen, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "signon-${version}";
+  version = "8.57";
+  src = fetchzip {
+    url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
+    sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
+  };
+
+  buildInputs = [ qt5.base ];
+  nativeBuildInputs = [ doxygen ];
+
+  configurePhase = ''
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
+  '';
+
+}
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index fa1d4f4f984..e8b3403df40 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.2.0";
+  version = "2.3.7.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/skalibs";
     rev = "refs/tags/v${version}";
-    sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a";
+    sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx";
   };
 
   dontDisableStatic = true;
@@ -30,6 +30,7 @@ in stdenv.mkDerivation rec {
     description = "A set of general-purpose C programming libraries";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index d7a0b11a8da..ef2db5ae5a6 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,6 +1,6 @@
 # alsaLib vorbisTools python can be made optional
 
-{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }:
+{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }:
 
 stdenv.mkDerivation {
   name = "snack-2.2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ];
+  buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ];
 
   postInstall = "aoeu";
 
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 90469508d0e..50e4534f162 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,25 +1,23 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "snappy-1.1.2";
+  name = "snappy-${version}";
+  version = "1.1.3";
   
   src = fetchFromGitHub {
     owner = "google";
     repo = "snappy";
-    rev = "1ff9be9b8fafc8528ca9e055646f5932aa5db9c4";
-    sha256 = "1zyjj13max0z42g3ii54n3qn7rbcga34dbi26lpm7v5ya752shx7";
+    rev = version;
+    sha256 = "1w9pq8vag8c6m4ib0qbdbqzsnpwjvw01jbp15lgwg1rzwhvflm10";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook ];
-
-  preConfigure = ''
-    sh autogen.sh
-  '';
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   # -DNDEBUG for speed
   configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
 
-  doCheck = true;
+  # SIGILL on darwin
+  doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/snappy/;
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 8ddd6114efd..df0cc1db34b 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "socket_wrapper-1.1.3";
+  name = "socket_wrapper-1.1.4";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3";
+    sha256 = "0ypp7sx5rhn4jpmn5yxgr7mm5kkdcsa76xfnhgsvhagh1naqap2k";
   };
 
-  buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ (stdenv.cc.libc.out or null) ];
 
   meta = with stdenv.lib; {
     description = "a library passing all socket communications through unix sockets";
diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
deleted file mode 100644
index 7bdec155813..00000000000
--- a/pkgs/development/libraries/sodium/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="sodium";
-    version="1.0.2";
-    name="${baseName}-${version}";
-    hash="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.2.tar.gz";
-    sha256="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''A cryptography library with simple API'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/sodium/default.upstream b/pkgs/development/libraries/sodium/default.upstream
deleted file mode 100644
index ccc02cd8978..00000000000
--- a/pkgs/development/libraries/sodium/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://download.dnscrypt.org/libsodium/releases/
diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix
new file mode 100644
index 00000000000..290e85d81c7
--- /dev/null
+++ b/pkgs/development/libraries/sord/sord-svn.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, pkgconfig, python, serd }:
+
+stdenv.mkDerivation rec {
+  name = "sord-svn-${rev}";
+  rev = "327";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/sord/trunk";
+    rev = rev;
+    sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
+  };
+
+  buildInputs = [ pkgconfig python serd ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://drobilla.net/software/sord;
+    description = "A lightweight C library for storing RDF data in memory";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 24dc443ca70..16e7b09a0f2 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/baresip.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 1a9a6d486f3..7112afbea8a 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -2,14 +2,15 @@
 
 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 ];
-  
+  postPatch = "sed '3i#include <stdint.h>' -i ./include/speex/speexdsp_config_types.h.in";
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ fftw ];
 
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index e7a048f0a31..99f699e301c 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
-, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
+, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
 , gtk3, enableGTK3 ? false }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-gtk-0.25";
+  name = "spice-gtk-0.29";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "11yh593frbafp0ywkk7pfc2k17q1fwrl8zcjclph3xfr1alccc07";
+    sha256 = "0wz9sm44gnmwjpmyacwd5jyzvhfl1wlf1dn3qda20si42cky5is4";
   };
 
   buildInputs = [
-    spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection
+    spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
   ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
 
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
   preConfigure = ''
-    substituteInPlace gtk/Makefile.am \
+    substituteInPlace src/Makefile.am \
       --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
-
     autoreconf -v --force --install
     intltoolize -f
   '';
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 79fe47ff476..3bcd7fd67ef 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,13 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.7";
+  name = "spice-protocol-0.12.9";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "1hhn94bw2l76h09sy05a15bs6zalsijnylyqpwcys5hq6rrwpiln";
+    sha256 = "0xkqycpqpkxjlcg4fk1vyv2vjni60s0fjx5l57918q0mvlsgh319";
   };
 
+  postInstall = ''
+    mkdir -p $out/lib
+    ln -sv ../share/pkgconfig $out/lib/pkgconfig
+  '';
+
   meta = with stdenv.lib; {
     description = "Protocol headers for the SPICE protocol";
     homepage = http://www.spice-space.org;
diff --git a/pkgs/development/libraries/sqlite-amalgamation/default.nix b/pkgs/development/libraries/sqlite-amalgamation/default.nix
new file mode 100644
index 00000000000..2ee3b6f2ecb
--- /dev/null
+++ b/pkgs/development/libraries/sqlite-amalgamation/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "sqlite-amalgamation-201505302257";
+
+  src = fetchurl {
+    url = "https://www.sqlite.org/snapshot/sqlite-amalgamation-201505302257.zip";
+    sha256 = "0488wjrpnxd61g7pcka6fckx0q8yl1k26i6q5hrmkm92qcpml76h";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" ];
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  buildPhase = ''
+    mkdir -p $out
+    cp sqlite3.c $out/
+    cp sqlite3.h $out/
+    cp sqlite3ext.h $out/
+    cp shell.c $out/
+  '';
+
+  meta = {
+    homepage = http://www.sqlite.org/;
+    description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.lassulus ];
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index d161fab31b6..f043a37033a 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,18 +3,49 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.9";
+  name = "sqlite-3.8.11.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz";
-    sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz";
+    sha1 = "d0e22d7e361b6f50830a3cdeafe35311443f8f9a";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
 
-  configureFlags = "--enable-threadsafe";
+  configureFlags = [ "--enable-threadsafe" ];
 
-  NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+  NIX_CFLAGS_COMPILE = [
+    "-DSQLITE_ENABLE_COLUMN_METADATA"
+    "-DSQLITE_ENABLE_DBSTAT_VTAB"
+    "-DSQLITE_ENABLE_FTS3"
+    "-DSQLITE_ENABLE_FTS3_PARENTHESIS"
+    "-DSQLITE_ENABLE_FTS4"
+    "-DSQLITE_ENABLE_RTREE"
+    "-DSQLITE_ENABLE_STMT_SCANSTATUS"
+    "-DSQLITE_ENABLE_UNLOCK_NOTIFY"
+    "-DSQLITE_SOUNDEX"
+    "-DSQLITE_SECURE_DELETE"
+  ];
+
+  # Test for features which may not be available at compile time
+  preBuild = ''
+    # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
+    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread_pwrite_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD"
+    fi
+    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64"
+    elif cc -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE"
+    fi
+
+    echo ""
+    echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
+    echo ""
+  '';
 
   meta = {
     homepage = http://www.sqlite.org/;
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
new file mode 100644
index 00000000000..4e5d360aea0
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchurl, unzip, tcl }:
+
+stdenv.mkDerivation {
+  name = "sqlite3_analzer-3.8.10.1";
+
+  src = fetchurl {
+    url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
+    sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z";
+  };
+
+  buildInputs = [ unzip tcl ];
+
+  # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer.
+  # Hopefully this work-around can be removed for future releases.
+  postConfigure = ''
+    substituteInPlace Makefile \
+      --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"'
+  '';
+
+  buildPhase = ''
+    make sqlite3_analyzer
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv sqlite3_analyzer "$out/bin"
+  '';
+
+  meta = {
+    homepage = http://www.sqlite.org/;
+    description = "A tool that shows statistics about sqlite databases";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ pesterhazy ];
+  };
+}
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 23590f17ca8..9fb25aa36e0 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -1,24 +1,38 @@
-{stdenv, fetchurl, cmake, parallel ? true }:
+{ stdenv, fetchurl, cmake
+, parallel ? true
+}:
+
+let
+  mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF";
+in
 
 stdenv.mkDerivation rec {
-  name = "stxxl-1.4.1";
+  name = "stxxl-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz";
+    url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";
     sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}";
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=OFF"
+    "-DCMAKE_BUILD_TYPE=Release"
+    (mkFlag parallel "USE_GNU_PARALLEL")
+  ];
 
   passthru = {
     inherit parallel;
   };
 
-  meta = {
-    homepage = https://github.com/stxxl/stxxl;
+  meta = with stdenv.lib; {
     description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
-    license = stdenv.lib.licenses.boost;
+    homepage = https://github.com/stxxl/stxxl;
+    license = licenses.boost;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
new file mode 100644
index 00000000000..fa007da7d9c
--- /dev/null
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
+
+# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
+
+stdenv.mkDerivation rec {
+  name = "subunit-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
+  };
+
+  buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ];
+
+  propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
+
+  postFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    description = "A streaming protocol for test results";
+    homepage = https://launchpad.net/subunit;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 6faf2224b0c..6091bb3c8bb 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,13 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.3";
-
   name = "sword-${version}";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
-    sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
+    sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
   buildInputs = [ pkgconfig icu clucene_core curl ];
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 039dc59774c..5ed773c56d2 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXaw ];
   buildFlags = "without_doc";
 
-  postInstall = "chmod +x $out/lib/*.so.*"; # ??
+  postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
 
 }
 
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index d9f52d8d87c..467ccf9db86 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.2";
+  name = "talloc-2.1.3";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393";
+    sha256 = "1c1c3zs13qyripjwcjpz2hqc3p9p50m5yl95gdrrrvyl49dzg9bs";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 81227f0829b..2bb47df20cf 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.4";
+  name = "tdb-1.3.7";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "0a8pa4ar7dxkbsgv1447av2rn35a1m6l1v2s9hgz3ccwni9wv1gm";
+    sha256 = "04k42cjvjc5wsqsqf44397hclq3nxlm9avjcsbz2hsn01k59akd6";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix
new file mode 100644
index 00000000000..1c18e844689
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt5/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
+, telepathy_farstream, telepathy_glib, pythonDBus }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-qt5-0.9.5";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
+    sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig python libxslt ];
+  propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
+
+  cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ];
+
+  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
+  '';
+
+  enableParallelBuilding = true;
+  doCheck = false; # giving up for now
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/telepathy/qt5/old.nix b/pkgs/development/libraries/telepathy/qt5/old.nix
new file mode 100644
index 00000000000..50d569f3091
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt5/old.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
+, telepathy_farstream, telepathy_glib, pythonDBus }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-qt5-0.9.5";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
+    sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig python libxslt ];
+  propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
+
+  cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ];
+
+  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
+  '';
+
+  enableParallelBuilding = true;
+  doCheck = false; # giving up for now
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index baa7e288178..2e9c83755a6 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.24";
+  name = "tevent-0.9.25";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "0l1zjx2z6nhvn6gwbcvzn8w0cca53j717fwi10s7a5v1jb04rfad";
+    sha256 = "0sf694bdp2l6s48gmr8hxlcpdmjbwhr9ph1faqxmkcqibbav1ppy";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 55438e2c201..a4d210547fd 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,19 +1,20 @@
-{ fetchurl, stdenv, kerberos }:
+{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.2.5";
+  name = "libtirpc-0.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "1nq2w227j9nh8qsz7b3c1pha00k5yvzf2c3pfmlcb1l65iydxyb2";
+    sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210";
   };
 
-  buildInputs = [ kerberos ];
+  nativeBuildInputs = [ autoreconfHook ];
+  propagatedBuildInputs = [ libkrb5 ];
 
-  # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
-  preConfigure = ''
-    echo "" > src/des_crypt.c
+  # http://sourceforge.net/p/libtirpc/mailman/libtirpc-devel/thread/5581CB06.5020604%40email.com/#msg34216933
+  patches = [ ./fix_missing_rpc_get_default_domain.patch ];
 
+  preConfigure = ''
     sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
   '';
 
diff --git a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
new file mode 100644
index 00000000000..c905d3c0de8
--- /dev/null
+++ b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
@@ -0,0 +1,88 @@
+diff -rNu3 libtirpc-0.3.2-old/src/Makefile.am libtirpc-0.3.2/src/Makefile.am
+--- libtirpc-0.3.2-old/src/Makefile.am	2015-07-28 15:17:49.248168000 +0300
++++ libtirpc-0.3.2/src/Makefile.am	2015-07-28 15:18:04.870144456 +0300
+@@ -69,7 +69,7 @@
+ endif
+ 
+ libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
+-libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
++libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
+ 
+ CLEANFILES	       = cscope.* *~
+ DISTCLEANFILES	       = Makefile.in
+diff -rNu3 libtirpc-0.3.2-old/src/rpcdname.c libtirpc-0.3.2/src/rpcdname.c
+--- libtirpc-0.3.2-old/src/rpcdname.c	1970-01-01 03:00:00.000000000 +0300
++++ libtirpc-0.3.2/src/rpcdname.c	2015-07-28 15:18:04.870144456 +0300
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * rpcdname.c
++ * Gets the default domain name
++ */
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
++static char *default_domain = 0;
++
++static char *
++get_default_domain()
++{
++	char temp[256];
++
++	if (default_domain)
++		return (default_domain);
++	if (getdomainname(temp, sizeof(temp)) < 0)
++		return (0);
++	if ((int) strlen(temp) > 0) {
++		default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
++		if (default_domain == 0)
++			return (0);
++		(void) strcpy(default_domain, temp);
++		return (default_domain);
++	}
++	return (0);
++}
++
++/*
++ * This is a wrapper for the system call getdomainname which returns a
++ * ypclnt.h error code in the failure case.  It also checks to see that
++ * the domain name is non-null, knowing that the null string is going to
++ * get rejected elsewhere in the NIS client package.
++ */
++int
++__rpc_get_default_domain(domain)
++	char **domain;
++{
++	if ((*domain = get_default_domain()) != 0)
++		return (0);
++	return (-1);
++}
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
new file mode 100644
index 00000000000..fee74f3d6f9
--- /dev/null
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "tidyp-1.04";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/petdance/tidyp/${name}.tar.gz";
+    sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
+    homepage = http://tidyp.com/;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
new file mode 100644
index 00000000000..c3396dcdad2
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+    sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
+  };
+
+})
+
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
new file mode 100644
index 00000000000..110151227bd
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+    sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
+  };
+
+  patches = [ ./different-prefix-with-tcl.patch ];
+
+})
+
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/generic.nix
index 5f07befcfa5..c3bab0b2f86 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
+{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
 
 stdenv.mkDerivation {
   name = "tk-${tcl.version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
-    sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
-  };
-
-  patches = [ ./different-prefix-with-tcl.patch ];
+  inherit src patches;
 
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
   '';
 
-  configureFlags = "--with-tcl=${tcl}/lib";
+  preConfigure = ''
+    cd unix
+  '';
 
-  preConfigure = "cd unix";
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
+  ];
 
   buildInputs = [ pkgconfig tcl libXft ]
     ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
@@ -31,11 +30,11 @@ stdenv.mkDerivation {
     libdir = "lib/${libPrefix}";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.tcltk;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 2dfe41869a2..49bc088d8c5 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "uid_wrapper-1.1.0";
+  name = "uid_wrapper-1.1.1";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
+    sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9";
   };
 
-  buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ (stdenv.cc.libc.out or null) ];
 
   meta = with stdenv.lib; {
     description = "a wrapper for the user, group and hosts NSS API";
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 11f3294b289..369e271191f 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -12,12 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ];
 
   meta = with lib; {
     description = "A very basic terminfo library";
-    license = with licenses; [ lgpl3Plus ];
+    license = licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 74a14231801..d3a2debbd12 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-args : with args;
+{fetchurl, stdenv, unixODBC, glibc, libtool, openssl, zlib, postgresql, mysql, sqlite}:
 # each attr contains the name deriv referencing the derivation and ini which
 # evaluates to a string which can be appended to the global unix odbc ini file
 # to register the driver
@@ -9,7 +9,7 @@ args : with args;
     deriv = stdenv.mkDerivation {
       name = "unix-odbc-pg-odbcng-0.90.101";
       buildInputs = [ unixODBC glibc libtool postgresql ];
-      # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' 
+      # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
       preConfigure="
         export CPPFLAGS=-I${unixODBC}/include
         export LDFLAGS='-L${unixODBC}/lib -lltdl'
@@ -37,7 +37,7 @@ args : with args;
       export CPPFLAGS=-I${unixODBC}/include
       export LDFLAGS='-L${unixODBC}/lib -lltdl'
     ";
-    # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' 
+    # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
     src = fetchurl {
       url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
       sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1";
@@ -48,7 +48,7 @@ args : with args;
         license = "LGPL";
     };
   };
-  ini = 
+  ini =
     "[PostgreSQL]\n" +
     "Description     = official PostgreSQL driver for Linux & Win32\n" +
     "Driver          = ${deriv}/lib/psqlodbcw.so\n" +
@@ -97,7 +97,7 @@ args : with args;
         mv "$out"/*.la "$out/lib"
       '';
 
-      meta = { 
+      meta = {
         description = "ODBC driver for SQLite";
         homepage = http://www.ch-werner.de/sqliteodbc;
         license = stdenv.lib.licenses.bsd2;
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
new file mode 100644
index 00000000000..76aec25a792
--- /dev/null
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+
+stdenv.mkDerivation rec {
+  name = "uriparser-0.8.2";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
+    sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
+  };
+
+  buildInputs = [ cpptest pkgconfig doxygen graphviz ];
+
+  meta = with stdenv.lib; {
+    homepage = http://uriparser.sourceforge.net/;
+    description = "Strictly RFC 3986 compliant URI parsing library";
+    maintainers = with maintainers; [ bosu ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix
index 8570af2b283..090ca28d7c4 100644
--- a/pkgs/development/libraries/urt/default.nix
+++ b/pkgs/development/libraries/urt/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.cs.utah.edu/gdc/projects/urt/;
-    description = "The Utah Raster Toolkit is a library for dealing with raster images";
+    description = "A library for dealing with raster images";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index 4e3abf7954b..9a7475969c6 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, glibc }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl }:
 
+stdenv.mkDerivation rec {
   name = "ustr-${version}";
   version = "1.0.4";
 
@@ -9,14 +9,30 @@ stdenv.mkDerivation rec {
     sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
   };
 
-  prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc.dev}/include/";
+  # Fixes bogus warnings that failed libsemanage
+  patches = [ ./va_args.patch ];
+
+  # Work around gcc5 switch to gnu11
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
+
+  # Fix detection of stdint.h
+  postPatch = ''
+    sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile
+    sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in
+  '';
 
-  patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage
+  buildTargets = [ "all-shared" ];
 
-  makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo";
+  preBuild = ''
+    makeFlagsArray+=("prefix=$out")
+    makeFlagsArray+=("LDCONFIG=echo")
+    makeFlagsArray+=("HIDE=")
+  '';
 
-  configurePhase = "make ustr-import";
-  buildInputs = [ glibc ];
+  # Remove debug libraries
+  postInstall = ''
+    find $out/lib -name \*debug\* -delete
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.and.org/ustr/;
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 8c715fbd928..c8a2fd6a4e9 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -1,25 +1,23 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "v1.1.6";
-
   name = "utf8proc-${version}";
+  version = "v1.2";
 
-  src = fetchurl {
-    url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz";
-    sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
+  src = fetchFromGitHub {
+    owner = "JuliaLang";
+    repo = "utf8proc";
+    rev = "${version}";
+    sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf";
   };
 
-  installPhase = ''
-    mkdir -pv $out/lib $out/include
-    cp libutf8proc.so libutf8proc.a $out/lib
-    cp utf8proc.h $out/include
-  '';
+  makeFlags = [ "prefix=$(out)" ];
 
-  meta = {
-    description = "A library for processing UTF-8 encoded Unicode strings";
-    homepage = http://www.public-software-group.org/utf8proc;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A clean C library for processing UTF-8 Unicode data";
+    homepage = http://julialang.org/utf8proc;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.ftrvxmtrx ];
   };
 }
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index b5e1b159321..c79357cd907 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -8,14 +8,18 @@ in
 
 stdenv.mkDerivation rec {
   name = "v8-${version}";
-  version = "3.16.14";
+  version = "3.16.14.11";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
         + "${name}.tar.bz2";
-    sha256 = "073f33zcb7205jp9g5ha5d7j2hfa98zs0jql572nb552z0xw3rkz";
+    sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
   };
 
+  postPatch = ''
+    sed -i 's/-Werror//' build/standalone.gypi build/common.gypi
+  '';
+
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
     ln -s /usr/bin/xcodebuild $TMPDIR
     export PATH=$TMPDIR:$PATH
diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix
new file mode 100644
index 00000000000..e7b10f23ac8
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.24.10.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "3.24.10";
+  sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75";
+})
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index dbf2f376d0f..6ae5c896efa 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,69 +1,6 @@
-{ stdenv, fetchurl, gyp, readline, python, which, icu }:
+{ callPackage, ... } @ args:
 
-assert readline != null;
-
-let
-  arch = if stdenv.is64bit then "x64" else "ia32";
-in
-
-stdenv.mkDerivation rec {
-  name = "v8-${version}";
+callPackage ./generic.nix (args // {
   version = "3.30.33.16";
-
-  src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
-        + "${name}.tar.bz2";
-    sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
-  };
-
-  patchPhase = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
-  '';
-
-  configurePhase = ''
-    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
-    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
-      build/gyp_v8 \
-        -f make \
-        --generator-output="out" \
-        -Dflock_index=0 \
-        -Dv8_enable_i18n_support=1 \
-        -Duse_system_icu=1 \
-        -Dconsole=readline \
-        -Dcomponent=shared_library \
-        -Dv8_target_arch=${arch}
-  '';
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu ];
-
-  buildFlags = [
-    "LINK=g++"
-    "-C out"
-    "builddir=$(CURDIR)/Release"
-    "BUILDTYPE=Release"
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    install -vD out/Release/d8 "$out/bin/d8"
-    ${if stdenv.system == "x86_64-darwin" then ''
-    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    '' else ''
-    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
-    ''}
-    cp -vr include "$out/"
-  '';
-
-  postFixup = if stdenv.isDarwin then ''
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-  '' else null;
-
-  meta = with stdenv.lib; {
-    description = "Google's open source JavaScript engine";
-    platforms = with platforms; linux;
-    license = licenses.bsd3;
-  };
-}
+  sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
+})
diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix
new file mode 100644
index 00000000000..b056ba640d2
--- /dev/null
+++ b/pkgs/development/libraries/v8/generic.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, gyp, readline, python, which, icu
+, version
+, sha256
+, ...
+}:
+
+assert readline != null;
+
+let
+  arch = if stdenv.is64bit then "x64" else "ia32";
+in
+
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+        + "${name}.tar.bz2";
+    inherit sha256;
+  };
+
+  patchPhase = ''
+    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
+  '';
+
+  configurePhase = ''
+    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
+    PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
+      build/gyp_v8 \
+        -f make \
+        --generator-output="out" \
+        -Dflock_index=0 \
+        -Dv8_enable_i18n_support=1 \
+        -Duse_system_icu=1 \
+        -Dconsole=readline \
+        -Dcomponent=shared_library \
+        -Dv8_target_arch=${arch}
+  '';
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ readline python icu ];
+
+  buildFlags = [
+    "LINK=g++"
+    "-C out"
+    "builddir=$(CURDIR)/Release"
+    "BUILDTYPE=Release"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -vD out/Release/d8 "$out/bin/d8"
+    ${if stdenv.system == "x86_64-darwin" then ''
+    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    '' else ''
+    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
+    ''}
+    cp -vr include "$out/"
+  '';
+
+  postFixup = if stdenv.isDarwin then ''
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+  '' else null;
+
+  meta = with stdenv.lib; {
+    description = "Google's open source JavaScript engine";
+    platforms = with platforms; linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 8eddb2b0ae8..5084fc3c10b 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -1,23 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }:
+{ stdenv, fetchurl, gnum4, pkgconfig, python
+, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland
+}:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.5.1";
+  name = "libva-intel-driver-1.6.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb";
+    sha256 = "1nsnl7gix22jbxqm7d5i3fk9gafwayhnsc3qjhbzxs6bbsffjmin";
   };
 
-  prePatch = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' src/shaders/gpp.py
+  patchPhase = ''
+    patchShebangs ./src/shaders/gpp.py
   '';
 
-  buildInputs = [ pkgconfig libdrm libva libX11 intel-gpu-tools mesa_noglu wayland gnum4 ];
-
   preConfigure = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
+  configureFlags = [
+    "--enable-drm"
+    "--enable-x11"
+    "--enable-wayland"
+  ];
+
+  nativeBuildInputs = [ gnum4 pkgconfig python ];
+
+  buildInputs = [ intel-gpu-tools libdrm libva libX11 mesa_noglu wayland ];
+
   meta = with stdenv.lib; {
     homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 04bef5ef41c..28852fd97d6 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,28 +1,31 @@
-{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python,
-  fftw, fftwSinglePrec, hdf5, boost, numpy }:
+{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
+, libjpeg, libpng, libtiff, numpy, openexr, python }:
+
 stdenv.mkDerivation rec {
-  name = "vigra-1.9.0";
+  name = "vigra-${version}";
+  version = "1.10.0";
 
   src = fetchurl {
-    urls = [
-      "${meta.homepage}/${name}-src.tar.gz"
-      "${meta.homepage}-old-versions/${name}-src.tar.gz"
-      ];
-    sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg";
+    url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
+    sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
   };
 
-  buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
-    numpy hdf5 ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
+                  libtiff numpy openexr python ];
 
   preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
-  cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux")
-      [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
-  meta = {
+  cmakeFlags = [ "-DWITH_OPENEXR=1" ]
+            ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
+                  [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
+
+  meta = with stdenv.lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
     homepage = http://hci.iwr.uni-heidelberg.de/vigra;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 8a63b780b4c..074b26e3f3a 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,12 +1,28 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
-  version = "4.70.0";
+  version = "4.75.0";
+
+  enableParallelBuilding = true;
+
+  patches = [
+    # backported from
+    # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5
+    ./wavpack_clang.patch
+  ];
+
+  preConfigure = ''
+    sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in
+  '';
+
+  # --disable-asm is required for clang
+  # https://github.com/dbry/WavPack/issues/3
+  configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm";
 
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
-    sha256 = "191h8hv8qk72hfh1crg429i9yq3cminwqb249sy9zadbn1wy7b9c";
+    sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch
new file mode 100644
index 00000000000..dfbe4718143
--- /dev/null
+++ b/pkgs/development/libraries/wavpack/wavpack_clang.patch
@@ -0,0 +1,25 @@
+diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h
+--- wavpack-4.75.0_orig/src/wavpack_local.h	2015-05-21 06:50:26.000000000 +0900
++++ wavpack-4.75.0/src/wavpack_local.h	2015-09-14 21:48:09.000000000 +0900
+@@ -650,9 +650,9 @@
+ void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir);
+ void update_error_limit (WavpackStream *wps);
+ 
+-const uint32_t bitset [32];
+-const uint32_t bitmask [32];
+-const char nbits_table [256];
++extern const uint32_t bitset [32];
++extern const uint32_t bitmask [32];
++extern const char nbits_table [256];
+ 
+ int log2s (int32_t value);
+ int32_t exp2s (int log);
+@@ -734,7 +734,7 @@
+ /////////////////////////////////// common utilities ////////////////////////////////////
+ // module: common_utils.c
+ 
+-const uint32_t sample_rates [16];
++extern const uint32_t sample_rates [16];
+ uint32_t WavpackGetLibraryVersion (void);
+ const char *WavpackGetLibraryVersionString (void);
+ uint32_t WavpackGetSampleRate (WavpackContext *wpc);
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index cdd663bf191..0510fde811c 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkgconfig
 , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
@@ -6,34 +6,27 @@
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
+    sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
   };
 
-  configureFlags = [
-    (mkFlag (expat != null) "scanner")
-  ];
+  configureFlags = "--with-scanner --disable-documentation";
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ];
+  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ];
 
   meta = {
     description = "Reference implementation of the wayland protocol";
     homepage    = http://wayland.freedesktop.org/;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ codyopel wkennington ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ codyopel wkennington ];
   };
 
   passthru.version = version;
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 5c868838c99..8ad3fcd0428 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, perl, python, ruby, bison, gperf, flex
+{ stdenv, fetchurl, 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.8";
+  version = "2.4.9";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,19 +21,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8";
+    sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg";
   };
 
-  patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ];
-
   CC = "cc";
 
   prePatch = ''
     patchShebangs Tools/gtk
   '';
-
-  # patch *.in between autoreconf and configure
-  postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
+  patches = [ ./webcore-svg-libxml-cflags.patch ];
 
   configureFlags = with stdenv.lib; [
     "--disable-geolocation"
@@ -46,23 +42,22 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   nativeBuildInputs = [
-    autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex
+    perl python ruby bison gperf flex
     pkgconfig which gettext gobjectIntrospection
   ];
 
   buildInputs = [
     gtk2 wayland libwebp enchant
-    libxml2 libsecret libxslt harfbuzz
+    libxml2 libsecret libxslt
     gst-plugins-base sqlite
   ];
 
   propagatedBuildInputs = [
-    libsoup
+    libsoup harfbuzz/*icu in *.la*/
     (if withGtk2 then gtk2 else gtk3)
   ];
 
-  # Probably OK now, see:
-  # https://bugs.webkit.org/show_bug.cgi?id=79498
-  enableParallelBuilding = true;
-}
+  # Still fails with transient errors in version 2.4.9.
+  enableParallelBuilding = false;
 
+}
diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch
deleted file mode 100644
index 8d8c1bae0be..00000000000
--- a/pkgs/development/libraries/webkitgtk/bug140241.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-@@ -, +, @@ 
-        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 54502610887..d60fbca6141 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection
+, pkgconfig, gettext, gobjectIntrospection, libnotify
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
 , enableGeoLocation ? true, geoclue2, sqlite
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.8.0";
+  version = "2.10.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,12 +25,16 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5";
+    sha256 = "0vb8ca6dd9hxb5ycp54bdyykp10blbq5b6qkbak4yf9mxwi5ccj2";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
 
-  cmakeFlags = [ "-DPORT=GTK" ];
+  cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
+
+  # XXX: WebKit2 missing include path for gst-plugins-base.
+  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base}/include/gstreamer-1.0";
 
   nativeBuildInputs = [
     cmake perl python ruby bison gperf sqlite
@@ -38,7 +42,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk2 wayland libwebp enchant
+    gtk2 wayland libwebp enchant libnotify
     libxml2 libsecret libxslt harfbuzz libpthreadstubs
     gst-plugins-base
   ] ++ optional enableGeoLocation geoclue2;
@@ -47,5 +51,5 @@ stdenv.mkDerivation rec {
     libsoup gtk3
   ];
 
-  enableParallelBuilding = true; # build problems on Hydra
+  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
deleted file mode 100644
index 1acfb87bfbc..00000000000
--- a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
+++ /dev/null
@@ -1,276 +0,0 @@
---- 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/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index 5b3f9e03ac7..8660d15e06a 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, alsaLib, freepats }:
 
 stdenv.mkDerivation rec {
-  name = "wildmidi-0.3.6";
+  name = "wildmidi-0.3.8";
 
   src = fetchurl {
     url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz";
-    sha256 = "0y8r812f8h9jqlajwbzni7f23k8kfcp4wxz3jdq75z902bsmdzpf";
+    sha256 = "1z324wkmkf0lapfammviiyclhc7i8in2x2gvgc2r6sq69lcwbn7g";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 395a4040153..347686014d1 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -1,34 +1,70 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool
-, bzip2, snappy, zlib, db
+
+# Optional Dependencies
+, lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null
+, gperftools ? null, leveldb ? null
 }:
 
+with stdenv.lib;
+let
+  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 && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optLz4 = shouldUsePkg lz4;
+  optSnappy = shouldUsePkg snappy;
+  optZlib = shouldUsePkg zlib;
+  optBzip2 = shouldUsePkg bzip2;
+  optDb = shouldUsePkg db;
+  optGperftools = shouldUsePkg gperftools;
+  optLeveldb = shouldUsePkg leveldb;
+in
 stdenv.mkDerivation rec {
   name = "wiredtiger-${version}";
-  version = "2.5.2";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     repo = "wiredtiger";
     owner = "wiredtiger";
     rev = version;
-    sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p";
+    sha256 = "1nj319w3hvkq3za2dz9m0p1w683gycdb392v1jb910bhzpsq30pd";
   };
 
   nativeBuildInputs = [ automake autoconf libtool ];
-  buildInputs = [ bzip2 snappy zlib db ];
+  buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ];
 
   configureFlags = [
-    "--with-berkeleydb=${db}"
-    "--enable-bzip2"
-    "--enable-leveldb"
-    "--enable-snappy"
-    "--enable-zlib"
+    (mkWith   false                   "attach"     null)
+    (mkWith   true                    "builtins"   "")
+    (mkEnable (optBzip2 != null)      "bzip2"      null)
+    (mkEnable false                   "diagnostic" null)
+    (mkEnable false                   "java"       null)
+    (mkEnable (optLeveldb != null)    "leveldb"    null)
+    (mkEnable false                   "python"     null)
+    (mkEnable (optSnappy != null)     "snappy"     null)
+    (mkEnable (optLz4 != null)        "lz4"        null)
+    (mkEnable (optGperftools != null) "tcmalloc"   null)
+    (mkEnable (optZlib != null)       "zlib"       null)
+    (mkWith   (optDb != null)         "berkeleydb" optDb)
+    (mkWith   false                   "helium"     null)
   ];
 
   preConfigure = ''
     ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace api/leveldb/leveldb_wt.h --replace \
+      '#include "wiredtiger.h"' \
+      ''$'#include "wiredtiger.h"\n#include "pthread.h"'
+  '';
+
+  meta = {
     homepage = http://wiredtiger.com/;
     description = "";
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh
index ef0085da924..86f2719537c 100644
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/pkgs/development/libraries/wtk/builder.sh
@@ -21,7 +21,7 @@ rpath=
 for i in $libraries; do
     rpath=$rpath${rpath:+:}$i/lib
 done
-find $out -type f -perm +100 \
+find $out -type f -perm -0100 \
     -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
-find $out -type f -perm +100 \
+find $out -type f -perm -0100 \
     -exec patchelf --set-rpath "$rpath" {} \;
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix
index bde3f6e4efb..0ed4f24ef86 100644
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, unzip, xlibs }:
+{ stdenv, requireFile, unzip, xorg }:
 
 assert stdenv.system == "i686-linux";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ];
+  libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ];
 
   meta = {
     homepage = http://java.sun.com/products/sjwtoolkit/download.html;
diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
index ecfc9b88a0e..b879cf37a31 100644
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
+{ stdenv, gcc46, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
 
 stdenv.mkDerivation {
   name = "wvstreams-4.6.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
   '';
 
-  buildInputs = [ qt4 dbus zlib openssl readline perl ];
+  buildInputs = [ gcc46 qt4 dbus zlib openssl readline perl ];
 
   meta = {
     description = "Network programming library in C++";
diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix
new file mode 100644
index 00000000000..9734fd358ea
--- /dev/null
+++ b/pkgs/development/libraries/wxmac/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, setfile, rez, derez,
+  expat, libiconv, libjpeg, libpng, libtiff, zlib
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "3.0.2";
+  name = "wxmac-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
+    sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
+  };
+
+  patches = [ ./wx.patch ];
+
+  buildInputs = [ setfile rez derez expat libiconv libjpeg libpng libtiff zlib ];
+
+  configureFlags = [
+    "--enable-unicode"
+    "--with-osx_cocoa"
+    "--enable-std_string"
+    "--enable-display"
+    "--with-opengl"
+    "--with-libjpeg"
+    "--with-libtiff"
+    "--without-liblzma"
+    "--with-libpng"
+    "--with-zlib"
+    "--enable-dnd"
+    "--enable-clipboard"
+    "--enable-webkit"
+    "--enable-svg"
+    "--enable-graphics_ctx"
+    "--enable-controls"
+    "--enable-dataviewctrl"
+    "--with-expat"
+    "--disable-precomp-headers"
+    "--disable-mediactrl"
+  ];
+
+  checkPhase = ''
+    ./wx-config --libs
+  '';
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    platforms = platforms.darwin;
+    maintainers = [ maintainers.lnl7 ];
+  };
+}
diff --git a/pkgs/development/libraries/wxmac/wx.patch b/pkgs/development/libraries/wxmac/wx.patch
new file mode 100644
index 00000000000..622e22d1fdb
--- /dev/null
+++ b/pkgs/development/libraries/wxmac/wx.patch
@@ -0,0 +1,59 @@
+diff --git a/include/wx/defs.h b/include/wx/defs.h
+index 397ddd7..d128083 100644
+--- a/include/wx/defs.h
++++ b/include/wx/defs.h
+@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
+ DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
+ DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
+ DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
++DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
+ 
+ typedef WX_UIWindow WXWindow;
+ typedef WX_UIView WXWidget;
+ typedef WX_EAGLContext WXGLContext;
+ typedef WX_NSString* WXGLPixelFormat;
+ 
++typedef WX_UIWebView OSXWebViewPtr;
++
++#endif
++
++#if wxOSX_USE_COCOA_OR_CARBON
++DECLARE_WXCOCOA_OBJC_CLASS(WebView);
++typedef WX_WebView OSXWebViewPtr;
+ #endif
+ 
+ #endif /* __WXMAC__ */
+diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
+index 8700367..f805099 100644
+--- a/include/wx/html/webkit.h
++++ b/include/wx/html/webkit.h
+@@ -18,7 +18,6 @@
+ #endif
+ 
+ #include "wx/control.h"
+-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
+ 
+ // ----------------------------------------------------------------------------
+ // Web Kit Control
+@@ -107,7 +106,7 @@ private:
+     wxString m_currentURL;
+     wxString m_pageTitle;
+ 
+-    WX_WebView m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
+diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
+index 803f8b0..438e532 100644
+--- a/include/wx/osx/webview_webkit.h
++++ b/include/wx/osx/webview_webkit.h
+@@ -158,7 +158,7 @@ private:
+     wxWindowID m_windowID;
+     wxString m_pageTitle;
+ 
+-    wxObjCID m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index a2af56cbca6..1598fec6194 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,11 +16,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "x265-${version}";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchurl {
     url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
-    sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w";
+    sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 575fb73084c..89f97292d39 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,18 +1,21 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
-stdenv.mkDerivation {
-  name = "xapian-1.2.19";
+stdenv.mkDerivation rec {
+  name = "xapian-${version}";
+  version = "1.2.21";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.2.19/xapian-core-1.2.19.tar.xz;
-    sha256 = "11a7lm3w3pchk4rx144nc2p31994spyqmldm18ph86zzi01jcy2a";
+    url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+    sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ libuuid zlib ];
 
-  meta = { 
+  meta = {
     description = "Search engine library";
-    homepage = "http://xapian.org";
+    homepage = http://xapian.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 9ca3474ce3b..cf14490c514 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig
-, git, xlibs, gnum4, libxcb, gperf }:
+, git, xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-HEAD";
+  name = "xcb-util-cursor-0.1.1-3-gf03cc27";
 
   src = fetchgit {
     url    = http://anongit.freedesktop.org/git/xcb/util-cursor.git;
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     libtool
     libxcb
     pkgconfig
-    xlibs.utilmacros
-    xlibs.xcbutilimage
-    xlibs.xcbutilrenderutil
+    xorg.utilmacros
+    xorg.xcbutilimage
+    xorg.xcbutilrenderutil
   ];
 
   configurePhase = ''
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 11ba5df80ca..89b2d77db82 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib
 , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
-, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager
+, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
     alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac
-    libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec
+    libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec
   ];
 
   NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 82f1514cd3d..e68415951c7 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++/C library to construct Excel .xls files in code";
-    homepage = http://sourceforge.net/projects/xlslib/files/;
+    homepage = http://sourceforge.net/projects/xlslib/;
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 3fba451c711..85e2f08b31d 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.aleksey.com/xmlsec;
     description = "XML Security Library in C based on libxml2";
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 079b457ab1f..c6ab03df10a 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, ruby }:
 
 stdenv.mkDerivation rec {
-  name = "yajl-2.0.4";
+  name = "yajl-2.1.0";
 
   src = fetchurl {
-    url = http://github.com/lloyd/yajl/tarball/2.0.4;
+    url = http://github.com/lloyd/yajl/tarball/2.1.0;
     name = "${name}.tar.gz";
-    sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1";
+    sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji";
   };
 
   buildInputs = [ cmake ruby ];
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 29e92d0b6ec..d89fae5c964 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }:
+{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }:
 
 stdenv.mkDerivation rec {
-  name = "zeroc-ice-3.5.1";
+  name = "zeroc-ice-${version}";
+  version = "3.6.0";
 
-  src = fetchurl {
-    url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz";
-    sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq";
+  src = fetchFromGitHub {
+    owner = "zeroc-ice";
+    repo = "ice";
+    rev = "v${version}";
+    sha256 = "192lhynf369bbrvbb9nldc49n09kyxp8vg8j9d7w5h2c1yxpjgjq";
   };
 
   buildInputs = [ mcpp bzip2 expat openssl db5 ];
 
   buildPhase = ''
     cd cpp
-    make OPTIMIZE=yes
+    make -j $NIX_BUILD_CORES OPTIMIZE=yes
   '';
 
   installPhase = ''
-    make prefix=$out install
+    make -j $NIX_BUILD_CORES prefix=$out install
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "http://www.zeroc.com/ice.html";
     description = "The internet communications engine";
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index eaa719b92c9..de91ac50428 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, libuuid }:
+{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.0.5";
+  name = "zeromq-4.1.3";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v";
+    sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1";
   };
 
-  buildInputs = [ libuuid ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libuuid libsodium ];
 
   meta = with stdenv.lib; {
     branch = "4";
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
new file mode 100644
index 00000000000..c46a950804c
--- /dev/null
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, automake, autoconf, libtool, lzma }:
+
+stdenv.mkDerivation {
+  name = "zimlib";
+  version = "20150710";
+  src = fetchgit {
+    url = https://gerrit.wikimedia.org/r/p/openzim.git;
+    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
+    sha256 = "0x0d3rx6zcc8k66nqkacmwdvslrz70h9bliqawzv90ribq3alb0q";
+  };
+  buildInputs = [ automake autoconf libtool lzma ];
+  setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
+  preConfigurePhases = [ "./autogen.sh" ];
+
+  meta = {
+    description = "Library for reading and writing ZIM files (file format for storing Web content offline)";
+    homepage =  http://www.openzim.org/wiki/Zimlib;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ robbinch ];
+  };
+}
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 38b1d70cc86..2d3b10974f7 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -13,9 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
   };
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure \
+      --replace '/usr/bin/libtool' 'ar' \
+      --replace 'AR="libtool"' 'AR="ar"' \
+      --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+  '';
+
   outputs = [ "dev" "out" "static" "man" ];
   setOutputFlags = false;
 
+
   preConfigure = ''
     if test -n "$crossConfig"; then
       export CC=$crossConfig-gcc
@@ -54,8 +62,8 @@ stdenv.mkDerivation rec {
     makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };
 
-  # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
-  cygwinConfigureEnableShared = true;
+  # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds
+  cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null;
 
   passthru.version = version;
 
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
new file mode 100644
index 00000000000..d3dc41371de
--- /dev/null
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.12";
+  name = "zlog-${version}";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
+    sha256 = "1ychld0dcfdak2wnmkj941i0xav6ynlb3n6hz1kz03yy74ll2fqi";
+  };
+
+  configurePhase = ''
+    sed -i 's;-Werror;;' src/makefile
+  '';
+
+  buildPhase = ''
+    mkdir -p $out
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
+    homepage = http://hardysimpson.github.com/zlog;
+    license = licenses.lgpl21;
+    platforms = platforms.linux; # cannot test on something else
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+
+}
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index dcfaafc2b7d..1e474e722ff 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library to extract data from files archived in a zip file";
 
     longDescription = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       zip/unzip tools.
     '';
 
-    license = [ "LGPLv2+" "MPLv1.1" ];
+    license = with licenses; [ lgpl2Plus mpl11 ];
 
     homepage = http://zziplib.sourceforge.net/;